diff --git a/gpcontrib/diskquota/CMakeLists.txt b/gpcontrib/diskquota/CMakeLists.txt
index fad393cb101..face48578a6 100644
--- a/gpcontrib/diskquota/CMakeLists.txt
+++ b/gpcontrib/diskquota/CMakeLists.txt
@@ -12,10 +12,6 @@ endif()
 # generate 'compile_commands.json'
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# Retrieve repository information
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Git.cmake)
-GitHash_Get(DISKQUOTA_GIT_HASH)
-
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Gpdb.cmake)
 
 
@@ -154,19 +150,6 @@ add_custom_target(create_artifact
   ${CMAKE_COMMAND} -E tar czvf ${artifact_NAME} "${tgz_NAME}.tar.gz")
 # packing end
 
-# Create build-info
-# The diskquota-build-info shouldn't be copied to GPDB release by install_gpdb_component
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildInfo.cmake)
-set(build_info_PATH ${CMAKE_CURRENT_BINARY_DIR}/diskquota-build-info)
-BuildInfo_Create(${build_info_PATH}
-  VARS
-  DISKQUOTA_GIT_HASH
-  DISKQUOTA_VERSION
-  GP_MAJOR_VERSION
-  GP_VERSION
-  CMAKE_BUILD_TYPE)
-# Create build-info end
-
 # Add installcheck targets
 add_subdirectory(tests)
 add_subdirectory(upgrade_test)
@@ -175,4 +158,3 @@ add_subdirectory(upgrade_test)
 install(PROGRAMS "cmake/install_gpdb_component" DESTINATION ".")
 install(FILES ${diskquota_DDL} DESTINATION "share/postgresql/extension/")
 install(TARGETS diskquota DESTINATION "lib/postgresql/")
-install(FILES ${build_info_PATH} DESTINATION ".")
diff --git a/gpcontrib/diskquota/cmake/BuildInfo.cmake b/gpcontrib/diskquota/cmake/BuildInfo.cmake
deleted file mode 100644
index 6e256f34502..00000000000
--- a/gpcontrib/diskquota/cmake/BuildInfo.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Create a build info file based on the given cmake variables
-# For example:
-# BuildInfo_Create(
-# ${CMAKE_CURRENT_BINARY_DIR}/build-info
-# VARS
-# DISKQUOTA_GIT_HASH
-# GP_MAJOR_VERSION)
-# )
-# will create a build info file:
-# ❯ cat build-info
-# DISKQUOTA_GIT_HASH = 151ed92
-# GP_MAJOR_VERSION = 6
-
-function(BuildInfo_Create path)
-  cmake_parse_arguments(
-    arg
-    ""
-    ""
-    "VARS"
-    ${ARGN})
-
-  # Set REGRESS test cases
-  foreach(key IN LISTS arg_VARS)
-    get_property(val VARIABLE PROPERTY ${key})
-    list(APPEND info_list "${key} = ${val}")
-  endforeach()
-  file(WRITE ${path} "")
-  foreach(content IN LISTS info_list)
-    file(APPEND ${path} "${content}\n")
-  endforeach()
-endfunction()
-
diff --git a/gpcontrib/diskquota/cmake/Git.cmake b/gpcontrib/diskquota/cmake/Git.cmake
deleted file mode 100644
index 81a68b1f1f4..00000000000
--- a/gpcontrib/diskquota/cmake/Git.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-# get git hash
-macro(GitHash_Get _git_hash)
-  find_package(Git)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%h
-    OUTPUT_VARIABLE ${_git_hash}
-    OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-endmacro()