diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 16622529d..f226fe961 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -16,10 +16,10 @@
         // Add sshd to support gh cli codespace cp.
         "ghcr.io/devcontainers/features/sshd:1": {
             "version": "latest"
-        },
-        "ghcr.io/devcontainers/features/go:1": {
-            "version": "1.22"
         }
+        // "ghcr.io/devcontainers/features/go:1": {
+        //     "version": "1.22"
+        // }
     },
     "remoteUser": "vscode",
     "customizations": {
diff --git a/.github/workflows/build-devcontainer.yml b/.github/workflows/build-devcontainer.yml
index 437d14659..feb49bb22 100644
--- a/.github/workflows/build-devcontainer.yml
+++ b/.github/workflows/build-devcontainer.yml
@@ -39,6 +39,17 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      # https://github.com/devcontainers/ci/issues/268#issuecomment-1976014578
+      - name: remove existing skopeo
+        run: |
+          sudo rm -rf $(which skopeo)
+
+      - name: Update skopeo
+        run: |
+          docker create --name skopeo quay.io/skopeo/stable:v1.17
+          docker cp skopeo:/usr/bin/skopeo /usr/local/bin/skopeo
+          sudo chmod a+x /usr/local/bin/skopeo
+
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5