diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index e85ec109..17a9c5d6 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "6.8.0"
+  ".": "6.8.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86be0ce4..cd97ab69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,31 @@ 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.8.1](https://github.com/philips-software/amp-devcontainer/compare/v6.8.0...v6.8.1) (2026-02-23)
+
+
+### Bug Fixes
+
+* Update apt.llvm.org gpg key checksum ([#1162](https://github.com/philips-software/amp-devcontainer/issues/1162)) ([117adbc](https://github.com/philips-software/amp-devcontainer/commit/117adbc6418c5700571a0178a48d7d6ec41c0892))
+* Update apt.llvm.org gpg key snapshot ([117adbc](https://github.com/philips-software/amp-devcontainer/commit/117adbc6418c5700571a0178a48d7d6ec41c0892))
+
+
+### Chores
+
+* **deps, base:** Update g++-14 ([#1156](https://github.com/philips-software/amp-devcontainer/issues/1156)) ([db4e403](https://github.com/philips-software/amp-devcontainer/commit/db4e4033c3bb379f7f5dcc8e7d9847a089810b2d))
+* **deps, cpp:** Update alexkrechik.cucumberautocomplete, ms-vscode.cpptools in devcontainer.json ([#1154](https://github.com/philips-software/amp-devcontainer/issues/1154)) ([248dd41](https://github.com/philips-software/amp-devcontainer/commit/248dd41c4d62d06f846d76cf525fde733bf8de0b))
+* **deps, cpp:** Update github.vscode-pull-request-github, ms-vscode.cmake-tools, ms-vscode.cpptools in devcontainer.json ([#1145](https://github.com/philips-software/amp-devcontainer/issues/1145)) ([ea8d44c](https://github.com/philips-software/amp-devcontainer/commit/ea8d44cdbda5ee500c6ae3b587d6bf77b92af867))
+* **deps, cpp:** Update ms-vscode.cmake-tools, ms-vscode.cpptools in devcontainer-metadata.json ([#1144](https://github.com/philips-software/amp-devcontainer/issues/1144)) ([84f3450](https://github.com/philips-software/amp-devcontainer/commit/84f34502b14cb422cc7dff1d7408425a490ffbe7))
+* **deps, cpp:** Update ms-vscode.cmake-tools, sonarsource.sonarlint-vscode in devcontainer-metadata.json ([#1159](https://github.com/philips-software/amp-devcontainer/issues/1159)) ([fb963d1](https://github.com/philips-software/amp-devcontainer/commit/fb963d1a7a82c0e977a4b20d3ef32c5e0b5dfbef))
+* **deps, cpp:** Update ms-vscode.cmake-tools, sonarsource.sonarlint-vscode in devcontainer.json ([#1160](https://github.com/philips-software/amp-devcontainer/issues/1160)) ([fd8449d](https://github.com/philips-software/amp-devcontainer/commit/fd8449d33514cc1c2ce1e85d55d3d159346f02df))
+* **deps, cpp:** Update ms-vscode.cpptools in devcontainer-metadata.json ([#1152](https://github.com/philips-software/amp-devcontainer/issues/1152)) ([6a57e1b](https://github.com/philips-software/amp-devcontainer/commit/6a57e1bba5d6b9f1a319fc7566435c2a992a86a4))
+* **deps, rust:** Update github.vscode-pull-request-github in devcontainer.json ([#1146](https://github.com/philips-software/amp-devcontainer/issues/1146)) ([02d75f0](https://github.com/philips-software/amp-devcontainer/commit/02d75f065832d1e775d88fca88e5464cd4c96169))
+* **deps, rust:** Update rust-lang.rust-analyzer in devcontainer-metadata.json ([#1153](https://github.com/philips-software/amp-devcontainer/issues/1153)) ([22ef006](https://github.com/philips-software/amp-devcontainer/commit/22ef00632ab52fc85d0ea973edb59f3304779742))
+* **deps, rust:** Update rust-lang.rust-analyzer in devcontainer.json ([#1155](https://github.com/philips-software/amp-devcontainer/issues/1155)) ([bfe1bc2](https://github.com/philips-software/amp-devcontainer/commit/bfe1bc2f22ab45f716783f6ad743d03819151576))
+* **deps, rust:** Update sonarsource.sonarlint-vscode in devcontainer.json ([#1161](https://github.com/philips-software/amp-devcontainer/issues/1161)) ([5ad6b8c](https://github.com/philips-software/amp-devcontainer/commit/5ad6b8ca09444b8129a5e58230fba2b70deb2d42))
+* **deps:** Bump conan from 2.24.0 to 2.25.1 in /.devcontainer ([#1139](https://github.com/philips-software/amp-devcontainer/issues/1139)) ([9e104c6](https://github.com/philips-software/amp-devcontainer/commit/9e104c61a3ed4492297481abce7f4b58a26f81e9))
+* **deps:** Bump conan from 2.25.1 to 2.25.2 in /.devcontainer ([#1149](https://github.com/philips-software/amp-devcontainer/issues/1149)) ([d938b08](https://github.com/philips-software/amp-devcontainer/commit/d938b08de9d6ca4fb3f592eef0cfc95484d2af4b))
+
 ## [6.8.0](https://github.com/philips-software/amp-devcontainer/compare/v6.7.2...v6.8.0) (2026-02-05)
 
 
diff --git a/templates/cpp/devcontainer-template.json b/templates/cpp/devcontainer-template.json
index 42e23f54..bf68bbb5 100644
--- a/templates/cpp/devcontainer-template.json
+++ b/templates/cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "cpp",
-  "version": "6.8.0",
+  "version": "6.8.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": "6.8.0"
+      "default": "6.8.1"
     }
   },
   "optionalPaths": [
diff --git a/templates/rust/devcontainer-template.json b/templates/rust/devcontainer-template.json
index 47d33c23..ed4e45b7 100644
--- a/templates/rust/devcontainer-template.json
+++ b/templates/rust/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
   "id": "rust",
-  "version": "6.8.0",
+  "version": "6.8.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": "6.8.0"
+      "default": "6.8.1"
     }
   },
   "optionalPaths": [