diff --git a/deploy/build.bat b/deploy/build.bat
index 7f8db80f16..e1a6c2445c 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -31,12 +31,12 @@ copy scripts\* cloudbeaver >NUL
 mkdir cloudbeaver\workspace\GlobalConfiguration
 xcopy /E /Q ..\samples\sample-databases\GlobalConfiguration cloudbeaver\workspace\GlobalConfiguration >NUL
 copy ..\samples\sample-databases\*.conf cloudbeaver\conf >NUL
+move drivers cloudbeaver >NUL
 
 echo Build static content
 
 cd ..\webapp
 
-rem call npm i lerna -g
 call lerna bootstrap
 call lerna run build --scope @dbeaver/dbeaver -- --pluginsList=../../../../products/default/plugins-list.js
 
@@ -44,7 +44,6 @@ cd ..\deploy
 
 echo Copy static content
 
-MOVE drivers cloudbeaver >NUL
 xcopy /E /Q ..\webapp\packages\dbeaver\dist cloudbeaver\web >NUL
 
 echo Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server.
diff --git a/deploy/build.sh b/deploy/build.sh
index 828a03984a..84355e1c03 100755
--- a/deploy/build.sh
+++ b/deploy/build.sh
@@ -12,8 +12,7 @@ mkdir ./cloudbeaver/web
 echo "Pull dbeaver platform"
 
 cd ../..
-if [[ ! -f dbeaver ]]
-then
+if [[ ! -f dbeaver ]] then
   git clone --depth 1 https://github.com/dbeaver/dbeaver.git
 fi
 cd dbeaver
@@ -30,9 +29,9 @@ echo "Copy server packages"
 
 cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
 cp -p ./scripts/* ./cloudbeaver
-mkdir ./cloudbeaver/workspace/GlobalConfiguration
 cp -rp ../samples/sample-databases/GlobalConfiguration cloudbeaver/workspace
-cp ../samples/sample-databases/*.conf cloudbeaver/conf/
+cp -p ../samples/sample-databases/*.conf cloudbeaver/conf/
+mv drivers cloudbeaver
 
 echo "Build static content"
 
@@ -45,7 +44,6 @@ cd ../deploy
 
 echo "Copy static content"
 
-mv drivers cloudbeaver
 cp -rp ../webapp/packages/dbeaver/dist/* cloudbeaver/web
 
 echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index 1dbdd2c8e3..7dad71ac6e 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -1,5 +1,4 @@
 @rem echo off
-
 for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
index e2dc8e2896..0b881cde58 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -2,4 +2,5 @@
 launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
+
 java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M