diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
index ee680890d..b8d8c4e9a 100644
--- a/.github/workflows/deploy-production.yml
+++ b/.github/workflows/deploy-production.yml
@@ -27,14 +27,19 @@ jobs:
       with:
         filters: |
           deploy-iac:
-            - 'tofu/**'
-            - '.github/workflows/**'
+            - 'tofu/modules/**'
+            - 'tofu/environments/stage/**'
+            - '.github/workflows/deploy-production.yml'
           deploy-backend:
             - 'backend/**'
             - 'tofu/modules/services/backend-service/**'
             - 'tofu/environments/stage/services/backend-service/**'
+            - '.github/workflows/deploy-production.yml'
           deploy-frontend:
             - 'frontend/**'
+            - 'tofu/modules/services/frontend-infra/**'
+            - 'tofu/environments/stage/services/frontend-infra/**'
+            - '.github/workflows/deploy-production.yml'
 
   deploy-iac:
     needs: detect-changes
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
index 97c49fef0..dfb4bc087 100644
--- a/.github/workflows/deploy-staging.yml
+++ b/.github/workflows/deploy-staging.yml
@@ -36,10 +36,12 @@ jobs:
             - 'backend/**'
             - 'tofu/modules/services/backend-service/**'
             - 'tofu/environments/stage/services/backend-service/**'
+            - '.github/workflows/deploy-staging.yml'
           deploy-frontend:
             - 'frontend/**'
             - 'tofu/modules/services/frontend-infra/**'
             - 'tofu/environments/stage/services/frontend-infra/**'
+            - '.github/workflows/deploy-staging.yml'
 
   deploy-iac:
     needs: detect-changes
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 6593c8546..eefa3a3b8 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -30,13 +30,13 @@ jobs:
         filters: |
           validate-iac:
             - 'tofu/**'
-            - '.github/workflows/**'
+            - '.github/workflows/validate.yml'
           validate-backend:
             - 'backend/**'
-            - 'tofu/modules/services/backend-service/**'
-            - 'tofu/environments/stage/services/backend-service/**'
+            - '.github/workflows/validate.yml'
           validate-frontend:
             - 'frontend/**'
+            - '.github/workflows/validate.yml'
 
   validate-iac:
     needs: detect-changes