diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c524f1bd3..7a3d603545 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -204,14 +204,14 @@ jobs:
           retention-days: 3
 
   docker-compose-tests:
-    if: |
+    needs: ${{ needs.files-changed.outputs.docker == 'true' && ['files-changed', 'test-build-docker-images'] || ['files-changed'] }}
+    if: ${{ 
       needs.files-changed.outputs.project == 'true' &&
       (
         needs.files-changed.outputs.docker != 'true' ||
-        needs.test-build-docker-images.result == 'success' ||
-        needs.test-build-docker-images.result == 'skipped'
+        contains(fromJson('["success", "skipped"]'), needs.test-build-docker-images.result)
       )
-    needs: [files-changed, test-build-docker-images]
+    }}
     # if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
     #     (github.event_name == 'pull_request' &&
     #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&