diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b71e1637..e23f6a8d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,11 +84,6 @@ jobs:
             USER_GID=1000
             DEVCELL_GUI_ENABLED=true
 
-      - name: Tag base image locally for extended build
-        run: |
-          docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:latest-${{ matrix.arch }}
-          docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:latest-${{ matrix.arch }} devcell:latest
-
       - name: Extract metadata for extended image
         id: meta-extended
         uses: docker/metadata-action@v5
@@ -112,6 +107,7 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ matrix.arch }}-extended
           provenance: false
           build-args: |
+            BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:latest-${{ matrix.arch }}
             USER_NAME=devuser
             USER_UID=1000
             USER_GID=1000
diff --git a/Dockerfile-local.example b/Dockerfile-local.example
index b08bc35b..b0909754 100644
--- a/Dockerfile-local.example
+++ b/Dockerfile-local.example
@@ -2,7 +2,8 @@
 # Copy to Dockerfile-local and customize (gitignored)
 # Build with: task build (builds base + local automatically)
 
-FROM devcell:latest
+ARG BASE_IMAGE=devcell:latest
+FROM ${BASE_IMAGE}
 
 # Re-declare ARGs from base (ARGs don't persist across FROM)
 # Values are passed from compose.yml build args