diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f508bf364e..371f5b9846 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,7 +11,7 @@
 			]
 		}
 	},
-	"postCreateCommand": "git config --global --add safe.directory /workspaces/qmk_userspace && git submodule update --init --recursive && { [ -d /workspaces/qmk_userspace/qmk_firmware ] || git clone https://github.com/qmk/qmk_firmware.git /workspaces/qmk_userspace/qmk_firmware; } && git config --global --add safe.directory /workspaces/qmk_userspace/qmk_firmware && qmk config user.qmk_home=/workspaces/qmk_userspace/qmk_firmware && qmk config user.overlay_dir=/workspaces/qmk_userspace && qmk git-submodule"
+	"postCreateCommand": "/workspaces/qmk_userspace/.devcontainer/setup.sh"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
new file mode 100755
index 0000000000..ba789d8204
--- /dev/null
+++ b/.devcontainer/setup.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -eEuo pipefail
+
+wget https://bootstrap.pypa.io/get-pip.py
+python3 get-pip.py
+python3 -m pip install qmk
+rm get-pip.py
+
+git config --global --add safe.directory /workspaces/qmk_userspace
+git submodule update --init --recursive
+
+[ -d /workspaces/qmk_firmware ] || git clone https://github.com/qmk/qmk_firmware.git /workspaces/qmk_firmware
+git config --global --add safe.directory /workspaces/qmk_firmware
+
+qmk config user.qmk_home=/workspaces/qmk_firmware
+qmk config user.overlay_dir=/workspaces/qmk_userspace
+
+qmk git-submodule
+
+cat << __EOF__ > /workspaces/qmk_userspace/devcontainer.code-workspace
+{
+    "folders": [
+        {
+            "name": "qmk_userspace",
+            "path": "/workspaces/qmk_userspace"
+        },
+        {
+            "name": "qmk_firmware",
+            "path": "/workspaces/qmk_firmware"
+        },
+    ],
+}
+__EOF__