diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a95a9fb..9c0bc87 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,6 +17,8 @@
 
   build-openstack-images:
     runs-on: ubuntu-latest
+    needs:
+      - build-matrix
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.build-matrix.outputs.matrix) }}
@@ -51,14 +53,13 @@
 
   promote-openstack-images:
     if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
-    needs:
-      - build-openstack-images
     runs-on: ubuntu-latest
+    needs:
+      - build-matrix
+      - build-openstack-images
     strategy:
       fail-fast: false
-      matrix:
-        project: ${{ fromJson(needs.build-matrix.outputs.project_matrix) }}
-        release: ${{ fromJson(needs.build-matrix.outputs.release_matrix) }}
+      matrix: ${{ fromJSON(needs.build-matrix.outputs.matrix) }}
     steps:
       - run: ./ci/openstack-image-build-env ${{ matrix.project }} ${{ matrix.release }} >> $GITHUB_ENV
       - uses: docker/login-action@v2