diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2106e26..1e8f978 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,9 @@ jobs:
         run: ${{ matrix.runs.images }}
 
   build_and_push:
-    needs: generate-jobs
+    needs: 
+      - generate-jobs
+      - test
     strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }}
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
@@ -58,18 +60,18 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
+
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
+
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          file: ./${{ matrix.name }}/${{ matrix.os }}/$Dockerfile
+          file: ./${{ matrix.directory }}/${{ matrix.file }}
           context: .
           push: true
-          tags: roshkhatri/valkey:${{ matrix.name }}-${{ matrix.os }}
+          tags: roshkhatri/valkey:${{ matrix.tags }}