diff --git a/ci/check_gucs_are_alphabetically_sorted.sh b/ci/check_gucs_are_alphabetically_sorted.sh
index a769ae4fb16..763b5305f81 100755
--- a/ci/check_gucs_are_alphabetically_sorted.sh
+++ b/ci/check_gucs_are_alphabetically_sorted.sh
@@ -5,6 +5,6 @@ set -euo pipefail
 source ci/ci_helpers.sh
 
 # extract citus gucs in the form of "citus.X"
-grep -o -E "(\.*\"citus.\w+\")," src/backend/distributed/shared_library_init.c > gucs.out
+grep -o -E "(\.*\"citus\.\w+\")," src/backend/distributed/shared_library_init.c > gucs.out
 sort -c gucs.out
 rm gucs.out
diff --git a/ci/gucs.out b/ci/gucs.out
new file mode 100644
index 00000000000..ca989b5a0ee
--- /dev/null
+++ b/ci/gucs.out
@@ -0,0 +1,134 @@
+"citus_tests_label_provider",
+"citus.all_modifications_commutative",
+"citus.allow_modifications_from_workers_to_replicated_tables",
+"citus.allow_nested_distributed_execution",
+"citus.allow_unsafe_constraints",
+"citus.allow_unsafe_locks_from_workers",
+"citus.background_task_queue_interval",
+"citus.check_available_space_before_move",
+"citus.cluster_name",
+"citus.coordinator_aggregation_strategy",
+"citus.copy_switchover_threshold",
+"citus.count_distinct_error_rate",
+"citus.cpu_priority",
+"citus.cpu_priority_for_logical_replication_senders",
+"citus.create_object_propagation",
+"citus.defer_drop_after_shard_move",
+"citus.defer_drop_after_shard_split",
+"citus.defer_shard_delete_interval",
+"citus.desired_percent_disk_available_after_move",
+"citus.distributed_deadlock_detection_factor",
+"citus.enable_alter_database_owner",
+"citus.enable_alter_role_propagation",
+"citus.enable_alter_role_set_propagation",
+"citus.enable_binary_protocol",
+"citus.enable_change_data_capture",
+"citus.enable_cluster_clock",
+"citus.enable_cost_based_connection_establishment",
+"citus.enable_create_role_propagation",
+"citus.enable_create_type_propagation",
+"citus.enable_ddl_propagation",
+"citus.enable_deadlock_prevention",
+"citus.enable_fast_path_router_planner",
+"citus.enable_local_execution",
+"citus.enable_local_reference_table_foreign_keys",
+"citus.enable_manual_changes_to_shards",
+"citus.enable_manual_metadata_changes_for_user",
+"citus.enable_metadata_sync",
+"citus.enable_non_colocated_router_query_pushdown",
+"citus.enable_repartition_joins",
+"citus.enable_repartitioned_insert_select",
+"citus.enable_router_execution",
+"citus.enable_schema_based_sharding",
+"citus.enable_single_hash_repartition_joins",
+"citus.enable_statistics_collection",
+"citus.enable_unique_job_ids",
+"citus.enable_unsafe_triggers",
+"citus.enable_unsupported_feature_messages",
+"citus.enable_version_checks",
+"citus.enforce_foreign_key_restrictions",
+"citus.enforce_object_restrictions_for_local_objects",
+"citus.executor_slow_start_interval",
+"citus.explain_all_tasks",
+"citus.explain_analyze_sort_method",
+"citus.explain_distributed_queries",
+"citus.force_max_query_parallelization",
+"citus.function_opens_transaction_block",
+"citus.grep_remote_commands",
+"citus.hide_citus_dependent_objects",
+"citus.hide_shards_from_app_name_prefixes",
+"citus.isolation_test_session_process_id",
+"citus.isolation_test_session_remote_process_id",
+"citus.limit_clause_row_fetch_count",
+"citus.local_copy_flush_threshold",
+"citus.local_hostname",
+"citus.local_shared_pool_size",
+"citus.local_table_join_policy",
+"citus.log_distributed_deadlock_detection",
+"citus.log_intermediate_results",
+"citus.log_local_commands",
+"citus.log_multi_join_order",
+"citus.log_remote_commands",
+"citus.logical_replication_timeout",
+"citus.main_db",
+"citus.max_adaptive_executor_pool_size",
+"citus.max_background_task_executors",
+"citus.max_background_task_executors_per_node",
+"citus.max_cached_connection_lifetime",
+"citus.max_cached_conns_per_worker",
+"citus.max_client_connections",
+"citus.max_high_priority_background_processes",
+"citus.max_intermediate_result_size",
+"citus.max_matview_size_to_auto_recreate",
+"citus.max_rebalancer_logged_ignored_moves",
+"citus.max_shared_pool_size",
+"citus.max_worker_nodes_tracked",
+"citus.metadata_sync_interval",
+"citus.metadata_sync_mode",
+"citus.metadata_sync_retry_interval",
+"citus.mitmfifo",
+"citus.multi_shard_modify_mode",
+"citus.multi_task_query_log_level",
+"citus.next_cleanup_record_id",
+"citus.next_operation_id",
+"citus.next_placement_id",
+"citus.next_shard_id",
+"citus.node_connection_timeout",
+"citus.node_conninfo",
+"citus.override_table_visibility",
+"citus.prevent_incomplete_connection_establishment",
+"citus.propagate_session_settings_for_loopback_connection",
+"citus.propagate_set_commands",
+"citus.rebalancer_by_disk_size_base_cost",
+"citus.recover_2pc_interval",
+"citus.remote_copy_flush_threshold",
+"citus.remote_task_check_interval",
+"citus.repartition_join_bucket_count_per_node",
+"citus.replicate_reference_tables_on_activate",
+"citus.replication_model",
+"citus.running_under_citus_test_suite",
+"citus.select_opens_transaction_block",
+"citus.shard_count",
+"citus.shard_replication_factor",
+"citus.show_shards_for_app_name_prefixes",
+"citus.skip_advisory_lock_permission_checks",
+"citus.skip_constraint_validation",
+"citus.skip_jsonb_validation_in_copy",
+"citus.sort_returning",
+"citus.stat_statements_max",
+"citus.stat_statements_purge_interval",
+"citus.stat_statements_track",
+"citus.stat_tenants_limit",
+"citus.stat_tenants_log_level",
+"citus.stat_tenants_period",
+"citus.stat_tenants_track",
+"citus.stat_tenants_untracked_sample_rate",
+"citus.subquery_pushdown",
+"citus.task_assignment_policy",
+"citus.task_executor_type",
+"citus.use_citus_managed_tables",
+"citus.use_secondary_nodes",
+"citus.values_materialization_threshold",
+"citus.version",
+"citus.worker_min_messages",
+"citus.writable_standby_coordinator",
diff --git a/gucs.out b/gucs.out
new file mode 100644
index 00000000000..8501e6c1f75
--- /dev/null
+++ b/gucs.out
@@ -0,0 +1,133 @@
+"citus.all_modifications_commutative",
+"citus.allow_modifications_from_workers_to_replicated_tables",
+"citus.allow_nested_distributed_execution",
+"citus.allow_unsafe_constraints",
+"citus.allow_unsafe_locks_from_workers",
+"citus.background_task_queue_interval",
+"citus.check_available_space_before_move",
+"citus.cluster_name",
+"citus.coordinator_aggregation_strategy",
+"citus.copy_switchover_threshold",
+"citus.count_distinct_error_rate",
+"citus.cpu_priority",
+"citus.cpu_priority_for_logical_replication_senders",
+"citus.create_object_propagation",
+"citus.defer_drop_after_shard_move",
+"citus.defer_drop_after_shard_split",
+"citus.defer_shard_delete_interval",
+"citus.desired_percent_disk_available_after_move",
+"citus.distributed_deadlock_detection_factor",
+"citus.enable_alter_database_owner",
+"citus.enable_alter_role_propagation",
+"citus.enable_alter_role_set_propagation",
+"citus.enable_binary_protocol",
+"citus.enable_change_data_capture",
+"citus.enable_cluster_clock",
+"citus.enable_cost_based_connection_establishment",
+"citus.enable_create_role_propagation",
+"citus.enable_create_type_propagation",
+"citus.enable_ddl_propagation",
+"citus.enable_deadlock_prevention",
+"citus.enable_fast_path_router_planner",
+"citus.enable_local_execution",
+"citus.enable_local_reference_table_foreign_keys",
+"citus.enable_manual_changes_to_shards",
+"citus.enable_manual_metadata_changes_for_user",
+"citus.enable_metadata_sync",
+"citus.enable_non_colocated_router_query_pushdown",
+"citus.enable_repartition_joins",
+"citus.enable_repartitioned_insert_select",
+"citus.enable_router_execution",
+"citus.enable_schema_based_sharding",
+"citus.enable_single_hash_repartition_joins",
+"citus.enable_statistics_collection",
+"citus.enable_unique_job_ids",
+"citus.enable_unsafe_triggers",
+"citus.enable_unsupported_feature_messages",
+"citus.enable_version_checks",
+"citus.enforce_foreign_key_restrictions",
+"citus.enforce_object_restrictions_for_local_objects",
+"citus.executor_slow_start_interval",
+"citus.explain_all_tasks",
+"citus.explain_analyze_sort_method",
+"citus.explain_distributed_queries",
+"citus.force_max_query_parallelization",
+"citus.function_opens_transaction_block",
+"citus.grep_remote_commands",
+"citus.hide_citus_dependent_objects",
+"citus.hide_shards_from_app_name_prefixes",
+"citus.isolation_test_session_process_id",
+"citus.isolation_test_session_remote_process_id",
+"citus.limit_clause_row_fetch_count",
+"citus.local_copy_flush_threshold",
+"citus.local_hostname",
+"citus.local_shared_pool_size",
+"citus.local_table_join_policy",
+"citus.log_distributed_deadlock_detection",
+"citus.log_intermediate_results",
+"citus.log_local_commands",
+"citus.log_multi_join_order",
+"citus.log_remote_commands",
+"citus.logical_replication_timeout",
+"citus.main_db",
+"citus.max_adaptive_executor_pool_size",
+"citus.max_background_task_executors",
+"citus.max_background_task_executors_per_node",
+"citus.max_cached_connection_lifetime",
+"citus.max_cached_conns_per_worker",
+"citus.max_client_connections",
+"citus.max_high_priority_background_processes",
+"citus.max_intermediate_result_size",
+"citus.max_matview_size_to_auto_recreate",
+"citus.max_rebalancer_logged_ignored_moves",
+"citus.max_shared_pool_size",
+"citus.max_worker_nodes_tracked",
+"citus.metadata_sync_interval",
+"citus.metadata_sync_mode",
+"citus.metadata_sync_retry_interval",
+"citus.mitmfifo",
+"citus.multi_shard_modify_mode",
+"citus.multi_task_query_log_level",
+"citus.next_cleanup_record_id",
+"citus.next_operation_id",
+"citus.next_placement_id",
+"citus.next_shard_id",
+"citus.node_connection_timeout",
+"citus.node_conninfo",
+"citus.override_table_visibility",
+"citus.prevent_incomplete_connection_establishment",
+"citus.propagate_session_settings_for_loopback_connection",
+"citus.propagate_set_commands",
+"citus.rebalancer_by_disk_size_base_cost",
+"citus.recover_2pc_interval",
+"citus.remote_copy_flush_threshold",
+"citus.remote_task_check_interval",
+"citus.repartition_join_bucket_count_per_node",
+"citus.replicate_reference_tables_on_activate",
+"citus.replication_model",
+"citus.running_under_citus_test_suite",
+"citus.select_opens_transaction_block",
+"citus.shard_count",
+"citus.shard_replication_factor",
+"citus.show_shards_for_app_name_prefixes",
+"citus.skip_advisory_lock_permission_checks",
+"citus.skip_constraint_validation",
+"citus.skip_jsonb_validation_in_copy",
+"citus.sort_returning",
+"citus.stat_statements_max",
+"citus.stat_statements_purge_interval",
+"citus.stat_statements_track",
+"citus.stat_tenants_limit",
+"citus.stat_tenants_log_level",
+"citus.stat_tenants_period",
+"citus.stat_tenants_track",
+"citus.stat_tenants_untracked_sample_rate",
+"citus.subquery_pushdown",
+"citus.task_assignment_policy",
+"citus.task_executor_type",
+"citus.use_citus_managed_tables",
+"citus.use_secondary_nodes",
+"citus.values_materialization_threshold",
+"citus.version",
+"citus.worker_min_messages",
+"citus.writable_standby_coordinator",