diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index fdac2a28..1813066c 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "6.10.3"
+  ".": "6.11.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd00a91c..db9bfc6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [6.11.0](https://github.com/philips-software/amp-devcontainer/compare/v6.10.3...v6.11.0) (2026-05-13)
+
+
+### Features
+
+* Switch base container to Ubuntu 26.04 ([#1227](https://github.com/philips-software/amp-devcontainer/issues/1227)) ([30a53b3](https://github.com/philips-software/amp-devcontainer/commit/30a53b309ccfee52f2f7f450d8fb6ddca10be51e))
+
 ## [6.10.3](https://github.com/philips-software/amp-devcontainer/compare/v6.10.2...v6.10.3) (2026-05-12)
 
 
diff --git a/templates/cpp/devcontainer-template.json b/templates/cpp/devcontainer-template.json
index 9d9a1e5a..01eba1e9 100644
--- a/templates/cpp/devcontainer-template.json
+++ b/templates/cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "cpp",
-  "version": "6.10.3",
+  "version": "6.11.0",
   "name": "C++",
   "description": "A modern, batteries-included software development environment for C++",
   "documentationURL": "https://github.com/philips-software/amp-devcontainer/blob/main/README.md",
@@ -9,7 +9,7 @@
     "imageVersion": {
       "type": "string",
       "description": "amp-devcontainer version",
-      "default": "6.10.3"
+      "default": "6.11.0"
     }
   },
   "optionalPaths": [
diff --git a/templates/rust/devcontainer-template.json b/templates/rust/devcontainer-template.json
index 186368fd..d8036f31 100644
--- a/templates/rust/devcontainer-template.json
+++ b/templates/rust/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "rust",
-  "version": "6.10.3",
+  "version": "6.11.0",
   "name": "Rust",
   "description": "A modern, batteries-included software development environment for Rust",
   "documentationURL": "https://github.com/philips-software/amp-devcontainer/blob/main/README.md",
@@ -9,7 +9,7 @@
     "imageVersion": {
       "type": "string",
       "description": "amp-devcontainer version",
-      "default": "6.10.3"
+      "default": "6.11.0"
     }
   },
   "optionalPaths": [