diff --git a/templates/apply.yml b/templates/apply.yml
index 3b98e55eeb8db936292b6a73e0ac272c2fd6b585..be1c76c3c087615a4f109cfd8e4fb92ea35d50a9 100644
--- a/templates/apply.yml
+++ b/templates/apply.yml
@@ -76,10 +76,7 @@ spec:
       type: string
       description: 'Path to a variables files relative to root_dir. Only used if no_plan is true otherwise the variables are coming from the plan.'
     rules:
-      # FIXME: eventually, we'll want to define `null` as the default,
-      # but this is NOT support yet, see
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/440468
-      default: [{when: on_success}]
+      default: [{when: manual}]
       type: array
       description: 'Defines the `rules` of the job.'
     cache_policy:
diff --git a/templates/delete-state.yml b/templates/delete-state.yml
index cf6eee89997b4eb6ccd367f10930e318f14dd9c7..717ff4301057ba56af856178c6c3a11a534f848c 100644
--- a/templates/delete-state.yml
+++ b/templates/delete-state.yml
@@ -16,10 +16,7 @@ spec:
       default: 'true'
       description: 'Wheather the delete-state job should be created or not.'
     rules:
-      # FIXME: eventually, we'll want to define `null` as the default,
-      # but this is NOT support yet, see
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/440468
-      default: [{when: on_success}]
+      default: [{when: manual}]
       type: array
       description: 'Defines the `rules` of the job.'
 
diff --git a/templates/destroy.yml b/templates/destroy.yml
index fa350f8b0f2fb24c07358cd81c3cce32e1bee4da..45e0997b9e744634972d09500bb049cefbc8a6d9 100644
--- a/templates/destroy.yml
+++ b/templates/destroy.yml
@@ -76,10 +76,7 @@ spec:
       type: string
       description: 'Path to a variables files relative to root_dir. Only used if no_plan is true otherwise the variables are coming from the plan.'
     rules:
-      # FIXME: eventually, we'll want to define `null` as the default,
-      # but this is NOT support yet, see
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/440468
-      default: [{when: on_success}]
+      default: [{when: manual}]
       type: array
       description: 'Defines the `rules` of the job.'
     cache_policy:
diff --git a/tests/integration-tests/AutoEncryption.gitlab-ci.yml b/tests/integration-tests/AutoEncryption.gitlab-ci.yml
index e25b09802223f78ddda089da1ba24a76a715f07b..624efd95b6aeead01444eac6453a31acd3e4432b 100644
--- a/tests/integration-tests/AutoEncryption.gitlab-ci.yml
+++ b/tests/integration-tests/AutoEncryption.gitlab-ci.yml
@@ -11,6 +11,7 @@ include:
       no_plan: true
       auto_encryption: true
       auto_encryption_passphrase: '947F23E4-B9FC-4E76-B7B4-1D35ECBE9B09'
+      rules: [{when: on_success}]
 
   # For CI Terraform state cleanup
   - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/delete-state@$CI_COMMIT_SHA
diff --git a/tests/integration-tests/AutoEncryptionMigrate.gitlab-ci.yml b/tests/integration-tests/AutoEncryptionMigrate.gitlab-ci.yml
index c2631ad2957c9667d6da2238045f262de19418d5..224f50987dbca48a78ad30062fe0a7023f663488 100644
--- a/tests/integration-tests/AutoEncryptionMigrate.gitlab-ci.yml
+++ b/tests/integration-tests/AutoEncryptionMigrate.gitlab-ci.yml
@@ -10,6 +10,7 @@ include:
       root_dir: $TEST_GITLAB_TOFU_ROOT_DIR
       state_name: $TEST_GITLAB_TOFU_STATE_NAME
       no_plan: true
+      rules: [{when: on_success}]
 
   - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/apply@$CI_COMMIT_SHA
     inputs:
@@ -25,6 +26,7 @@ include:
       auto_encryption: true
       auto_encryption_passphrase: '947F23E4-B9FC-4E76-B7B4-1D35ECBE9B09'
       auto_encryption_enable_migration_from_unencrypted: true
+      rules: [{when: on_success}]
 
   - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/apply@$CI_COMMIT_SHA
     inputs:
@@ -39,6 +41,7 @@ include:
       no_plan: true
       auto_encryption: true
       auto_encryption_passphrase: '947F23E4-B9FC-4E76-B7B4-1D35ECBE9B09'
+      rules: [{when: on_success}]
 
   # For CI Terraform state cleanup
   - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/delete-state@$CI_COMMIT_SHA