diff --git a/.devcontainer/codespace/devcontainer.json b/.devcontainer/codespace/devcontainer.json
new file mode 100644
index 0000000000..85b025bee3
--- /dev/null
+++ b/.devcontainer/codespace/devcontainer.json
@@ -0,0 +1,12 @@
+{
+    "image": "gcr.io/crosvm-infra/crosvm_dev:r0031",
+    "extensions": [
+        "rust-lang.rust-analyzer",
+        "bungcip.better-toml",
+        "esbenp.prettier-vscode",
+        "ms-python.vscode-pylance",
+        "foxundermoon.shell-format",
+        "timonwong.shellcheck"
+    ],
+    "updateContentCommand": "git submodule update --init"
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/default/devcontainer.json
similarity index 92%
rename from .devcontainer/devcontainer.json
rename to .devcontainer/default/devcontainer.json
index 6d9236327f..d40618d6d8 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/default/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "image": "gcr.io/crosvm-infra/crosvm_dev:r0019",
+    "image": "gcr.io/crosvm-infra/crosvm_dev_user:r0031",
     "extensions": [
         "rust-lang.rust-analyzer",
         "bungcip.better-toml",