diff --git a/.github/config/.files.yaml b/.github/config/.files.yaml
index d120123d7..777288840 100644
--- a/.github/config/.files.yaml
+++ b/.github/config/.files.yaml
@@ -10,6 +10,11 @@ openapi: &openapi
   - app/(common|core|proprietary)/build.gradle
   - app/(common|core|proprietary)/src/main/java/**
 
+docker: &docker
+  - Dockerfile
+  - Dockerfile.fat
+  - Dockerfile.ultra-lite
+
 project: &project
   - app/(common|core|proprietary)/src/(main|test)/java/**
   - app/(common|core|proprietary)/build.gradle
@@ -19,9 +24,7 @@ project: &project
   - libs/**
   - 'testing/**/!(requirements*.txt|requirements*.in)*'
   - build.gradle
-  - Dockerfile
-  - Dockerfile.fat
-  - Dockerfile.ultra-lite
+  - *docker
   - gradle.properties
   - gradlew
   - gradlew.bat
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7da172bbf..fda0b161b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,7 @@ jobs:
       app: ${{ steps.changes.outputs.app }}
       project: ${{ steps.changes.outputs.project }}
       openapi: ${{ steps.changes.outputs.openapi }}
+      docker: ${{ steps.changes.outputs.docker }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -265,8 +266,8 @@ jobs:
           ./testing/test.sh
 
   test-build-docker-images:
-    if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
-    needs: [files-changed, build, check-generateOpenApiDocs, check-licence]
+    if: (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch') && needs.files-changed.outputs.docker == 'true'
+    needs: [files-changed, build]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false