diff --git a/buildDockerImage.sh b/buildDockerImage.sh
index bede373e4d47bc2eb84117f604b7944498623166..4fbdf32a8cbdf8f0c7eb48818a849a52fc9ce510 100755
--- a/buildDockerImage.sh
+++ b/buildDockerImage.sh
@@ -132,7 +132,7 @@ check_docker_version
 IMAGE_NAME="opengauss:$VERSION"
 
 # check package exist
-if [ "`ls dockerfiles/ |grep openGauss-${VERSION}`" == "" ]; then
+if [ "`ls dockerfiles/ |grep openGauss-All-${VERSION}`" == "" ]; then
   echo "Could not find openGauss $VERSION package.";
   exit 1;
 fi
diff --git a/dockerfiles/dockerfile_amd b/dockerfiles/dockerfile_amd
index 76b75eef9018afd7e3550f31ce650b5231a5a9f1..310d7e14611b7563feae68c1a736108eddf5067f 100644
--- a/dockerfiles/dockerfile_amd
+++ b/dockerfiles/dockerfile_amd
@@ -1,8 +1,8 @@
 FROM centos:7.6.1810
 
-ENV OPENGAUSS_VERSION 5.1.0
+ENV OPENGAUSS_VERSION 6.0.0
 
-COPY openGauss-${OPENGAUSS_VERSION}-CentOS-64bit-all.tar.gz .
+COPY openGauss-All-${OPENGAUSS_VERSION}-CentOS7-x86_64.tar.gz .
 COPY gosu-amd64 /usr/local/bin/gosu
 COPY gs_createtrust.py .
 ENV LANG en_US.utf8
@@ -15,7 +15,7 @@ RUN set -eux; \
 
     mkdir -p /opengauss && \
     chmod 700 /opengauss && \
-    mv openGauss-${OPENGAUSS_VERSION}-CentOS-64bit-all.tar.gz /opengauss && \
+    mv openGauss-All-${OPENGAUSS_VERSION}-CentOS7-x86_64.tar.gz /opengauss && \
     mv gs_createtrust.py /opengauss && \
     mkdir -p /volume && \
     chmod -R 755 /volume && \
diff --git a/dockerfiles/dockerfile_arm b/dockerfiles/dockerfile_arm
index 0c16d5ec32de62675e0741cf3bd378d1fe359f05..bb8829015ddd333a9ac5f656e5d0afaedf8a67cf 100644
--- a/dockerfiles/dockerfile_arm
+++ b/dockerfiles/dockerfile_arm
@@ -1,8 +1,8 @@
 FROM openeuler-20.03-lts:latest
 
-ENV OPENGAUSS_VERSION 5.1.0
+ENV OPENGAUSS_VERSION 6.0.0
 
-COPY openGauss-${OPENGAUSS_VERSION}-openEuler-64bit-all.tar.gz .
+COPY openGauss-All-${OPENGAUSS_VERSION}-CentOS7-x86_64.tar.gz .
 COPY gosu-arm64 /usr/local/bin/gosu
 COPY gs_createtrust.py .
 ENV LANG en_US.utf8
@@ -16,7 +16,7 @@ RUN set -eux; \
 
     mkdir -p /opengauss && \
     chmod 700 /opengauss && \
-    mv openGauss-${OPENGAUSS_VERSION}-openEuler-64bit-all.tar.gz /opengauss && \
+    mv openGauss-All-${OPENGAUSS_VERSION}-CentOS7-x86_64.tar.gz /opengauss && \
     mv gs_createtrust.py /opengauss && \
     mkdir -p /volume && \
     chmod -R 755 /volume && \
diff --git a/dockerfiles/entrypoint.sh b/dockerfiles/entrypoint.sh
index 47c8a272d6dd108b2215d6487a0c21916f883e9a..1132a4bb8d5baeb8ddcd16b980a26003de81eec3 100755
--- a/dockerfiles/entrypoint.sh
+++ b/dockerfiles/entrypoint.sh
@@ -69,12 +69,12 @@ function set_envfile() {
 
 function install_application() {
         cd ${package_path}
-        enterprise_pkg_file=$(ls ${ROOT_DIR}/openGauss-*-all.tar.gz)
+        enterprise_pkg_file=$(ls ${ROOT_DIR}/openGauss-All-*.tar.gz)
         tar -xf ${enterprise_pkg_file} -C .
-        plat_info=$(ls openGauss*.tar.bz2 | sed 's/openGauss-\(.*\)-64bit.tar.bz2/\1/g')
-        tar -xf openGauss-${plat_info}-64bit.tar.bz2 -C ${app_path}
-        tar -xf openGauss-${plat_info}-64bit-cm.tar.gz -C ${app_path}
-        tar -xf openGauss-${plat_info}-64bit-om.tar.gz -C ${tool_path}
+        plat_info=$(ls openGauss*.tar.bz2 | sed 's/openGauss-Server-\(.*\).tar.bz2/\1/g')
+        tar -xf openGauss-Server-${plat_info}.tar.bz2 -C ${app_path}
+        tar -xf openGauss-CM-${plat_info}.tar.gz -C ${app_path}
+        tar -xf openGauss-OM-${plat_info}.tar.gz -C ${tool_path}
         # 拷贝python3依赖的lib
         python_version=$(python3 -V | awk '{print $2}' | awk -F'.' '{print $2}')
         cd ${tool_path}/lib/ || exit
@@ -207,6 +207,7 @@ function clean_environment() {
 }
 
 function main() {
+        chmod 777 /tmp
         docker_setup_env
         if [ -n "$DATABASE_ALREADY_EXISTS" ]; then
                 if [ "$(id -u)" = '0' ]; then
diff --git a/dockerfiles/gs_createtrust.py b/dockerfiles/gs_createtrust.py
index f642b5c3b9e0bbcb6cef2d762cac5f2726827db7..9bad76001692fd4dcd43b03946aed3f9501de8de 100644
--- a/dockerfiles/gs_createtrust.py
+++ b/dockerfiles/gs_createtrust.py
@@ -1110,7 +1110,7 @@ General options:
         output: NA
         """
         if (hostname == self.localHost or
-                hostname in DefaultValue.get_local_ips()):
+                hostname in DefaultValue.get_local_ips(NetUtil.get_ip_version(hostname))):
             return
 
         bashrc_file = os.path.join(pwd.getpwuid(os.getuid()).pw_dir, ".bashrc")
@@ -1243,7 +1243,7 @@ General options:
             shell_file = os.path.join(localDirPath, "./local/ssh-agent.sh")
             for ip in ips:
                 if (ip == self.localHost or
-                        ip in DefaultValue.get_local_ips()):
+                        ip in DefaultValue.get_local_ips(NetUtil.get_ip_version(ip))):
                     continue
                 session = self.get_ssh_session(ip)
                 DefaultValue.register_remote_ssh_agent(session, ip, self.logger)