diff --git a/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql b/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql
index 1d0a01f81..3ffe979d5 100644
--- a/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql
+++ b/src/backend/distributed/sql/citus--11.1-1--11.2-1.sql
@@ -11,3 +11,5 @@ DROP FUNCTION pg_catalog.worker_append_table_to_shard(text, text, text, integer)
 #include "udfs/citus_internal_adjust_local_clock_to_remote/11.2-1.sql"
 #include "udfs/worker_split_shard_replication_setup/11.2-1.sql"
 #include "udfs/citus_task_wait/11.2-1.sql"
+#include "udfs/citus_prepare_pg_upgrade/11.2-1.sql"
+#include "udfs/citus_finish_pg_upgrade/11.2-1.sql"
diff --git a/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql b/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql
index a7eac668e..166beb7c6 100644
--- a/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql
+++ b/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql
@@ -23,3 +23,5 @@ COMMENT ON FUNCTION pg_catalog.worker_append_table_to_shard(text, text, text, in
 
 #include "../udfs/worker_split_shard_replication_setup/11.1-1.sql"
 DROP FUNCTION pg_catalog.citus_task_wait(bigint, pg_catalog.citus_task_status);
+#include "../udfs/citus_prepare_pg_upgrade/11.1-1.sql"
+#include "../udfs/citus_finish_pg_upgrade/11.1-1.sql"
diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.2-1.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.2-1.sql
index f0ac334e5..448937c28 100644
--- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.2-1.sql
+++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/11.2-1.sql
@@ -103,7 +103,7 @@ BEGIN
     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);
-    PERFORM setval('pg_catalog.pg_dist_clock_logical_seq', (SELECT last_val FROM public.pg_dist_clock_logical_seq), false);
+    PERFORM setval('pg_catalog.pg_dist_clock_logical_seq', (SELECT last_value FROM public.pg_dist_clock_logical_seq), false);
     DROP TABLE public.pg_dist_clock_logical_seq;
 
 
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 f0ac334e5..448937c28 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
@@ -103,7 +103,7 @@ BEGIN
     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);
-    PERFORM setval('pg_catalog.pg_dist_clock_logical_seq', (SELECT last_val FROM public.pg_dist_clock_logical_seq), false);
+    PERFORM setval('pg_catalog.pg_dist_clock_logical_seq', (SELECT last_value FROM public.pg_dist_clock_logical_seq), false);
     DROP TABLE public.pg_dist_clock_logical_seq;
 
 
diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/11.2-1.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/11.2-1.sql
index 454f1f2c5..8fc7d2ee4 100644
--- a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/11.2-1.sql
+++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/11.2-1.sql
@@ -51,7 +51,7 @@ BEGIN
     CREATE TABLE public.pg_dist_authinfo AS SELECT * FROM pg_catalog.pg_dist_authinfo;
     CREATE TABLE public.pg_dist_poolinfo AS SELECT * FROM pg_catalog.pg_dist_poolinfo;
     -- sequences
-    CREATE TABLE public.pg_dist_clock_logical_seq AS SELECT last_val FROM pg_catalog.pg_dist_clock_logical_seq;
+    CREATE TABLE public.pg_dist_clock_logical_seq AS SELECT last_value FROM pg_catalog.pg_dist_clock_logical_seq;
     CREATE TABLE public.pg_dist_rebalance_strategy AS SELECT
         name,
         default_strategy,
diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql
index 454f1f2c5..8fc7d2ee4 100644
--- a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql
+++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql
@@ -51,7 +51,7 @@ BEGIN
     CREATE TABLE public.pg_dist_authinfo AS SELECT * FROM pg_catalog.pg_dist_authinfo;
     CREATE TABLE public.pg_dist_poolinfo AS SELECT * FROM pg_catalog.pg_dist_poolinfo;
     -- sequences
-    CREATE TABLE public.pg_dist_clock_logical_seq AS SELECT last_val FROM pg_catalog.pg_dist_clock_logical_seq;
+    CREATE TABLE public.pg_dist_clock_logical_seq AS SELECT last_value FROM pg_catalog.pg_dist_clock_logical_seq;
     CREATE TABLE public.pg_dist_rebalance_strategy AS SELECT
         name,
         default_strategy,