diff --git a/concourse/pipelines/gen_pipeline.py b/concourse/pipelines/gen_pipeline.py
index 4548e414516a..6283c4638c92 100755
--- a/concourse/pipelines/gen_pipeline.py
+++ b/concourse/pipelines/gen_pipeline.py
@@ -115,9 +115,9 @@ def create_pipeline(args, git_remote, git_branch):
         "rhel8" : "rocky8",
         "rocky8": "rocky8",
         "oel8" : "rocky8",
-        "rhel9" : "rocky9",
-        "rocky9": "rocky9",
-        "oel9" : "rocky9"
+        "rhel9" : "rhel9",
+        "rocky9": "rhel9",
+        "oel9" : "rhel9"
     }
     dist = {
         "rhel8" : "el8",
diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
index 7da6aad76494..37c3b0579409 100644
--- a/concourse/pipelines/templates/gpdb-tpl.yml
+++ b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -458,7 +458,13 @@ resources:
   type: registry-image
   source:
     tag: latest
+  {% if compile_platform == "rhel9" %}
+    repository: gcr.io/data-gpdb-private-images/gpdb7-[[ compile_platform ]]-build
+    username: _json_key
+    password: ((data-gpdb-private-images-container-registry-readonly-service-account-key))
+  {% else %}
     repository: gcr.io/data-gpdb-public-images/gpdb7-[[ compile_platform ]]-build
+  {% endif %}
 {% endif %}
 
 - name: gpdb7-[[ os_type ]]-test
diff --git a/gpAux/Makefile b/gpAux/Makefile
index 0893eea7000a..9e29b5112d98 100644
--- a/gpAux/Makefile
+++ b/gpAux/Makefile
@@ -125,6 +125,7 @@ rhel7_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_
 rhel8_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm
 rocky8_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm
 rocky9_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm
+rhel9_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm
 ol8_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm
 ubuntu18.04_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm
 sles12_x86_64_CONFIGFLAGS=--with-gssapi --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-openssl --with-pam --with-ldap --with-uuid=e2fs --with-llvm