diff --git a/gpMgmt/bin/gpinitsystem b/gpMgmt/bin/gpinitsystem
index f05ef8429517878894aa18c3cc47e78d977c1df2..d9f047c83623b5927bea2d878343ce8da3bcaa81 100755
--- a/gpMgmt/bin/gpinitsystem
+++ b/gpMgmt/bin/gpinitsystem
@@ -1255,12 +1255,12 @@ CREATE_QD_DB () {
 		ERROR_CHK $? "set checkpoint_segments=$CHECK_POINT_SEGMENTS in ${GP_DIR}/$PG_CONF" 1
 
 		LOG_MSG "[INFO]:-Setting Master instance content id"
-		SED_PG_CONF ${GP_DIR}/$PG_CONF "$CONTENT_ID_TXT" "gp_contentid=-1" 0
-		ERROR_CHK $? "set gp_contentid=-1 in ${GP_DIR}/$PG_CONF" 1
+		SED_PG_CONF ${GP_DIR}/$PG_CONF "$CONTENT_ID_TXT" "gp_contentid=$GP_CONTENT" 0
+		ERROR_CHK $? "set gp_contentid=$GP_CONTENT in ${GP_DIR}/$PG_CONF" 1
 
 		LOG_MSG "[INFO]:-Setting Master instance db id"
-		SED_PG_CONF ${GP_DIR}/$PG_INTERNAL_CONF "$DBID_TXT" "gp_dbid=1" 0
-		ERROR_CHK $? "set gp_dbid=1 in ${GP_DIR}/$PG_INTERNAL_CONF" 1
+		SED_PG_CONF ${GP_DIR}/$PG_INTERNAL_CONF "$DBID_TXT" "gp_dbid=$GP_DBID" 0
+		ERROR_CHK $? "set gp_dbid=$GP_DBID in ${GP_DIR}/$PG_INTERNAL_CONF" 1
 
 		if [  x"" != x"$PG_CONF_ADD_FILE" ]; then
 				LOG_MSG "[INFO]:-Processing additional configuration parameters"
diff --git a/src/test/regress/regress_gp.c b/src/test/regress/regress_gp.c
index f922435ab0f605ffd704eb6ad06db9bb266359e3..177e94106e562bcc56fa0306f1c6a243f1421eb8 100644
--- a/src/test/regress/regress_gp.c
+++ b/src/test/regress/regress_gp.c
@@ -867,8 +867,6 @@ PG_FUNCTION_INFO_V1(gp_fts_probe_stats);
 Datum
 gp_fts_probe_stats(PG_FUNCTION_ARGS)
 {
-	Assert(GpIdentity.dbid == MASTER_DBID);
-
 	TupleDesc	tupdesc;
 	int32		start_count = 0;
 	int32		done_count = 0;