diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index b963a9e45..0e8b7f3e6 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -124,7 +124,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: success()
+    if: (needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true') || success()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 8e59bdf10..32cd563ef 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -100,7 +100,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: success()
+    if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
     continue-on-error: true