diff --git a/concourse/tasks/compile_gpdb.yml b/concourse/tasks/compile_gpdb.yml
index 062990ec00f745367b93c4df88ecccd397666376..142b51bd843a0b210923ea6f228dae4f3412cf06 100644
--- a/concourse/tasks/compile_gpdb.yml
+++ b/concourse/tasks/compile_gpdb.yml
@@ -19,4 +19,4 @@ params:
   BLD_TARGETS:
   OUTPUT_ARTIFACT_DIR: gpdb_artifacts
   CONFIGURE_FLAGS:
-  ORCA_TAG: v3.55.0
+  ORCA_TAG: v3.57.0
diff --git a/config/orca.m4 b/config/orca.m4
index 178714fdcec888a095ace9fbdfd3f45e5676e605..a508e97860ffe3fd76be13a9d7afedb8e6155577 100644
--- a/config/orca.m4
+++ b/config/orca.m4
@@ -40,10 +40,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <string.h>
 ]],
 [
-return strncmp("3.55.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.57.", GPORCA_VERSION_STRING, 5);
 ])],
 [AC_MSG_RESULT([[ok]])],
-[AC_MSG_ERROR([Your ORCA version is expected to be 3.55.XXX])]
+[AC_MSG_ERROR([Your ORCA version is expected to be 3.57.XXX])]
 )
 AC_LANG_POP([C++])
 ])# PGAC_CHECK_ORCA_VERSION
diff --git a/configure b/configure
index 063294cd90e3da61395d860935f6820dc86a33b5..4f1686a01846edf5abc3c0b2b16994ce231e3424 100755
--- a/configure
+++ b/configure
@@ -13982,7 +13982,7 @@ int
 main ()
 {
 
-return strncmp("3.55.", GPORCA_VERSION_STRING, 5);
+return strncmp("3.57.", GPORCA_VERSION_STRING, 5);
 
   ;
   return 0;
@@ -13992,7 +13992,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 else
-  as_fn_error $? "Your ORCA version is expected to be 3.55.XXX" "$LINENO" 5
+  as_fn_error $? "Your ORCA version is expected to be 3.57.XXX" "$LINENO" 5
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
diff --git a/depends/conanfile_orca.txt b/depends/conanfile_orca.txt
index dca262c9580f9d3ddd5afa7c078055c724300070..739467b2dfe5322f2fbd7d921f223dcfec53a666 100644
--- a/depends/conanfile_orca.txt
+++ b/depends/conanfile_orca.txt
@@ -1,5 +1,5 @@
 [requires]
-orca/v3.55.0@gpdb/stable
+orca/v3.57.0@gpdb/stable
 
 [imports]
 include, * -> build/include
diff --git a/src/include/gpopt/utils/COptServer.h b/src/include/gpopt/utils/COptServer.h
index bbfcce2a37048640d18ce3ef8b8c5737f699fbb0..2202aa08bfeee45d58d043eb29635b887008775a 100644
--- a/src/include/gpopt/utils/COptServer.h
+++ b/src/include/gpopt/utils/COptServer.h
@@ -23,7 +23,6 @@
 #include "gpos/common/CSyncHashtableAccessByIter.h"
 #include "gpos/common/CSyncHashtableIter.h"
 #include "gpos/net/CSocket.h"
-#include "gpos/sync/CSpinlock.h"
 #include "gpos/task/CTask.h"
 
 // forward declarations
@@ -92,18 +91,6 @@ namespace gpoptudfs
 
 			};
 
-			typedef CSyncHashtable<SConnectionDescriptor, ULONG_PTR, CSpinlockOS>
-				ConnectionHT;
-
-			typedef CSyncHashtableAccessByKey<SConnectionDescriptor, ULONG_PTR, CSpinlockOS>
-				ConnectionKeyAccessor;
-
-			typedef CSyncHashtableIter<SConnectionDescriptor, ULONG_PTR, CSpinlockOS>
-				ConnectionIter;
-
-			typedef CSyncHashtableAccessByIter<SConnectionDescriptor, ULONG_PTR, CSpinlockOS>
-				ConnectionIterAccessor;
-
 			// path where socket is initialized
 			const CHAR *m_socket_path;