diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 0000000..2cf9a55
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,63 @@
+// Reference:
+// - https://containers.dev/features
+// - https://containers.dev/implementors/features
+// - https://code.visualstudio.com/docs/getstarted/settings
+{
+  // NOTE: remove `image` and uncomment `build` to build the image locally
+  //"build": {
+  //  "dockerfile": "Dockerfile",
+  //  "context": "."
+  //},
+  "name": "pulumi",
+  "image": "ghcr.io/pulumi/devcontainer",
+  "settings": {
+    "terminal.integrated.shell.linux": "/usr/bin/zsh"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": [
+        "go.testTags", "all",
+        "go.buildTags", "all",
+        "editor.minimap.enabled", false,
+        "explorer.openEditors.visible", 1,
+        "editor.quickSuggestionsDelay", 0,
+        "editor.suggestSelection", "first",
+        "editor.snippetSuggestions", "top",
+        "editor.gotoLocation.multipleReferences", "goto",
+        "editor.gotoLocation.multipleDefinitions", "goto",
+        "editor.gotoLocation.multipleDeclarations", "goto",
+        "editor.gotoLocation.multipleImplementations", "goto",
+        "editor.gotoLocation.multipleTypeDefinitions", "goto",
+        "files.trimTrailingWhitespace", true,
+        "files.trimFinalNewlines", true
+      ],
+      "extensions": [
+        "golang.go",
+        "vscodevim.vim",
+        "github.copilot",
+        "ms-python.python",
+        "jetpack-io.devbox",
+        "redhat.vscode-yaml",
+        "eg2.vscode-npm-script",
+        "esbenp.prettier-vscode",
+        "ms-vscode.makefile-tools",
+        "ms-azuretools.vscode-docker",
+        "github.vscode-pull-request-github",
+        "ms-vscode-remote.remote-containers",
+        "visualstudioexptteam.vscodeintellicode",
+        "bierner.markdown-preview-github-styles"
+      ]
+    }
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {},
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+      "version": "latest",
+      "installDockerBuildx": true,
+      "moby": false
+    }
+  },
+  "postCreateCommand": "git submodule update --init --recursive",
+  "remoteUser": "vscode",
+  "runArgs": ["--network=host"]
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 120000
index 96829f9..0000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1 +0,0 @@
-../devcontainer.json
\ No newline at end of file
diff --git a/README.md b/README.md
index 393e5e6..d568a46 100644
--- a/README.md
+++ b/README.md
@@ -22,13 +22,13 @@ To add this repository as a submodule to your project, run the following command
 
 ```bash
 git submodule add https://github.com/pulumi/devcontainer .devcontainer
-git submodule update --init --recursive
+git submodule update --init --recursive .devcontainer
 ```
 
 To update the devcontainer submodule in consuming repos:
 
 ```bash
-git submodule update --remote --merge
+git submodule update --remote --merge .devcontainer
 ```
 
 After the submodule is added, you can open your project in VS Code and it will automatically detect the Dev Container configuration and prompt you to open the project in a container, or you can open the project in Github CodeSpaces.
diff --git a/devcontainer.json b/devcontainer.json
index fbbc13c..2cf9a55 100644
--- a/devcontainer.json
+++ b/devcontainer.json
@@ -35,8 +35,8 @@
         "golang.go",
         "vscodevim.vim",
         "github.copilot",
-        "eamodio.gitlens",
         "ms-python.python",
+        "jetpack-io.devbox",
         "redhat.vscode-yaml",
         "eg2.vscode-npm-script",
         "esbenp.prettier-vscode",