diff --git a/.gitignore b/.gitignore
index 15e2f3f..f0ba584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,9 +87,5 @@ yarn.lock
 release/debs/*.deb
 release/tars/*.tar.gz
 release/src-tars/*.tar.gz
-debbuild
-!debbuild/DEBIAN/control
-!debbuild/DEBIAN/postinst
-!debbuild/DEBIAN/preinst
-!debbuild/DEBIAN/postrm
-!debbuild/DEBIAN/prerm
\ No newline at end of file
+debbuild/etc
+debbuild/opt
diff --git a/bin/build.sh b/bin/build.sh
index 907b9fd..9933207 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -45,6 +45,7 @@ pre-build-tar(){
 		mkdir -p ${ReleseDir}/tars
 	fi
 	source ${BuildRootDir}/bin/control.sh
+	cd ${BuildRootDir}
 	sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release
 	git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release	
 }
@@ -72,8 +73,9 @@ pre-build-deb(){
 	if [ ! -d ${DebSystemdDir} ]; then
 		mkdir -p ${DebSystemdDir}
 	fi
+	cd ${BuildRootDir}
 	sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release
-	 --assume-unchanged ${BuildDockerDir}/env/wfc-release
+	git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release
 }
 
 build-extras(){
@@ -202,6 +204,7 @@ post-build(){
 	# if [ -f ${TmpEnvFile} ] && [ ! -f ${BuildDockerDir}/.env ]; then
 	# 	mv -f ${TmpEnvFile} ${BuildDockerDir}/.env
 	# fi
+	cd ${BuildRootDir}
 	git checkout ${BuildDockerDir}/env/wfc-release
 	git update-index --no-assume-unchanged ${BuildDockerDir}/env/wfc-release
 }
diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh
index 31ef857..1b998cb 100755
--- a/build/bin/wfcsetup.sh
+++ b/build/bin/wfcsetup.sh
@@ -183,8 +183,9 @@ EOF"
         while [ $elapsed -lt $timeout ]; do
             health_status=$(docker inspect --format='{{.State.Health.Status}}' $mysql_container_name)
             if [ "$health_status" == "healthy" ]; then
-                echo "Upgrade database: "
-                ${wfc_work_dir}/bin/wfcupgdb.sh all
+                echo "Container $mysql_container_name is healthy"
+                echo "Executing database upgrade scripts ..."
+                ${wfc_work_dir}/bin/wfcupgrade.sh
                 exit 0
             fi
             sleep $interval
diff --git a/debbuild/DEBIAN/control b/debbuild/DEBIAN/control
index 802dfec..1c00df4 100644
--- a/debbuild/DEBIAN/control
+++ b/debbuild/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: WFC
-Version: 1.0.7
+Version: 1.0.8
 Section: WFC
 Prioritt: optional   
 Architecture: amd64  
diff --git a/debbuild/DEBIAN/prerm b/debbuild/DEBIAN/prerm
index a4aad04..0467ad8 100755
--- a/debbuild/DEBIAN/prerm
+++ b/debbuild/DEBIAN/prerm
@@ -4,4 +4,4 @@ wfc_bin_dir=/opt/wfc/bin
 
 ${wfc_bin_dir}/wfccontrol.sh stop
 ${wfc_bin_dir}/wfcsetup.sh rm all
-
+exit 0