diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e58120dc6f0c9259e5d0acf990c15cf490b6a0c..dadc65474b098e65cc1af49e4a24454690403e56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,12 +40,12 @@ default:
   OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_2"
 
 .default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables
+  CREATE_RAILS_FLAKY_TEST_ISSUES: "true"
   CREATE_RAILS_SLOW_TEST_ISSUES: "true"
   CREATE_RAILS_TEST_FAILURE_ISSUES: "true"
 
 .default-merge-request-variables: &default-merge-request-variables
   ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST: "true"
-  CREATE_RAILS_FLAKY_TEST_ISSUES: "true"
 
 .if-merge-request-security-canonical-sync: &if-merge-request-security-canonical-sync
   if: '$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == "gitlab-org/security/gitlab" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH'