diff --git a/application/src/main/scripts/windows/install.bat b/application/src/main/scripts/windows/install.bat
index b54c0d9c9a..42ff2ec15a 100644
--- a/application/src/main/scripts/windows/install.bat
+++ b/application/src/main/scripts/windows/install.bat
@@ -3,72 +3,16 @@
 setlocal ENABLEEXTENSIONS
 
 @ECHO Detecting Java version installed.
-:CHECK_JAVA_64
-@ECHO Detecting if it is 64 bit machine
-set KEY_NAME="HKEY_LOCAL_MACHINE\Software\Wow6432Node\JavaSoft\Java Runtime Environment"
-set VALUE_NAME=CurrentVersion
+:CHECK_JAVA
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
+@ECHO CurrentVersion %jver%
 
-FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
-    set ValueName=%%A
-    set ValueType=%%B
-    set ValueValue=%%C
-)
-@ECHO CurrentVersion %ValueValue%
-
-SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
-SET VALUE_NAME=JavaHome
-
-if defined ValueName (
-    FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
-        set ValueName2=%%A
-        set ValueType2=%%B
-        set JRE_PATH2=%%C
-
-        if defined ValueName2 (
-            set ValueName = %ValueName2%
-            set ValueType = %ValueType2%
-            set ValueValue =  %JRE_PATH2%
-        )
-    )
-)
-
-IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED
-
-:CHECK_JAVA_32
-@ECHO Detecting if it is 32 bit machine
-set KEY_NAME="HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Runtime Environment"
-set VALUE_NAME=CurrentVersion
-
-FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
-    set ValueName=%%A
-    set ValueType=%%B
-    set ValueValue=%%C
-)
-@ECHO CurrentVersion %ValueValue%
-
-SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
-SET VALUE_NAME=JavaHome
-
-if defined ValueName (
-    FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
-        set ValueName2=%%A
-        set ValueType2=%%B
-        set JRE_PATH2=%%C
-
-        if defined ValueName2 (
-            set ValueName = %ValueName2%
-            set ValueType = %ValueType2%
-            set ValueValue =  %JRE_PATH2%
-        )
-    )
-)
-
-IF "%JRE_PATH2%" == ""  GOTO JAVA_NOT_INSTALLED
+if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
 
 :JAVA_INSTALLED
 
 @ECHO Java 1.8 found!
-@ECHO Installing ${pkg.name} ...
+@ECHO Installing thingsboard ...
 
 SET loadDemo=false
 
@@ -79,17 +23,17 @@ if "%1" == "--loadDemo" (
 SET BASE=%~dp0
 SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
 SET SQL_DATA_FOLDER=%BASE%\data\sql
-SET jarfile=%BASE%\lib\${pkg.name}.jar
+SET jarfile=%BASE%\lib\thingsboard.jar
 SET installDir=%BASE%\data
 
-PUSHD %BASE%\conf
+PUSHD "%BASE%\conf"
 
-java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
-                    -Dinstall.data_dir=%installDir%^
+java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
+                    -Dinstall.data_dir="%installDir%"^
                     -Dinstall.load_demo=%loadDemo%^
                     -Dspring.jpa.hibernate.ddl-auto=none^
                     -Dinstall.upgrade=false^
-                    -Dlogging.config=%BASE%\install\logback.xml^
+                    -Dlogging.config="%BASE%\install\logback.xml"^
                     org.springframework.boot.loader.PropertiesLauncher
 
 if errorlevel 1 (
@@ -99,18 +43,16 @@ if errorlevel 1 (
 )
 POPD
 
-%BASE%${pkg.name}.exe install
+%BASE%thingsboard.exe install
 
 @ECHO ThingsBoard installed successfully!
 
 GOTO END
 
 :JAVA_NOT_INSTALLED
-@ECHO Java 1.8 or above is not installed
-@ECHO Please go to https://java.com/ and install Java. Then retry installation.
+@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
+@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
 PAUSE
 GOTO END
 
 :END
-
-
diff --git a/application/src/main/scripts/windows/upgrade.bat b/application/src/main/scripts/windows/upgrade.bat
index d1381bb495..704d4c170d 100644
--- a/application/src/main/scripts/windows/upgrade.bat
+++ b/application/src/main/scripts/windows/upgrade.bat
@@ -26,14 +26,14 @@ SET SQL_DATA_FOLDER=%BASE%\data\sql
 SET jarfile=%BASE%\lib\${pkg.name}.jar
 SET installDir=%BASE%\data
 
-PUSHD %BASE%\conf
+PUSHD "%BASE%\conf"
 
-java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
-                    -Dinstall.data_dir=%installDir%^
+java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
+                    -Dinstall.data_dir="%installDir%"^
                     -Dspring.jpa.hibernate.ddl-auto=none^
                     -Dinstall.upgrade=true^
                     -Dinstall.upgrade.from_version=%fromVersion%^
-                    -Dlogging.config=%BASE%\install\logback.xml^
+                    -Dlogging.config="%BASE%\install\logback.xml"^
                     org.springframework.boot.loader.PropertiesLauncher
 
 if errorlevel 1 (