diff --git a/.github/workflows/test-am-debs.yml b/.github/workflows/test-am-debs.yml
index 14f33a63..c982a55d 100644
--- a/.github/workflows/test-am-debs.yml
+++ b/.github/workflows/test-am-debs.yml
@@ -24,11 +24,13 @@ on:
       - "tests/archivematica/**"
       - "!tests/archivematica/README.md"
       - "!tests/archivematica/EL9/**"
+env:
+  build_packages: "${{ github.event_name == 'push' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && inputs.build_packages) }}"
 jobs:
   build-am-packages:
     name: Build Archivematica packages
     runs-on: ubuntu-latest
-    if: "${{ inputs.build_packages }}"
+    if: "${{ env.build_packages }}"
     steps:
     - name: Check out code
       uses: actions/checkout@v4
@@ -44,7 +46,7 @@ jobs:
   build-ss-packages:
     name: Build Storage Service packages
     runs-on: ubuntu-latest
-    if: "${{ inputs.build_packages }}"
+    if: "${{ env.build_packages }}"
     steps:
     - name: Check out code
       uses: actions/checkout@v4
@@ -60,7 +62,7 @@ jobs:
   create-package-repo:
     name: Create package repository
     runs-on: ubuntu-latest
-    if: "${{ inputs.build_packages }}"
+    if: "${{ env.build_packages }}"
     needs:
     - build-am-packages
     - build-ss-packages
@@ -93,8 +95,6 @@ jobs:
     needs: create-package-repo
     runs-on: ubuntu-latest
     if: "${{ always() }}"
-    env:
-      build_packages: ${{ inputs.build_packages }}
     steps:
     - name: Check if the repository creation job failed
       if: "${{ needs.create-package-repo.result != 'skipped' && ! env.build_packages }}"
diff --git a/.github/workflows/test-am-rpms.yml b/.github/workflows/test-am-rpms.yml
index 210e9610..1e6415b4 100644
--- a/.github/workflows/test-am-rpms.yml
+++ b/.github/workflows/test-am-rpms.yml
@@ -24,11 +24,13 @@ on:
       - "tests/archivematica/**"
       - "!tests/archivematica/README.md"
       - "!tests/archivematica/jammy/**"
+env:
+  build_packages: "${{ github.event_name == 'push' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && inputs.build_packages) }}"
 jobs:
   build-am-packages:
     name: Build Archivematica packages
     runs-on: ubuntu-latest
-    if: "${{ inputs.build_packages }}"
+    if: "${{ env.build_packages }}"
     steps:
     - name: Check out code
       uses: actions/checkout@v4
@@ -44,7 +46,7 @@ jobs:
   build-ss-packages:
     name: Build Storage Service packages
     runs-on: ubuntu-latest
-    if: "${{ inputs.build_packages }}"
+    if: "${{ env.build_packages }}"
     steps:
     - name: Check out code
       uses: actions/checkout@v4
@@ -60,7 +62,7 @@ jobs:
   create-package-repo:
     name: Create package repository
     runs-on: ubuntu-latest
-    if: "${{ inputs.build_packages }}"
+    if: "${{ env.build_packages }}"
     needs:
     - build-am-packages
     - build-ss-packages
@@ -93,8 +95,6 @@ jobs:
     needs: create-package-repo
     runs-on: ubuntu-latest
     if: "${{ always() }}"
-    env:
-      build_packages: ${{ inputs.build_packages }}
     steps:
     - name: Check if the repository creation job failed
       if: "${{ needs.create-package-repo.result != 'skipped' && ! env.build_packages }}"