diff --git a/.devcontainer/base/devcontainer.json b/.devcontainer/base/devcontainer.json
index f3b5ffe9984..fdef3562af1 100644
--- a/.devcontainer/base/devcontainer.json
+++ b/.devcontainer/base/devcontainer.json
@@ -1,8 +1,8 @@
 {
-  "name": "Autoware",
+  "name": "autoware:universe-devel",
   "build": {
     "dockerfile": "../Dockerfile",
-    "args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware:latest-devel" }
+    "args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware:universe-devel" }
   },
   "remoteUser": "autoware",
   "runArgs": [
diff --git a/.devcontainer/cuda/devcontainer.json b/.devcontainer/cuda/devcontainer.json
index bb0b6ad849e..3a6a1c247a1 100644
--- a/.devcontainer/cuda/devcontainer.json
+++ b/.devcontainer/cuda/devcontainer.json
@@ -1,8 +1,8 @@
 {
-  "name": "Autoware-cuda",
+  "name": "autoware:universe-devel-cuda",
   "build": {
     "dockerfile": "../Dockerfile",
-    "args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware:latest-devel-cuda" }
+    "args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware:universe-devel-cuda" }
   },
   "remoteUser": "autoware",
   "hostRequirements": {