diff --git a/.devcontainer/cache/build-cache-image.sh b/.devcontainer/cache/build-cache-image.sh
index fb2886a3075..78d0fbfdf0c 100755
--- a/.devcontainer/cache/build-cache-image.sh
+++ b/.devcontainer/cache/build-cache-image.sh
@@ -15,7 +15,7 @@ if [ "${CONTAINER_IMAGE_REPOSITORY}" = "" ]; then
 	exit 1
 fi
 
-TAG="${BRANCH//\//-}"
+TAG="branch-${BRANCH//\//-}"
 echo "[$(date)] ${BRANCH} => ${TAG}"
 cd "${SCRIPT_PATH}/../.."
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 15715b06257..b32dd7f64e2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 	"name": "Code - OSS",
 
 	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
-	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:master",
+	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-master",
 
 	"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
 	"workspaceFolder": "/home/node/workspace/vscode",
diff --git a/.github/workflows/devcontainer-cache.yml b/.github/workflows/devcontainer-cache.yml
index 0e2dbfab8a7..82290a475ee 100644
--- a/.github/workflows/devcontainer-cache.yml
+++ b/.github/workflows/devcontainer-cache.yml
@@ -37,5 +37,5 @@ jobs:
           GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
           if [ "$GIT_BRANCH" == "" ]; then GIT_BRANCH=master; fi
 
-          .devcontainer/cache/build-cache-image.sh "${{ secrets.CONTAINER_IMAGE_REGISTRY }}/public/vscode/devcontainers/repos/microsoft/vscode" "master"
+          .devcontainer/cache/build-cache-image.sh "${{ secrets.CONTAINER_IMAGE_REGISTRY }}/public/vscode/devcontainers/repos/microsoft/vscode" "${GIT_BRANCH}"
 
diff --git a/yarn.lock b/yarn.lock
index 6cb3e84012e..d1abe68fe26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10200,4 +10200,3 @@ zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
   integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=
-