diff --git a/.circleci/config.yml b/.circleci/config.yml
index a1c0f1553b6..8addafcccaa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 parameters:
   image_suffix:
     type: string
-    default: '-v641cdcd'
+    default: '-v87fd773'
   pg14_version:
     type: string
     default: '14.9'
@@ -15,10 +15,10 @@ parameters:
     default: '15.4'
   pg16_version:
     type: string
-    default: '16rc1'
+    default: '16.0'
   upgrade_pg_versions:
     type: string
-    default: '14.9-15.4-16rc1'
+    default: '14.9-15.4-16.0'
   style_checker_tools_version:
     type: string
     default: '0.8.18'
diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h
index 2b0320003e9..1bdbae58016 100644
--- a/src/include/pg_version_compat.h
+++ b/src/include/pg_version_compat.h
@@ -46,6 +46,8 @@ get_guc_variables_compat(int *gucCount)
 #define object_ownercheck(a, b, c) object_ownercheck(a, b, c)
 #define object_aclcheck(a, b, c, d) object_aclcheck(a, b, c, d)
 
+#define pgstat_fetch_stat_local_beentry(a) pgstat_get_local_beentry_by_index(a)
+
 #else
 
 #include "catalog/pg_class_d.h"