diff --git a/build_automation/cloudberry/scripts/configure-cloudberry.sh b/build_automation/cloudberry/scripts/configure-cloudberry.sh
index 587ba10..be91323 100755
--- a/build_automation/cloudberry/scripts/configure-cloudberry.sh
+++ b/build_automation/cloudberry/scripts/configure-cloudberry.sh
@@ -56,10 +56,14 @@
 #
 #                 When true, enables:
 #                   --enable-debug
-#                   --enable-profiling
 #                   --enable-cassert
 #                   --enable-debug-extensions
 #
+#   ENABLE_PROFILING - Enable profiling options (default is false)
+#
+#                 When true, enables:
+#                   --enable-profiling
+#
 # Prerequisites:
 #   - System dependencies must be installed:
 #     * xerces-c development files
@@ -119,11 +123,15 @@ CONFIGURE_DEBUG_OPTS=""
 
 if [ "${ENABLE_DEBUG:-false}" = "true" ]; then
     CONFIGURE_DEBUG_OPTS="--enable-debug \
-                          --enable-profiling \
                           --enable-cassert \
                           --enable-debug-extensions"
 fi
 
+CONFIGURE_PROFILING_OPTS=""
+if [ "${ENABLE_PROFILING:-false}" = "true" ]; then
+    CONFIGURE_PROFILING_OPTS="--enable-profiling"
+fi
+
 # Configure build
 log_section "Configure"
 execute_cmd ./configure --prefix=/usr/local/cloudberry-db \
@@ -136,6 +144,7 @@ execute_cmd ./configure --prefix=/usr/local/cloudberry-db \
             --enable-pxf \
             --enable-tap-tests \
             ${CONFIGURE_DEBUG_OPTS} \
+	    ${CONFIGURE_PROFILING_OPTS} \
             --with-gssapi \
             --with-ldap \
             --with-libxml \