diff --git a/.github/workflows/build-test-artifacts.yml b/.github/workflows/build-test-artifacts.yml
index e5fdb5cfd9..8d08524141 100644
--- a/.github/workflows/build-test-artifacts.yml
+++ b/.github/workflows/build-test-artifacts.yml
@@ -93,7 +93,11 @@ jobs:
 
   StartIntegrationTests:
     needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ]
+<<<<<<< Updated upstream
     if: ${{inputs.test-image-before-upload == null || inputs.test-image-before-upload}}
+=======
+    if: ${{ (github.event_name != 'workflow_call') || inputs.test-image-before-upload }}
+>>>>>>> Stashed changes
     runs-on: ubuntu-latest
     steps:
       - run: gh workflow run integration-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }}
@@ -103,7 +107,11 @@ jobs:
   StartApplicationSignalsE2ETests:
     needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ]
     # Workflow only runs against main
+<<<<<<< Updated upstream
     if: ${{ contains(github.ref_name, 'main')  && (inputs.test-image-before-upload == null ||inputs.test-image-before-upload) }}
+=======
+    if: ${{ contains(github.ref_name, 'main') && ((github.event_name != 'workflow_call') || inputs.test-image-before-upload) }}
+>>>>>>> Stashed changes
     runs-on: ubuntu-latest
     steps:
       - run: gh workflow run application-signals-e2e-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }}