diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cf9578bb6cd..72fd81684a4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -186,6 +186,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /buildscripts/resmokeconfig/matrix_suites/overrides/**/stepdown_primary_change_streams.yml @10gen/query-execution-change-streams @svc-auto-approve-bot
 /buildscripts/resmokeconfig/matrix_suites/overrides/**/injected_catalog_metadata.yml @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot
 /buildscripts/resmokeconfig/matrix_suites/overrides/**/ingress_request_rate_limiter.yml @10gen/server-workload-resilience @svc-auto-approve-bot
+/buildscripts/resmokeconfig/matrix_suites/overrides/**/fcv_upgrade_downgrade.yml @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot
 /buildscripts/resmokeconfig/matrix_suites/overrides/**/fcv_upgrade_downgrade_primary_step_down_overrides.yml @10gen/server-replication-reviewers @svc-auto-approve-bot
 /buildscripts/resmokeconfig/matrix_suites/overrides/**/primary_driven_index_builds.yml @10gen/server-index-builds @svc-auto-approve-bot
 /buildscripts/resmokeconfig/matrix_suites/overrides/**/replica_sets_kill_secondary.yml @10gen/server-replication-reviewers @svc-auto-approve-bot
diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/fcv_upgrade_downgrade_primary_step_down_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/fcv_upgrade_downgrade_primary_step_down_passthrough.yml
index 54c74fefc0f..f9ccbe16dd3 100644
--- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/fcv_upgrade_downgrade_primary_step_down_passthrough.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/fcv_upgrade_downgrade_primary_step_down_passthrough.yml
@@ -9,8 +9,10 @@
 executor:
   archive:
     hooks:
-      - CheckReplDBHash
+      - FCVUpgradeDowngradeInBackground
+      - ContinuousStepdown
       - CheckReplOplogs
+      - CheckReplDBHash
       - ValidateCollections
     tests: true
   config:
@@ -25,6 +27,7 @@ executor:
         TestData:
           alwaysInjectTransactionNumber: true
           defaultReadConcernLevel: majority
+          isRunningFCVUpgradeDowngradeSuite: true
           logRetryAttempts: true
           networkErrorAndTxnOverrideConfig:
             retryOnNetworkErrors: true
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/fcv_upgrade_downgrade_primary_step_down_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/fcv_upgrade_downgrade_primary_step_down_passthrough.yml
index 5a68fa02583..051f5e5ea34 100644
--- a/buildscripts/resmokeconfig/matrix_suites/mappings/fcv_upgrade_downgrade_primary_step_down_passthrough.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/fcv_upgrade_downgrade_primary_step_down_passthrough.yml
@@ -1,9 +1,10 @@
 base_suite: replica_sets_jscore_passthrough
 overrides:
+  - "fcv_upgrade_downgrade.overrides_shell_options"
   - "kill_primary.replica_sets_shell_options"
-  - "fcv_upgrade_downgrade_primary_step_down_overrides.stepdown_and_fcv_hooks"
   - "kill_primary.replica_sets_archive"
   - "kill_primary.replica_sets_fixture"
+  - "fcv_upgrade_downgrade_primary_step_down_overrides.stepdown_and_fcv_hooks"
   - "replica_sets_stepdown_selector.kill_primary_jscore_passthrough_exclude_files_base"
   - "replica_sets_stepdown_selector.kill_primary_jscore_passthrough_exclude_with_any_tags"
 excludes:
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/OWNERS.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/OWNERS.yml
index 706af102e35..8e882235158 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/OWNERS.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/OWNERS.yml
@@ -36,6 +36,9 @@ filters:
   - "ingress_request_rate_limiter.yml":
     approvers:
       - 10gen/server-workload-resilience
+  - "fcv_upgrade_downgrade.yml":
+    approvers:
+      - 10gen/server-catalog-and-routing-routing-and-topology
   - "fcv_upgrade_downgrade_primary_step_down_overrides.yml":
     approvers:
       - 10gen/server-replication-reviewers
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade.yml
new file mode 100644
index 00000000000..0c992da7b2a
--- /dev/null
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade.yml
@@ -0,0 +1,12 @@
+- name: overrides_shell_options
+  value:
+    executor:
+      config:
+        shell_options:
+          eval: >-
+            globalThis.testingReplication = true;
+            await import("jstests/libs/override_methods/retry_aborted_db_and_index_creation.js");
+            await import("jstests/libs/override_methods/implicitly_retry_on_fcv_upgrade_downgrade.js");
+          global_vars:
+            TestData:
+              isRunningFCVUpgradeDowngradeSuite: true
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml
index f03be61c5c7..bb403965f8b 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml
@@ -1,6 +1,13 @@
 - name: stepdown_and_fcv_hooks
   value:
     executor:
+      archive:
+        hooks:
+          - FCVUpgradeDowngradeInBackground
+          - ContinuousStepdown
+          - CheckReplOplogs
+          - CheckReplDBHash
+          - ValidateCollections
       hooks:
         - class: FCVUpgradeDowngradeInBackground
           shell_options: