diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 33901bc3..6a25d173 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
   "name": "Flux Cluster Template",
-  "image": "ghcr.io/onedr0p/cluster-template/devcontainer:base",
+  "image": "ghcr.io/onedr0p/cluster-template/devcontainer:latest",
+  "initializeCommand": "docker pull ghcr.io/onedr0p/cluster-template/devcontainer:latest",
   "postCreateCommand": {
     "setup": "bash ${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh"
   },
diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml
index 9582cfa3..c6aa7989 100644
--- a/.github/workflows/devcontainer.yaml
+++ b/.github/workflows/devcontainer.yaml
@@ -52,7 +52,7 @@ jobs:
         with:
           imageName: ghcr.io/${{ github.repository }}/devcontainer
           # cacheFrom: ghcr.io/${{ github.repository }}/devcontainer
-          imageTag: base,latest
+          imageTag: latest
           platform: linux/amd64 #,linux/arm64
           configFile: .devcontainer/ci/devcontainer.json
           push: ${{ github.event_name == 'pull_request' && 'never' || 'always' }}