diff --git a/.github/workflows/cache-verify.yml b/.github/workflows/cache-verify.yml
index 9d95a05bf..92b78f255 100644
--- a/.github/workflows/cache-verify.yml
+++ b/.github/workflows/cache-verify.yml
@@ -48,32 +48,39 @@ jobs:
             webapp/.env
 
   build-images:
-    name: Build Docker Images
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: [backend, webapp, neo4j]
+        include:
+          - name: backend
+            context: ./backend
+            dockerfile: ./backend/Dockerfile
+            target: build
+          - name: webapp
+            context: ./webapp
+            dockerfile: ./webapp/Dockerfile
+            target: build
+          - name: neo4j
+            context: ./neo4j
+            dockerfile: ./neo4j/Dockerfile
+            target: community
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: build-artifacts
-          path: ./build-artifacts
       - uses: docker/setup-buildx-action@v3
-      - name: Build ${{ matrix.service }} image
+      - name: Build ${{ matrix.name }} image
         uses: docker/build-push-action@v5
         with:
-          context: ./${{ matrix.service }}
-          file: ./${{ matrix.service }}/Dockerfile
-          target: production
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
+          target: ${{ matrix.target }}
           push: false
-          outputs: type=docker,dest=/tmp/${{ matrix.service }}.tar
-      - name: Upload ${{ matrix.service }} image
+          outputs: type=docker,dest=/tmp/${{ matrix.name }}.tar
+      - name: Upload ${{ matrix.name }} image
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.service }}-image
-          path: /tmp/${{ matrix.service }}.tar
-
+          name: ${{ matrix.name }}-image
+          path: /tmp/${{ matrix.name }}.tar
+          
   consolidate-environment:
     name: Consolidate Environment and Run Tests
     runs-on: ubuntu-latest