diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml
index 1a6597f24bf..4786deefe91 100644
--- a/.github/workflows/tests-integration-reusable.yml
+++ b/.github/workflows/tests-integration-reusable.yml
@@ -213,6 +213,7 @@ jobs:
         export BOSH_DEPLOY_ARGS=""
         export BOSH_LITE=false
         export BBL_JSON_CONFIG=""
+        export SKIP_STEMCELL_UPLOAD=false
         export OPS_FILES="add-persistent-isolation-segment-diego-cell.yml \
                           add-uaa-client-credentials.yml \
                           diego-cell-instances.yml \
diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml
index 4d886beb819..e08fcb0794a 100644
--- a/.github/workflows/tests-integration.yml
+++ b/.github/workflows/tests-integration.yml
@@ -13,7 +13,7 @@ on:
 jobs: 
   run-integration-tests-cf-env-with-edge-capi:
     name: Integration tests with EDGE CAPI
-    if: github.event.workflow_run.conclusion == 'success'
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/tests-integration-reusable.yml
     with:
       capi-version: edge
@@ -24,7 +24,7 @@ jobs:
 
   run-integration-tests-cf-env-with-edge-capi-with-client-creds:
     name: EDGE CAPI and client creds
-    if: github.event.workflow_run.conclusion == 'success'
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/tests-integration-reusable.yml
     with:
       capi-version: edge
@@ -35,7 +35,7 @@ jobs:
 
   run-integration-tests-cf-env-with-min-capi:
     name: MIN CAPI
-    if: github.event.workflow_run.conclusion == 'success'
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/tests-integration-reusable.yml
     with:
       capi-version: min
@@ -46,7 +46,7 @@ jobs:
 
   #run-integration-windows:
   #  name: Windows
-  #  if: github.event.workflow_run.conclusion == 'success'
+  #  if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
   #  uses: ./.github/workflows/tests-integration-reusable.yml
   #  with:
   #    capi-version: edge
@@ -57,7 +57,7 @@ jobs:
 
   #run-integration-windows-client-credentials:
   #  name: Windows with client credentials
-  #  if: github.event.workflow_run.conclusion == 'success'
+  #  if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
   #  uses: ./.github/workflows/tests-integration-reusable.yml
   #  with:
   #    capi-version: edge