diff --git a/deploy/build.bat b/deploy/build.bat
index 57ea92d443..5d23a8438c 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -6,23 +6,19 @@ mkdir cloudbeaver\conf
 mkdir cloudbeaver\workspace
 mkdir cloudbeaver\web
 
-IF EXIST build rmdir /S /Q build
-mkdir build
-cd build
-
 echo "Build dbeaver application"
 
-rem git clone --single-branch --branch release_7_0_1 https://github.com/dbeaver/dbeaver.git
-git clone https://github.com/dbeaver/dbeaver.git
+cd ../..
+IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 cd dbeaver
+git pull
 call mvn clean install
-cd ..
+cd ../cloudbeaver/deploy
 
 echo "Build cloudbeaver server"
 
-cd ..\..\server
+cd ..\server
 call mvn clean package
-
 cd ..\deploy
 
 echo "Copy server packages"
diff --git a/deploy/build.sh b/deploy/build.sh
index 2063d8ef43..ede83f2983 100644
--- a/deploy/build.sh
+++ b/deploy/build.sh
@@ -8,22 +8,22 @@ mkdir ./cloudbeaver/conf
 mkdir ./cloudbeaver/workspace
 mkdir ./cloudbeaver/web
 
-rm -rf build
-mkdir build
-cd build
-
 echo "Build dbeaver application"
 
-git clone https://github.com/dbeaver/dbeaver.git
+cd ../..
+if [[ -f dbeaver ]]
+then
+  git clone https://github.com/dbeaver/dbeaver.git
+fi
 cd dbeaver
+git pull
 mvn clean install
-cd ..
+cd ../cloudbeaver/deploy
 
 echo "Build cloudbeaver server"
 
-cd ../../server
+cd ../server
 mvn clean package
-
 cd ../deploy
 
 echo "Copy server packages"