diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 950b86b..28e581f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,7 +115,8 @@ jobs:
           tags: |
             type=ref,event=tag
             type=raw,value=latest
-            type=raw,value=noble
+            type=raw,value=resolute
+            type=raw,value=26.04
 
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@v4
diff --git a/Dockerfile b/Dockerfile
index 2b1eaa8..679b3f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
-FROM ubuntu:noble-20260410
+FROM ubuntu:resolute-20260413
 
 # Add any system dependencies for the developer/build environment here
 RUN apt-get update && \
diff --git a/renovate.json b/renovate.json
index 5db72dd..6bf280e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,21 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended"
+  ],
+  "baseBranches": [
+    "main",
+    "noble"
+  ],
+  "packageRules": [
+    {
+      "matchBaseBranches": ["main"],
+      "matchDepNames": ["ubuntu"],
+      "allowedVersions": "/^resolute(-.*)?$/"
+    },
+    {
+      "matchBaseBranches": ["noble"],
+      "matchDepNames": ["ubuntu"],
+      "allowedVersions": "/^noble(-.*)?$/"
+    }
   ]
 }