diff --git a/concourse/build.sh b/concourse/build.sh
index f752d043..97d9accc 100755
--- a/concourse/build.sh
+++ b/concourse/build.sh
@@ -11,12 +11,20 @@ function pkg() {
     export CXX="$(which g++)"
 
     pushd /home/gpadmin/bin_diskquota
-    local last_release_path
-    last_release_path=$(readlink -eq /home/gpadmin/last_released_diskquota_bin/diskquota-*.tar.gz)
-    cmake /home/gpadmin/diskquota_src \
-        -DDISKQUOTA_LAST_RELEASE_PATH="${last_release_path}" \
-        -DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
-    cmake --build . --target create_artifact
+    if [[ $OS_NAME == "rhel9" ]]
+    then
+        cmake /home/gpadmin/diskquota_src \
+        -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+        -DDISKQUOTA_DDL_CHANGE_CHECK=off
+        cmake --build . --target create_artifact
+    else
+        local last_release_path
+        last_release_path=$(readlink -eq /home/gpadmin/last_released_diskquota_bin/diskquota-*.tar.gz)
+        cmake /home/gpadmin/diskquota_src \
+            -DDISKQUOTA_LAST_RELEASE_PATH="${last_release_path}" \
+            -DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
+        cmake --build . --target create_artifact
+    fi
     popd
 }
 
diff --git a/concourse/test.sh b/concourse/test.sh
index 76c57b91..6ed0cffb 100755
--- a/concourse/test.sh
+++ b/concourse/test.sh
@@ -35,11 +35,17 @@ function _main() {
     # Run test again with standby master
     activate_standby
     time cmake --build . --target installcheck
+    if [[ $OS_NAME != "rhel9" ]]
+    then
     # Run upgrade test (with standby master)
     time cmake --build . --target upgradecheck
+    fi
     popd
 
+    if [[ $OS_NAME != "rhel9" ]]
+    then
     time /home/gpadmin/diskquota_src/upgrade_test/alter_test.sh
+    fi
 }
 
 _main