diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
index 68dc1f29c6..41cfee482c 100644
--- a/.github/workflows/distribute.yml
+++ b/.github/workflows/distribute.yml
@@ -17,11 +17,10 @@ on:
         default: true
 jobs:
   distribute-spring-enterprise-release-bundle:
-  	if: ${{ vars.COMMERCIAL }}
     runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
     steps:
       - name: Create Bundle
-        if: ${{ inputs.create-bundle }}
+        if: ${{ vars.COMMERCIAL && inputs.create-bundle }}
         shell: bash
         run: |
           curl -s -u "${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}:${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}" \
@@ -29,10 +28,11 @@ jobs:
             "https://usw1.packages.broadcom.com/lifecycle/api/v2/release_bundle?project=spring" \
             -d '{"release_bundle_name": "TNZ-spring-boot-commercial", "release_bundle_version": "${{ inputs.version }}", "skip_docker_manifest_resolution": true, "source_type": "builds", "source": {"builds": [ {"build_repository": "spring-build-info", "build_name": "spring-boot-commercial-${{ inputs.version }}", "build_number": "${{ inputs.build-number }}", "include_dependencies": false}]}}'
       - name: Sleep
-        if: ${{ inputs.create-bundle }}
+        if: ${{ vars.COMMERCIAL && inputs.create-bundle }}
         shell: bash
         run: sleep 30
       - name: Distribute Bundle
+        if: ${{ vars.COMMERCIAL }}
         shell: bash
         run: |
           curl -s -u "${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}:${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}" \