diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 985d9bfbcf..7f2a4524a9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,11 +1,11 @@
 {
     "name": "Nav2",
-	"build": {
-		"dockerfile": "../Dockerfile",
+    "build": {
+        "dockerfile": "../Dockerfile",
         "context": "..",
         "target": "dever",
         "cacheFrom": "ghcr.io/ros-planning/navigation2:main"
-	},
+    },
     "runArgs": [
         "--privileged",
         "--network=host"
@@ -20,12 +20,17 @@
         "CCACHE_DIR": "/tmp/.ccache"
     },
     "mounts": [
-		{
-			"source": "ccache",
-			"target": "/tmp/.ccache",
-			"type": "volume"
-		}
-	],
+        {
+            "source": "ccache-${devcontainerId}",
+            "target": "/tmp/.ccache",
+            "type": "volume"
+        },
+        {
+            "source": "overlay-${devcontainerId}",
+            "target": "/opt/overlay_ws",
+            "type": "volume"
+        }
+    ],
     "features": {
         // "ghcr.io/devcontainers/features/desktop-lite:1": {},
         "ghcr.io/devcontainers/features/github-cli:1": {}
diff --git a/.devcontainer/on-create-command.sh b/.devcontainer/on-create-command.sh
index 2d8f4e9eee..f86d22bc8d 100755
--- a/.devcontainer/on-create-command.sh
+++ b/.devcontainer/on-create-command.sh
@@ -7,12 +7,6 @@ set -eo pipefail
 # set -x
 # env
 
-cd $OVERLAY_WS
-
 git config --global --add safe.directory "*"
-colcon cache lock
 
-. $UNDERLAY_WS/install/setup.sh
-colcon build \
-    --symlink-install \
-    --mixin $OVERLAY_MIXINS
+.devcontainer/update-content-command.sh
diff --git a/.devcontainer/update-content-command.sh b/.devcontainer/update-content-command.sh
index d3d619b59a..2bdbf5cc1a 100755
--- a/.devcontainer/update-content-command.sh
+++ b/.devcontainer/update-content-command.sh
@@ -49,9 +49,9 @@ then
 fi
 echo BUILD_PACKAGES: $BUILD_PACKAGES
 
-colcon clean packages --yes \
-    --packages-select ${BUILD_PACKAGES} \
-    --base-select install
+# colcon clean packages --yes \
+#     --packages-select ${BUILD_PACKAGES} \
+#     --base-select install
 
 . $UNDERLAY_WS/install/setup.sh
 colcon build \