diff --git a/build/linux/usr/local/etc/omc/default/omc.yaml b/build/linux/usr/local/etc/omc/default/omc.yaml
index f282da78..74924c25 100644
--- a/build/linux/usr/local/etc/omc/default/omc.yaml
+++ b/build/linux/usr/local/etc/omc/default/omc.yaml
@@ -1,6 +1,10 @@
 # server version: standard/lite/tenant
 serverVersion: "standard"
 
+# database for server version
+database:
+  defaultDataSourceName: "standard"
+  
 # file: log file name
 # level: /trace/debug/info/warn/error/fatal, default: debug
 # duration: rotation time with xx hours, example: 1/12/24 hours
diff --git a/build/linux/usr/local/etc/omc/script/setup.sh b/build/linux/usr/local/etc/omc/script/setup.sh
index 9a2999a9..7e744d8c 100644
--- a/build/linux/usr/local/etc/omc/script/setup.sh
+++ b/build/linux/usr/local/etc/omc/script/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+
 OMCBinFile=/usr/local/bin/omc
 OMCEtcDir=/usr/local/etc/omc
 confFile=$OMCEtcDir/omc.yaml
@@ -65,7 +65,7 @@ if [ -z "$T_PARAM" ]; then
   echo "Error: You must specify -i (install) or -u (upgrade) first."
   usage
 fi
-echo "Type parameter: $T_PARAM"
+# echo "Type parameter: $T_PARAM"
 
 # Determine if -m is passed in
 if [ -n "$M_PARAM" ]; then
@@ -76,9 +76,10 @@ if [ -n "$M_PARAM" ]; then
   fi
   sed -i "s/MODE=.*/MODE=${M_PARAM}/" $VariableFile
   sed -i "s/serverVersion: \"standard\"/serverVersion: \"${M_PARAM}\"/" $confFile
+  sed -i '/database:/,/defaultDataSourceName:/s/"standard"/"${M_PARAM}"/' $confFile
   MODE=$M_PARAM
 fi
-echo "Mode parameter: $MODE"
+# echo "Mode parameter: $MODE"
 
 # Determine if -c is passed in
 if [ -n "$C_PARAM" ]; then
@@ -90,7 +91,7 @@ if [ -n "$C_PARAM" ]; then
   sed -i "s/VENDORS=.*/VENDORS=${C_PARAM}/" $VariableFile
   VENDORS=$C_PARAM
 fi
-echo "Customize parameter: $VENDORS"
+# echo "Customize parameter: $VENDORS"
 
 # =========================
 if [[ "$T_PARAM" == "install" && "$MODE" == "standard" ]]; then
diff --git a/build/pkg/deb/DEBIAN/postinst b/build/pkg/deb/DEBIAN/postinst
index 8631a287..e65cee55 100644
--- a/build/pkg/deb/DEBIAN/postinst
+++ b/build/pkg/deb/DEBIAN/postinst
@@ -27,7 +27,7 @@ if [ ! -f $RootDir/omc.conf ]; then
     fi
     if [ $? -ne 0 ]; then
       echo "Initialization failure."
-      #rm -rf $RootDir
+      rm -rf $RootDir
       exit 1
     fi