diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ceea515c..08466cd5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,26 +9,14 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-targets:
-    name: Generate targets list from provided bake file
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.targets.outputs.matrix }}
-    steps:
+  targets:
+      name: Generate targets list from provided bake file
+      runs-on: ubuntu-latest
+      outputs:
+        matrix: ${{ steps.targets.outputs.matrix }}
+      steps:
       - name: Checkout
-        uses: actions/checkout@v3      
-          
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      #- name: Login to Docker Hub
-      #  uses: docker/login-action@v2
-      #  with:
-      #    username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #    password: ${{ secrets.DOCKERHUB_TOKEN }}   
+        uses: actions/checkout@v3
       
       - name: Prepair Image Builds
         run: |
@@ -47,15 +35,19 @@ targets:
         run: |
           echo ${{ steps.targets.outputs.matrix }}
       
-        needs:
-         - targets
-
-        # 2.0 - Build a matrix strategy from the retrieved target list
-        strategy:
+      
+  build:
+      name: Get targets list and build
+      runs-on: ubuntu-latest
+      needs:
+      - targets
+      
+      strategy:
         fail-fast: true
         matrix:
           target: ${{ fromJson(needs.targets.outputs.matrix) }}
-        
+
+      steps:
       - name: Push Images using BuildX Bake
         uses: docker/bake-action@v2
         with: