diff --git a/msa/js-executor/src/main/scripts/windows/install.bat b/msa/js-executor/src/main/scripts/windows/install.bat
index 4da55425bb..52a4c6c542 100644
--- a/msa/js-executor/src/main/scripts/windows/install.bat
+++ b/msa/js-executor/src/main/scripts/windows/install.bat
@@ -22,7 +22,7 @@ setlocal ENABLEEXTENSIONS
 
 SET BASE=%~dp0
 
-%BASE%${pkg.name}.exe install
+"%BASE%$"{pkg.name}.exe install
 
 @ECHO ${pkg.name} installed successfully!
 
diff --git a/msa/js-executor/src/main/scripts/windows/uninstall.bat b/msa/js-executor/src/main/scripts/windows/uninstall.bat
index 7061d2a052..fa1ebfaed7 100644
--- a/msa/js-executor/src/main/scripts/windows/uninstall.bat
+++ b/msa/js-executor/src/main/scripts/windows/uninstall.bat
@@ -20,6 +20,6 @@
 net stop ${pkg.name}
 
 @ECHO Uninstalling ${pkg.name} ...
-%~dp0${pkg.name}.exe uninstall
+"%~dp0$"{pkg.name}.exe uninstall
 
 @ECHO DONE.
\ No newline at end of file
diff --git a/msa/web-ui/src/main/scripts/windows/install.bat b/msa/web-ui/src/main/scripts/windows/install.bat
index 4da55425bb..52a4c6c542 100644
--- a/msa/web-ui/src/main/scripts/windows/install.bat
+++ b/msa/web-ui/src/main/scripts/windows/install.bat
@@ -22,7 +22,7 @@ setlocal ENABLEEXTENSIONS
 
 SET BASE=%~dp0
 
-%BASE%${pkg.name}.exe install
+"%BASE%$"{pkg.name}.exe install
 
 @ECHO ${pkg.name} installed successfully!
 
diff --git a/msa/web-ui/src/main/scripts/windows/uninstall.bat b/msa/web-ui/src/main/scripts/windows/uninstall.bat
index 7061d2a052..fa1ebfaed7 100644
--- a/msa/web-ui/src/main/scripts/windows/uninstall.bat
+++ b/msa/web-ui/src/main/scripts/windows/uninstall.bat
@@ -20,6 +20,6 @@
 net stop ${pkg.name}
 
 @ECHO Uninstalling ${pkg.name} ...
-%~dp0${pkg.name}.exe uninstall
+"%~dp0$"{pkg.name}.exe uninstall
 
 @ECHO DONE.
\ No newline at end of file
diff --git a/transport/coap/src/main/scripts/windows/install.bat b/transport/coap/src/main/scripts/windows/install.bat
index dba773663c..e03513bb88 100644
--- a/transport/coap/src/main/scripts/windows/install.bat
+++ b/transport/coap/src/main/scripts/windows/install.bat
@@ -3,82 +3,26 @@
 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} ...
 
-%BASE%${pkg.name}.exe install
+"%BASE%$"{pkg.name}.exe install
 
 @ECHO ${pkg.name} 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
 
diff --git a/transport/coap/src/main/scripts/windows/uninstall.bat b/transport/coap/src/main/scripts/windows/uninstall.bat
index 921e4c8395..c03f3369dc 100644
--- a/transport/coap/src/main/scripts/windows/uninstall.bat
+++ b/transport/coap/src/main/scripts/windows/uninstall.bat
@@ -4,6 +4,6 @@
 net stop ${pkg.name}
 
 @ECHO Uninstalling ${pkg.name} ...
-%~dp0${pkg.name}.exe uninstall
+"%~dp0$"{pkg.name}.exe uninstall
 
 @ECHO DONE.
\ No newline at end of file
diff --git a/transport/http/src/main/scripts/windows/install.bat b/transport/http/src/main/scripts/windows/install.bat
index dba773663c..e03513bb88 100644
--- a/transport/http/src/main/scripts/windows/install.bat
+++ b/transport/http/src/main/scripts/windows/install.bat
@@ -3,82 +3,26 @@
 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} ...
 
-%BASE%${pkg.name}.exe install
+"%BASE%$"{pkg.name}.exe install
 
 @ECHO ${pkg.name} 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
 
diff --git a/transport/http/src/main/scripts/windows/uninstall.bat b/transport/http/src/main/scripts/windows/uninstall.bat
index 921e4c8395..c03f3369dc 100644
--- a/transport/http/src/main/scripts/windows/uninstall.bat
+++ b/transport/http/src/main/scripts/windows/uninstall.bat
@@ -4,6 +4,6 @@
 net stop ${pkg.name}
 
 @ECHO Uninstalling ${pkg.name} ...
-%~dp0${pkg.name}.exe uninstall
+"%~dp0$"{pkg.name}.exe uninstall
 
 @ECHO DONE.
\ No newline at end of file
diff --git a/transport/mqtt/src/main/scripts/windows/install.bat b/transport/mqtt/src/main/scripts/windows/install.bat
index dba773663c..e03513bb88 100644
--- a/transport/mqtt/src/main/scripts/windows/install.bat
+++ b/transport/mqtt/src/main/scripts/windows/install.bat
@@ -3,82 +3,26 @@
 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} ...
 
-%BASE%${pkg.name}.exe install
+"%BASE%$"{pkg.name}.exe install
 
 @ECHO ${pkg.name} 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
 
diff --git a/transport/mqtt/src/main/scripts/windows/uninstall.bat b/transport/mqtt/src/main/scripts/windows/uninstall.bat
index 921e4c8395..c03f3369dc 100644
--- a/transport/mqtt/src/main/scripts/windows/uninstall.bat
+++ b/transport/mqtt/src/main/scripts/windows/uninstall.bat
@@ -4,6 +4,6 @@
 net stop ${pkg.name}
 
 @ECHO Uninstalling ${pkg.name} ...
-%~dp0${pkg.name}.exe uninstall
+"%~dp0$"{pkg.name}.exe uninstall
 
 @ECHO DONE.
\ No newline at end of file