diff --git a/packaging/java/scripts/windows/install.bat b/packaging/java/scripts/windows/install.bat
index ffd085aa20..6f168c76d8 100644
--- a/packaging/java/scripts/windows/install.bat
+++ b/packaging/java/scripts/windows/install.bat
@@ -7,11 +7,11 @@ setlocal ENABLEEXTENSIONS
 for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
 @ECHO CurrentVersion %jver%
 
-if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
+if %jver% NEQ 110 GOTO JAVA_NOT_INSTALLED
 
 :JAVA_INSTALLED
 
-@ECHO Java 1.8 found!
+@ECHO Java 11 found!
 @ECHO Installing thingsboard ...
 
 SET loadDemo=false
@@ -50,8 +50,8 @@ POPD
 GOTO END
 
 :JAVA_NOT_INSTALLED
-@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.
+@ECHO Java 11 is not installed. Only Java 11 is supported
+@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 11. Then retry installation.
 PAUSE
 GOTO END
 
diff --git a/packaging/java/scripts/windows/service.xml b/packaging/java/scripts/windows/service.xml
index 2cc46a7e91..7b077142c4 100644
--- a/packaging/java/scripts/windows/service.xml
+++ b/packaging/java/scripts/windows/service.xml
@@ -10,29 +10,18 @@
     <executable>java</executable>
     <startargument>-Dplatform=windows</startargument>
     <startargument>-Dinstall.data_dir=%BASE%\data</startargument>
-    <startargument>-Xloggc:%BASE%\logs\gc.log</startargument>
+    <startargument>-Xlog:gc*,heap*,age*,safepoint=debug:file=%BASE%\logs\gc.log:time,uptime,level,tags:filecount=10,filesize=10M</startargument>
     <startargument>-XX:+HeapDumpOnOutOfMemoryError</startargument>
-    <startargument>-XX:+PrintGCDetails</startargument>
-    <startargument>-XX:+PrintGCDateStamps</startargument>
-    <startargument>-XX:+PrintHeapAtGC</startargument>
-    <startargument>-XX:+PrintTenuringDistribution</startargument>
-    <startargument>-XX:+PrintGCApplicationStoppedTime</startargument>
-    <startargument>-XX:+UseGCLogFileRotation</startargument>
-    <startargument>-XX:NumberOfGCLogFiles=10</startargument>
-    <startargument>-XX:GCLogFileSize=10M</startargument>
     <startargument>-XX:-UseBiasedLocking</startargument>
     <startargument>-XX:+UseTLAB</startargument>
     <startargument>-XX:+ResizeTLAB</startargument>
     <startargument>-XX:+PerfDisableSharedMem</startargument>
     <startargument>-XX:+UseCondCardMark</startargument>
-    <startargument>-XX:CMSWaitDuration=10000</startargument>
-    <startargument>-XX:+UseParNewGC</startargument>
-    <startargument>-XX:+UseConcMarkSweepGC</startargument>
-    <startargument>-XX:+CMSParallelRemarkEnabled</startargument>
-    <startargument>-XX:+CMSParallelInitialMarkEnabled</startargument>
-    <startargument>-XX:+CMSEdenChunksRecordAlways</startargument>
-    <startargument>-XX:CMSInitiatingOccupancyFraction=75</startargument>
-    <startargument>-XX:+UseCMSInitiatingOccupancyOnly</startargument>
+    <startargument>-XX:+UseG1GC</startargument>
+    <startargument>-XX:MaxGCPauseMillis=500</startargument>
+    <startargument>-XX:+UseStringDeduplication</startargument>
+    <startargument>-XX:+ParallelRefProcEnabled</startargument>
+    <startargument>-XX:MaxTenuringThreshold=10</startargument>
     <startargument>-Xms512m</startargument>
     <startargument>-Xmx1024m</startargument>
     <startargument>-jar</startargument>