diff --git a/config/orca.m4 b/config/orca.m4
index 4cff59087f0e15235dfa089ca797a4171524ca74..100e8eec7c5af610ba15d5725f64e99c9d77c635 100644
--- a/config/orca.m4
+++ b/config/orca.m4
@@ -40,10 +40,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <string.h>
 ]],
 [
-return strncmp("2.57.", GPORCA_VERSION_STRING, 5);
+return strncmp("2.58.", GPORCA_VERSION_STRING, 5);
 ])],
 [AC_MSG_RESULT([[ok]])],
-[AC_MSG_ERROR([Your ORCA version is expected to be 2.57.XXX])]
+[AC_MSG_ERROR([Your ORCA version is expected to be 2.58.XXX])]
 )
 AC_LANG_POP([C++])
 ])# PGAC_CHECK_ORCA_VERSION
diff --git a/configure b/configure
index 2cd517c0855733dd5fdd32cd12538f8cfd9c4da5..3946462ca1a9bb81c4e6ab4e065bd16460e76ea4 100755
--- a/configure
+++ b/configure
@@ -13050,7 +13050,7 @@ int
 main ()
 {
 
-return strncmp("2.57.", GPORCA_VERSION_STRING, 5);
+return strncmp("2.58.", GPORCA_VERSION_STRING, 5);
 
   ;
   return 0;
@@ -13060,7 +13060,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 2.57.XXX" "$LINENO" 5
+  as_fn_error $? "Your ORCA version is expected to be 2.58.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 14ba36ef93c713ed92a063050958f06f5db4d65b..f34eb19aa9d476a5c5bc06467d963a0a9606c2ff 100644
--- a/depends/conanfile_orca.txt
+++ b/depends/conanfile_orca.txt
@@ -1,5 +1,5 @@
 [requires]
-orca/v2.57.0@gpdb/stable
+orca/v2.58.0@gpdb/stable
 
 [imports]
 include, * -> build/include
diff --git a/gpAux/releng/releng.mk b/gpAux/releng/releng.mk
index da79e357c9cd5716b3fd22aaee879416a1d40c5d..4641515be5daeb52e1926503f7a4917de5b1dc60 100644
--- a/gpAux/releng/releng.mk
+++ b/gpAux/releng/releng.mk
@@ -121,7 +121,7 @@ sync_tools: opt_write_test /opt/releng/apache-ant
 	-Divyrepo.user=$(IVYREPO_USER) -Divyrepo.passwd="$(IVYREPO_PASSWD)" -quiet resolve);
 
 ifeq "$(findstring aix,$(BLD_ARCH))" ""
-	LD_LIBRARY_PATH='' wget --no-check-certificate -q -O - https://github.com/greenplum-db/gporca/releases/download/v2.57.0/bin_orca_centos5_release.tar.gz | tar zxf - -C $(BLD_TOP)/ext/$(BLD_ARCH)
+	LD_LIBRARY_PATH='' wget --no-check-certificate -q -O - https://github.com/greenplum-db/gporca/releases/download/v2.58.0/bin_orca_centos5_release.tar.gz | tar zxf - -C $(BLD_TOP)/ext/$(BLD_ARCH)
 endif
 
 clean_tools: opt_write_test