diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 0000000000..c0ae5292d6
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,25 @@
+{
+  "name": "Node.js Core Developer Environment",
+  "runArgs": [
+    "--platform=linux/amd64"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "github.vscode-pull-request-github",
+        "ms-vsliveshare.vsliveshare",
+        "vscode-icons-team.vscode-icons",
+        "visualstudioexptteam.vscodeintellicode"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh (login)": {
+            "path": "zsh",
+            "args": ["-l"]
+          }
+        }
+      }
+    }
+  },
+  "image": "nodejs/devcontainer:nightly"
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index 75fda6e5b3..0000000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "Node.js Core Developer Environment",
-  "extensions": [
-    "github.vscode-pull-request-github",
-    "ms-vsliveshare.vsliveshare",
-    "vscode-icons-team.vscode-icons",
-    "visualstudioexptteam.vscodeintellicode"
-  ],
-  "image": "nodejs/devcontainer:nightly",
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh (login)": {
-        "path": "zsh",
-        "args": ["-l"]
-      }
-    }
-  }
-}
diff --git a/.gitignore b/.gitignore
index 60a3ff8b4a..90ebce4cb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,7 @@
 .*
 # Exclude specific dotfiles that we want to track.
 !deps/**/.*
-!.devcontainer/
-!.devcontainer/.devcontainer.json
+!.devcontainer.json
 !test/fixtures/**/.*
 !.clang-format
 !.cpplint