diff --git a/package/package.sh b/package/package.sh
index 0be226fe6..b3cf899cf 100644
--- a/package/package.sh
+++ b/package/package.sh
@@ -569,8 +569,7 @@ function make_package_srv()
     cp -rf ${BINARYLIBS_PATH}/install_tools/ipaddress.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
     cp -rf ${BINARYLIBS_PATH}/install_tools/six.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
     cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
-    cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.so_UCS2 ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
-    cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.so_UCS4 ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
+    cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.so* ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
     cp -rf ${BINARYLIBS_PATH}/install_tools/psutil/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
     cp -rf ${BINARYLIBS_PATH}/install_tools/netifaces/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
     cp -rf ${BINARYLIBS_PATH}/install_tools/paramiko/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
@@ -590,8 +589,7 @@ function make_package_srv()
     mv ./install_tools/ipaddress.py             ./lib
     mv ./install_tools/six.py                   ./lib
     mv ./install_tools/_cffi_backend.py         ./lib
-    mv ./install_tools/_cffi_backend.so_UCS2    ./lib
-    mv ./install_tools/_cffi_backend.so_UCS4    ./lib
+    mv ./install_tools/_cffi_backend.so*        ./lib
     mv ./install_tools/paramiko                 ./lib
     mv ./install_tools/psutil                   ./lib
     mv ./install_tools/netifaces                ./lib
diff --git a/src/manager/om/script/gspylib/common/Common.py b/src/manager/om/script/gspylib/common/Common.py
index e1fc7482b..bc2320afd 100644
--- a/src/manager/om/script/gspylib/common/Common.py
+++ b/src/manager/om/script/gspylib/common/Common.py
@@ -926,10 +926,7 @@ class DefaultValue():
             if (str(minor) == '6'):
                 return (True, "3.6")
             else:
-                if (int(patchlevel) < 9):
-                    return (True, "3.6")
-                else:
-                    return (True, "3.7")
+                return (True, "3.7")
         else:
             return (False, "%s.%s.%s" % (str(major), str(minor),
                                          str(patchlevel)))
@@ -1059,12 +1056,20 @@ class DefaultValue():
                 g_file.removeFile(omToolsCffiPath)
                 g_file.removeFile(inspectToolsCffiPath)
                 # copy the correct version
-                newPythonDependCryptoPath = "%s_UCS%d" % (omToolsCffiPath,
+                newPythonDependCryptoPath = "%s_UCS%d_%s" % (omToolsCffiPath,
+                                                          flagNum,version)
+                if os.path.exists(newPythonDependCryptoPath):
+                    g_file.cpFile(newPythonDependCryptoPath, omToolsCffiPath,
+                                  "shell")
+                    g_file.cpFile(newPythonDependCryptoPath, inspectToolsCffiPath,
+                                  "shell")
+                else:
+                    newPythonDependCryptoPath = "%s_UCS%d" % (omToolsCffiPath,
                                                           flagNum)
-                g_file.cpFile(newPythonDependCryptoPath, omToolsCffiPath,
-                              "shell")
-                g_file.cpFile(newPythonDependCryptoPath, inspectToolsCffiPath,
-                              "shell")
+                    g_file.cpFile(newPythonDependCryptoPath, omToolsCffiPath,
+                                  "shell")
+                    g_file.cpFile(newPythonDependCryptoPath, inspectToolsCffiPath,
+                                  "shell")
             except Exception as e:
                 print(ErrorCode.GAUSS_516["GAUSS_51632"] %
                       ("config depend file for paramiko 2.6.0. "