diff --git a/.github/workflows/pr-smoke-test-grpc-images.yml b/.github/workflows/pr-smoke-test-grpc-images.yml
index 60d0499b24..590f9d50aa 100644
--- a/.github/workflows/pr-smoke-test-grpc-images.yml
+++ b/.github/workflows/pr-smoke-test-grpc-images.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "smoke-tests/images/grpc/**"
       - ".github/workflows/pr-smoke-test-grpc-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
+    branches:
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/pr-smoke-test-play-images.yml b/.github/workflows/pr-smoke-test-play-images.yml
index 12b58ce0ec..fa3f9813ba 100644
--- a/.github/workflows/pr-smoke-test-play-images.yml
+++ b/.github/workflows/pr-smoke-test-play-images.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "smoke-tests/images/play/**"
       - ".github/workflows/pr-smoke-test-play-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
+    branches:
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/pr-smoke-test-quarkus-images.yml b/.github/workflows/pr-smoke-test-quarkus-images.yml
index 0d7e8018aa..b61064fb00 100644
--- a/.github/workflows/pr-smoke-test-quarkus-images.yml
+++ b/.github/workflows/pr-smoke-test-quarkus-images.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "smoke-tests/images/quarkus/**"
       - ".github/workflows/pr-smoke-test-quarkus-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
+    branches:
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/pr-smoke-test-security-manager-images.yml b/.github/workflows/pr-smoke-test-security-manager-images.yml
index b6092d0008..fe787c3c01 100644
--- a/.github/workflows/pr-smoke-test-security-manager-images.yml
+++ b/.github/workflows/pr-smoke-test-security-manager-images.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "smoke-tests/images/security-manager/**"
       - ".github/workflows/pr-smoke-test-security-manager-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
+    branches:
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/pr-smoke-test-spring-boot-images.yml b/.github/workflows/pr-smoke-test-spring-boot-images.yml
index 46e4da4aaa..34cc3c74bd 100644
--- a/.github/workflows/pr-smoke-test-spring-boot-images.yml
+++ b/.github/workflows/pr-smoke-test-spring-boot-images.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - "smoke-tests/images/spring-boot/**"
       - ".github/workflows/pr-smoke-test-spring-boot-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
+    branches:
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/publish-smoke-test-grpc-images.yml b/.github/workflows/publish-smoke-test-grpc-images.yml
index 11a671a030..664fb8a047 100644
--- a/.github/workflows/publish-smoke-test-grpc-images.yml
+++ b/.github/workflows/publish-smoke-test-grpc-images.yml
@@ -5,9 +5,9 @@ on:
     paths:
       - "smoke-tests/images/grpc/**"
       - ".github/workflows/publish-smoke-test-grpc-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
     branches:
       - main
-  workflow_dispatch:
 
 jobs:
   publish:
diff --git a/.github/workflows/publish-smoke-test-play-images.yml b/.github/workflows/publish-smoke-test-play-images.yml
index 9967f25fc4..c96a6a2a3c 100644
--- a/.github/workflows/publish-smoke-test-play-images.yml
+++ b/.github/workflows/publish-smoke-test-play-images.yml
@@ -5,9 +5,9 @@ on:
     paths:
       - "smoke-tests/images/play/**"
       - ".github/workflows/publish-smoke-test-play-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
     branches:
       - main
-  workflow_dispatch:
 
 jobs:
   publish:
diff --git a/.github/workflows/publish-smoke-test-quarkus-images.yml b/.github/workflows/publish-smoke-test-quarkus-images.yml
index 936e2c3385..0334e136a3 100644
--- a/.github/workflows/publish-smoke-test-quarkus-images.yml
+++ b/.github/workflows/publish-smoke-test-quarkus-images.yml
@@ -5,9 +5,9 @@ on:
     paths:
       - "smoke-tests/images/quarkus/**"
       - ".github/workflows/publish-smoke-test-quarkus-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
     branches:
       - main
-  workflow_dispatch:
 
 jobs:
   publish:
diff --git a/.github/workflows/publish-smoke-test-security-manager-images.yml b/.github/workflows/publish-smoke-test-security-manager-images.yml
index 28f1867549..567b022c75 100644
--- a/.github/workflows/publish-smoke-test-security-manager-images.yml
+++ b/.github/workflows/publish-smoke-test-security-manager-images.yml
@@ -5,9 +5,9 @@ on:
     paths:
       - "smoke-tests/images/security-manager/**"
       - ".github/workflows/publish-smoke-test-security-manager-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
     branches:
       - main
-  workflow_dispatch:
 
 jobs:
   publish:
diff --git a/.github/workflows/publish-smoke-test-spring-boot-images.yml b/.github/workflows/publish-smoke-test-spring-boot-images.yml
index e65e6036b5..3a458add87 100644
--- a/.github/workflows/publish-smoke-test-spring-boot-images.yml
+++ b/.github/workflows/publish-smoke-test-spring-boot-images.yml
@@ -5,9 +5,9 @@ on:
     paths:
       - "smoke-tests/images/spring-boot/**"
       - ".github/workflows/publish-smoke-test-spring-boot-images.yml"
+      - ".github/workflows/reusable-smoke-test-images.yml"
     branches:
       - main
-  workflow_dispatch:
 
 jobs:
   publish:
diff --git a/.github/workflows/reusable-smoke-test-images.yml b/.github/workflows/reusable-smoke-test-images.yml
index bb0d29ddec..e089898930 100644
--- a/.github/workflows/reusable-smoke-test-images.yml
+++ b/.github/workflows/reusable-smoke-test-images.yml
@@ -1,3 +1,10 @@
+# Every workflow that includes this must also include the following to make sure that it
+# is triggered when a new JDK is added to the matrix:
+#on:
+#  push:
+#    paths:
+#      - ".github/workflows/reusable-smoke-test-images.yml"
+
 name: PR build fake backend images for smoke tests
 
 on: