diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 297df1fb..ebb156d7 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "8.4.0",
+  ".": "8.4.1",
   ".github/actions": "1.2.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dffdd168..0f5d2bcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ 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/).
 
+## [8.4.1](https://github.com/philips-software/amp-devcontainer/compare/v8.4.0...v8.4.1) (2026-10-20)
+
+
+### Chores
+
+* **deps, base:** Update git, udev ([#1497](https://github.com/philips-software/amp-devcontainer/issues/1497)) ([4cd32f7](https://github.com/philips-software/amp-devcontainer/commit/4cd32f76c08a2ec37e175af0c89ea9414dce68ba))
+* **deps, cpp:** Update mull-22 ([#1496](https://github.com/philips-software/amp-devcontainer/issues/1496)) ([b2b9b71](https://github.com/philips-software/amp-devcontainer/commit/b2b9b71298eed0dc70789ba6d8c49810dab74b3d))
+* **deps:** Bump cmake from 4.4.3 to 4.4.4 in /.devcontainer ([#1493](https://github.com/philips-software/amp-devcontainer/issues/1493)) ([a392b8d](https://github.com/philips-software/amp-devcontainer/commit/a392b8df9761c3930f21d143f04323d60a19ae2e))
+
 ## [8.4.0](https://github.com/philips-software/amp-devcontainer/compare/v8.3.0...v8.4.0) (2026-10-08)
 
 
diff --git a/templates/cpp/devcontainer-template.json b/templates/cpp/devcontainer-template.json
index 57b5800c..e3171932 100644
--- a/templates/cpp/devcontainer-template.json
+++ b/templates/cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "cpp",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "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": "8.4.0"
+      "default": "8.4.1"
     }
   },
   "optionalPaths": [
diff --git a/templates/embedded-cpp/devcontainer-template.json b/templates/embedded-cpp/devcontainer-template.json
index 007fd826..d6f79a40 100644
--- a/templates/embedded-cpp/devcontainer-template.json
+++ b/templates/embedded-cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "embedded-cpp",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "name": "Embedded C++",
   "description": "A modern, batteries-included software development environment for embedded 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": "8.4.0"
+      "default": "8.4.1"
     }
   },
   "optionalPaths": [
diff --git a/templates/embedded-rust/devcontainer-template.json b/templates/embedded-rust/devcontainer-template.json
index 7b28e6e2..bd663a07 100644
--- a/templates/embedded-rust/devcontainer-template.json
+++ b/templates/embedded-rust/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "embedded-rust",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "name": "Embedded Rust",
   "description": "A modern, batteries-included software development environment for embedded 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": "8.4.0"
+      "default": "8.4.1"
     }
   },
   "optionalPaths": [
diff --git a/templates/rust/devcontainer-template.json b/templates/rust/devcontainer-template.json
index f3042727..5a6186df 100644
--- a/templates/rust/devcontainer-template.json
+++ b/templates/rust/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "rust",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "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": "8.4.0"
+      "default": "8.4.1"
     }
   },
   "optionalPaths": [