diff --git a/.github/workflows/build-base-images-task.yml b/.github/workflows/build-base-images-task.yml
index c59ff42..9705c6e 100644
--- a/.github/workflows/build-base-images-task.yml
+++ b/.github/workflows/build-base-images-task.yml
@@ -17,14 +17,16 @@ jobs:
     strategy:
       matrix:
         base:
-          - name: nx-base
-            dockerfile: Docker/NxBase.Dockerfile
-            tags: |
-              docker.io/ptr727/nx-base:ubuntu-noble
-          - name: nx-base-lsio
-            dockerfile: Docker/NxBase-LSIO.Dockerfile
-            tags: |
-              docker.io/ptr727/nx-base-lsio:ubuntu-noble
+          - name: nx-base
+            dockerfile: Docker/NxBase.Dockerfile
+            cache_tag: docker.io/ptr727/nx-base:ubuntu-noble
+            tags: |
+              docker.io/ptr727/nx-base:ubuntu-noble
+          - name: nx-base-lsio
+            dockerfile: Docker/NxBase-LSIO.Dockerfile
+            cache_tag: docker.io/ptr727/nx-base-lsio:ubuntu-noble
+            tags: |
+              docker.io/ptr727/nx-base-lsio:ubuntu-noble
 
     steps:
 
@@ -55,9 +57,9 @@ jobs:
           context: Docker
           file: ${{ matrix.base.dockerfile }}
           platforms: linux/amd64,linux/arm64
-          tags: ${{ matrix.base.tags }}
-          cache-from: |
-            type=registry,ref=${{ matrix.base.tags }}
+          tags: ${{ matrix.base.tags }}
+          cache-from: |
+            type=registry,ref=${{ matrix.base.cache_tag }}
             type=gha,scope=develop-base-${{ matrix.base.name }}
             type=gha,scope=main-base-${{ matrix.base.name }}
             ${{ github.event.pull_request && format('type=gha,scope=pr-base-{0}-{1}', github.event.pull_request.number, matrix.base.name) || '' }}