diff --git a/assembly/bin/supersonic-build.sh b/assembly/bin/supersonic-build.sh
index c3c6c8a3d..cb1bda75c 100755
--- a/assembly/bin/supersonic-build.sh
+++ b/assembly/bin/supersonic-build.sh
@@ -2,10 +2,6 @@
 
 set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(cd "$sbinDir/.." && pwd -P)
-runtimeDir=$baseDir/../runtime
-buildDir=$baseDir/build
-
 chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
 
@@ -37,6 +33,7 @@ mv supersonic-webapp webapp
 cp -fr webapp ../../launchers/semantic/target/classes
 cp -fr webapp ../../launchers/chat/target/classes
 cp -fr webapp ../../launchers/standalone/target/classes
+rm -fr  ${buildDir}/webapp
 
 #5. build backend python modules
 echo "start installing python modules with pip: ${pip_path}"
@@ -49,5 +46,3 @@ rm -fr $runtimeDir/*
 moveAllToRuntime
 setEnvToWeb chat
 setEnvToWeb semantic
-
-rm -fr  ${buildDir}/webapp
diff --git a/assembly/bin/supersonic-common.sh b/assembly/bin/supersonic-common.sh
index 61ed04504..ce76e684b 100755
--- a/assembly/bin/supersonic-common.sh
+++ b/assembly/bin/supersonic-common.sh
@@ -4,6 +4,11 @@
 python_path=${PYTHON_PATH:-"python3"}
 pip_path=${PIP_PATH:-"pip3"}
 
+sbinDir=$(cd "$(dirname "$0")"; pwd)
+baseDir=$(cd "$sbinDir/.." && pwd -P)
+runtimeDir=$baseDir/../runtime
+buildDir=$baseDir/build
+
 readonly CHAT_APP_NAME="supersonic_chat"
 readonly SEMANTIC_APP_NAME="supersonic_semantic"
 readonly LLMPARSER_APP_NAME="supersonic_llmparser"
@@ -33,9 +38,13 @@ function moveToRuntime {
 
 function moveAllToRuntime {
   mkdir -p ${runtimeDir}
+  tar xvf  ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
+  mv ${buildDir}/supersonic-webapp ${buildDir}/webapp
+
   moveToRuntime chat
   moveToRuntime semantic
   moveToRuntime standalone
+  rm -fr  ${buildDir}/webapp
 }
 
 # run java service
diff --git a/assembly/bin/supersonic-daemon.sh b/assembly/bin/supersonic-daemon.sh
index 9202973eb..e0be1620c 100755
--- a/assembly/bin/supersonic-daemon.sh
+++ b/assembly/bin/supersonic-daemon.sh
@@ -2,10 +2,6 @@
 
 set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
-baseDir=$(cd "$sbinDir/.." && pwd -P)
-runtimeDir=$baseDir/../runtime
-buildDir=$baseDir/build
-
 chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh