diff --git a/.devcontainer/prebuilt/README.md b/.devcontainer/prebuilt/README.md
index 133b0c1d64bf2..82e731230c0d6 100644
--- a/.devcontainer/prebuilt/README.md
+++ b/.devcontainer/prebuilt/README.md
@@ -98,7 +98,7 @@ Next, let's try debugging.
 
 2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
 
-    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
+    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
 
 3. After a bit, Code - OSS will appear with the debugger attached!
 
diff --git a/.devcontainer/prebuilt/cache/build-cache-image.sh b/.devcontainer/prebuilt/cache/build-cache-image.sh
index 451d1ab45a9b2..96767f079a466 100755
--- a/.devcontainer/prebuilt/cache/build-cache-image.sh
+++ b/.devcontainer/prebuilt/cache/build-cache-image.sh
@@ -17,7 +17,7 @@ fi
 
 TAG="branch-${BRANCH//\//-}"
 echo "[$(date)] ${BRANCH} => ${TAG}"
-cd "${SCRIPT_PATH}/../.."
+cd "${SCRIPT_PATH}/../../.."
 
 echo "[$(date)] Starting image build and push..."
 export DOCKER_BUILDKIT=1
diff --git a/.devcontainer/prebuilt/cache/cache.Dockerfile b/.devcontainer/prebuilt/cache/cache.Dockerfile
index 217122a4e9b95..26dbc46f43f0e 100644
--- a/.devcontainer/prebuilt/cache/cache.Dockerfile
+++ b/.devcontainer/prebuilt/cache/cache.Dockerfile
@@ -9,9 +9,9 @@ COPY --chown=${USERNAME}:${USERNAME} . /repo-source-tmp/
 RUN mkdir -p ${CACHE_FOLDER} && chown ${USERNAME} ${CACHE_FOLDER} /repo-source-tmp \
 	&& su ${USERNAME} -c "\
 		cd /repo-source-tmp \
-		&& .devcontainer/cache/before-cache.sh . ${CACHE_FOLDER} \
-		&& .devcontainer/prepare.sh . ${CACHE_FOLDER} \
-		&& .devcontainer/cache/cache-diff.sh . ${CACHE_FOLDER}"
+		&& .devcontainer/prebuilt/cache/before-cache.sh . ${CACHE_FOLDER} \
+		&& .devcontainer/prebuilt/prepare.sh . ${CACHE_FOLDER} \
+		&& .devcontainer/prebuilt/cache/cache-diff.sh . ${CACHE_FOLDER}"
 
 # This second stage starts fresh and just copies in cache.tar from the previous stage. The related
 # devcontainer.json file is then setup to have postCreateCommand fire restore-diff.sh to expand it.
diff --git a/.devcontainer/prebuilt/devcontainer.json b/.devcontainer/prebuilt/devcontainer.json
index 63b61fb7a102f..455df4f907970 100644
--- a/.devcontainer/prebuilt/devcontainer.json
+++ b/.devcontainer/prebuilt/devcontainer.json
@@ -34,7 +34,7 @@
 	},
 
 	// Optionally loads a cached yarn install for the repo
-	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
+	"postCreateCommand": ".devcontainer/prebuilt/cache/restore-diff.sh",
 
 	"remoteUser": "node",
 
diff --git a/.github/workflows/devcontainer-cache.yml b/.github/workflows/devcontainer-cache.yml
index b1b4c53b77b6d..eeccbdc958dc5 100644
--- a/.github/workflows/devcontainer-cache.yml
+++ b/.github/workflows/devcontainer-cache.yml
@@ -38,4 +38,4 @@ jobs:
           GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
           if [ "$GIT_BRANCH" == "" ]; then GIT_BRANCH=main; fi
 
-          .devcontainer/cache/build-cache-image.sh "${{ secrets.CONTAINER_IMAGE_REGISTRY }}/public/vscode/devcontainers/repos/microsoft/vscode" "${GIT_BRANCH}"
+          .devcontainer/prebuilt/cache/build-cache-image.sh "${{ secrets.CONTAINER_IMAGE_REGISTRY }}/public/vscode/devcontainers/repos/microsoft/vscode" "${GIT_BRANCH}"