diff --git a/pgxn/neon/neon.c b/pgxn/neon/neon.c
index fe8e276d1c..ff3e3f48ff 100644
--- a/pgxn/neon/neon.c
+++ b/pgxn/neon/neon.c
@@ -639,9 +639,7 @@ _PG_init(void)
 
 	pg_init_libpagestore();
 	pg_init_walproposer();
-	WalSender_Custom_XLogReaderRoutines = NeonOnDemandXLogReaderRoutines;
-	LogicalFuncs_Custom_XLogReaderRoutines = NeonOnDemandXLogReaderRoutines;
-	SlotFuncs_Custom_XLogReaderRoutines = NeonOnDemandXLogReaderRoutines;
+	Custom_XLogReaderRoutines = NeonOnDemandXLogReaderRoutines;
 
 	InitLogicalReplicationMonitor();
 
diff --git a/vendor/postgres-v14 b/vendor/postgres-v14
index a317b9b5b9..13547aa623 160000
--- a/vendor/postgres-v14
+++ b/vendor/postgres-v14
@@ -1 +1 @@
-Subproject commit a317b9b5b96978b49e78986697f3dd80d06f99a7
+Subproject commit 13547aa62328c1c89938637e8c0862e6afc1662a
diff --git a/vendor/postgres-v15 b/vendor/postgres-v15
index 6f6d77fb59..4968efb131 160000
--- a/vendor/postgres-v15
+++ b/vendor/postgres-v15
@@ -1 +1 @@
-Subproject commit 6f6d77fb5960602fcd3fd130aca9f99ecb1619c9
+Subproject commit 4968efb1317ed2cb8090bb218034adf936404c1c
diff --git a/vendor/postgres-v16 b/vendor/postgres-v16
index 0baa7346df..221d2c14ed 160000
--- a/vendor/postgres-v16
+++ b/vendor/postgres-v16
@@ -1 +1 @@
-Subproject commit 0baa7346dfd42d61912eeca554c9bb0a190f0a1e
+Subproject commit 221d2c14ed2afe20a85c3a3e05c3727abecbe5d5
diff --git a/vendor/postgres-v17 b/vendor/postgres-v17
index 9156d63ce2..bb9a784943 160000
--- a/vendor/postgres-v17
+++ b/vendor/postgres-v17
@@ -1 +1 @@
-Subproject commit 9156d63ce253bed9d1f76355ceec610e444eaffa
+Subproject commit bb9a784943269fe3a8f107feffacf659402a2abf
diff --git a/vendor/revisions.json b/vendor/revisions.json
index 3a65a507f3..37bfb1af55 100644
--- a/vendor/revisions.json
+++ b/vendor/revisions.json
@@ -1,14 +1,14 @@
 {
   "v16": [
     "16.4",
-    "0baa7346dfd42d61912eeca554c9bb0a190f0a1e"
+    "221d2c14ed2afe20a85c3a3e05c3727abecbe5d5"
   ],
   "v15": [
     "15.8",
-    "6f6d77fb5960602fcd3fd130aca9f99ecb1619c9"
+    "4968efb1317ed2cb8090bb218034adf936404c1c"
   ],
   "v14": [
     "14.13",
-    "a317b9b5b96978b49e78986697f3dd80d06f99a7"
+    "13547aa62328c1c89938637e8c0862e6afc1662a"
   ]
 }