diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
index 0efe1d7252..764f913457 100644
--- a/.github/workflows/ci-build-image.yml
+++ b/.github/workflows/ci-build-image.yml
@@ -46,6 +46,7 @@ jobs:
 
   build-image:
     runs-on: ubuntu-latest
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     needs: [get-pom-properties]
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     steps:
diff --git a/.github/workflows/dependent-issues.yml b/.github/workflows/dependent-issues.yml
index 0453e93bda..02ec615e4b 100644
--- a/.github/workflows/dependent-issues.yml
+++ b/.github/workflows/dependent-issues.yml
@@ -21,6 +21,7 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+
 jobs:
   check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index cdb0f391bf..c07ade80e3 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -24,6 +24,7 @@ on:
 jobs:
   code-analysis:
     uses: ./.github/workflows/ci-code-analysis.yml
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     with:
       checkout-repo: ${{ github.event.pull_request.head.repo.full_name }}
       checkout-ref: ${{ github.event.pull_request.head.ref }}
@@ -36,6 +37,7 @@ jobs:
       matrix:
         arch: [amd64, arm64]
     uses: ./.github/workflows/ci-build-image.yml
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     with:
       build-arch: ${{ matrix.arch }}
       checkout-repo: ${{ github.event.pull_request.head.repo.full_name }}
@@ -47,6 +49,7 @@ jobs:
 
   push-to-ghcr:
     runs-on: ubuntu-latest
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     strategy:
       matrix:
         arch: [amd64, arm64]
diff --git a/.github/workflows/push-ci.yml b/.github/workflows/push-ci.yml
index ef28425697..779209a237 100644
--- a/.github/workflows/push-ci.yml
+++ b/.github/workflows/push-ci.yml
@@ -21,6 +21,7 @@ jobs:
       checkout-repo: ${{ github.event.pull_request.head.repo.full_name }}
       checkout-ref: ${{ github.event.pull_request.head.ref }}
     secrets: inherit
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     if: github.repository_owner == 'cryostatio'
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
   build-and-test-amd64:
@@ -28,6 +29,7 @@ jobs:
     secrets: inherit
     with:
       build-arch: amd64
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     if: github.repository_owner == 'cryostatio'
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
   build-and-test-arm64:
@@ -36,6 +38,7 @@ jobs:
     with:
       build-arch: arm64
       skip-itests: true
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     if: github.repository_owner == 'cryostatio'
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
   push-to-quay:
@@ -43,6 +46,7 @@ jobs:
     needs: [code-analysis, build-and-test-amd64, build-and-test-arm64]
     env:
       CRYOSTAT_IMG: quay.io/cryostat/cryostat
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     if: always() && github.repository_owner == 'cryostatio'
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/build-test')
     steps: