diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql
index ee24a37e9..e9f703bbd 100644
--- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql
+++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.1-1.sql
@@ -100,6 +100,8 @@ BEGIN
     PERFORM setval('pg_catalog.pg_dist_groupid_seq', (SELECT MAX(groupid)+1 AS max_group_id FROM pg_dist_node), false);
     PERFORM setval('pg_catalog.pg_dist_node_nodeid_seq', (SELECT MAX(nodeid)+1 AS max_node_id FROM pg_dist_node), false);
     PERFORM setval('pg_catalog.pg_dist_colocationid_seq', (SELECT MAX(colocationid)+1 AS max_colocation_id FROM pg_dist_colocation), false);
+    PERFORM setval('pg_catalog.pg_dist_operationid_seq', (SELECT MAX(operation_id)+1 AS max_operation_id FROM pg_dist_cleanup), false);
+    PERFORM setval('pg_catalog.pg_dist_cleanup_recordid_seq', (SELECT MAX(record_id)+1 AS max_record_id FROM pg_dist_cleanup), false);
 
     --
     -- register triggers
diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
index ee24a37e9..e9f703bbd 100644
--- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
+++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
@@ -100,6 +100,8 @@ BEGIN
     PERFORM setval('pg_catalog.pg_dist_groupid_seq', (SELECT MAX(groupid)+1 AS max_group_id FROM pg_dist_node), false);
     PERFORM setval('pg_catalog.pg_dist_node_nodeid_seq', (SELECT MAX(nodeid)+1 AS max_node_id FROM pg_dist_node), false);
     PERFORM setval('pg_catalog.pg_dist_colocationid_seq', (SELECT MAX(colocationid)+1 AS max_colocation_id FROM pg_dist_colocation), false);
+    PERFORM setval('pg_catalog.pg_dist_operationid_seq', (SELECT MAX(operation_id)+1 AS max_operation_id FROM pg_dist_cleanup), false);
+    PERFORM setval('pg_catalog.pg_dist_cleanup_recordid_seq', (SELECT MAX(record_id)+1 AS max_record_id FROM pg_dist_cleanup), false);
 
     --
     -- register triggers
diff --git a/src/test/regress/enterprise_failure_schedule b/src/test/regress/enterprise_failure_schedule
index cc7b4f2d4..faa1a4c66 100644
--- a/src/test/regress/enterprise_failure_schedule
+++ b/src/test/regress/enterprise_failure_schedule
@@ -11,3 +11,4 @@ test: failure_offline_move_shard_placement
 test: failure_tenant_isolation
 test: failure_tenant_isolation_nonblocking
 test: check_mx
+test: failure_split_cleanup
diff --git a/src/test/regress/expected/multi_metadata_access.out b/src/test/regress/expected/multi_metadata_access.out
index 19dfb6b28..1586910f0 100644
--- a/src/test/regress/expected/multi_metadata_access.out
+++ b/src/test/regress/expected/multi_metadata_access.out
@@ -19,9 +19,7 @@ WHERE
        oid
 ---------------------------------------------------------------------
  pg_dist_authinfo
- pg_dist_operationid_seq
- pg_dist_cleanup_recordid_seq
-(3 rows)
+(1 row)
 
 RESET role;
 DROP USER no_access;