diff --git a/CLIENT_DATA/Sereby_JRE10_package.xml b/CLIENT_DATA/Sereby_JRE10_package.xml
deleted file mode 100644
index 704c775..0000000
--- a/CLIENT_DATA/Sereby_JRE10_package.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<package id="jre10" name="%NAME%" group="Standard Programme" priority="10">
-  <variable name="NAME" value="Java Runtime Environment 10 Update 60" />
-  <variable name="BUILD" value="8.0.60.27" />
-  <check type="file" condition="<" arch="x64" value="%BUILD%" path="%programfiles(x86)%\Java\jre10\bin\java.exe" />
-  <install>
-    <cmd name="Java: Fix MS SystemUser Bug" path="..\SystemFix.bat" />
-    <cmd name="Java: Remove old Installation" path="..\uninstall.bat" param="9" />
-    <cmd path="x64\silent.bat" arch="x64" name="%NAME% x64" />
-  </install>
-</package>
diff --git a/CLIENT_DATA/Sereby_JRE10_x64_silent.bat b/CLIENT_DATA/Sereby_JRE10_x64_silent.bat
deleted file mode 100644
index e93200f..0000000
--- a/CLIENT_DATA/Sereby_JRE10_x64_silent.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-title Installiere Java 9
-%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre10"
\ No newline at end of file
diff --git a/CLIENT_DATA/Sereby_JRE10_x86_silent.bat b/CLIENT_DATA/Sereby_JRE10_x86_silent.bat
deleted file mode 100644
index a62e1fc..0000000
--- a/CLIENT_DATA/Sereby_JRE10_x86_silent.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-SET pfdir=%ProgramFiles(x86)%
-IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
-
-title Installiere Java 9
-%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre10"
\ No newline at end of file
diff --git a/CLIENT_DATA/Sereby_JRE11_package.xml b/CLIENT_DATA/Sereby_JRE11_package.xml
new file mode 100644
index 0000000..0f4b4ab
--- /dev/null
+++ b/CLIENT_DATA/Sereby_JRE11_package.xml
@@ -0,0 +1,12 @@
+<package id="jre11" name="%NAME%" group="Standard Programme" priority="10">
+  <variable name="NAME" value="Java Runtime Environment 8 Update 60" />
+  <variable name="BUILD" value="8.0.60.27" />
+  <check type="file" condition="<" arch="x86" value="%BUILD%" path="%programfiles%\Java\jre11\bin\java.exe" />
+  <check type="file" condition="<" arch="x64" value="%BUILD%" path="%programfiles(x86)%\Java\jre11\bin\java.exe" />
+  <install>
+    <cmd name="Java: Fix MS SystemUser Bug" path="..\SystemFix.bat" />
+    <cmd name="Java: Remove old Installation" path="..\uninstall.bat" param="8" />
+    <cmd path="x86\silent.bat" />
+    <cmd path="x64\silent.bat" arch="x64" name="%NAME% x64" />
+  </install>
+</package>
diff --git a/CLIENT_DATA/Sereby_JRE11_x64_silent.bat b/CLIENT_DATA/Sereby_JRE11_x64_silent.bat
new file mode 100644
index 0000000..7dd72f7
--- /dev/null
+++ b/CLIENT_DATA/Sereby_JRE11_x64_silent.bat
@@ -0,0 +1,3 @@
+@echo off
+title Installiere Java 11
+msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%ProgramFiles%\Java\jre11" /quiet 
\ No newline at end of file
diff --git a/CLIENT_DATA/Sereby_JRE11_x86_silent.bat b/CLIENT_DATA/Sereby_JRE11_x86_silent.bat
new file mode 100644
index 0000000..286b485
--- /dev/null
+++ b/CLIENT_DATA/Sereby_JRE11_x86_silent.bat
@@ -0,0 +1,6 @@
+@echo off
+SET pfdir=%ProgramFiles(x86)%
+IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
+
+title Installiere Java 11
+msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%pfdir%\Java\jre11" /quiet
\ No newline at end of file
diff --git a/CLIENT_DATA/Sereby_JRE8_x64_silent.bat b/CLIENT_DATA/Sereby_JRE8_x64_silent.bat
index 6b6e730..1748136 100644
--- a/CLIENT_DATA/Sereby_JRE8_x64_silent.bat
+++ b/CLIENT_DATA/Sereby_JRE8_x64_silent.bat
@@ -1,3 +1,3 @@
 @echo off
 title Installiere Java 8
-%~dp0jre.exe /s INSTALLDIR="%ProgramFiles%\Java\jre8"
\ No newline at end of file
+msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%ProgramFiles%\Java\jre8" /quiet
\ No newline at end of file
diff --git a/CLIENT_DATA/Sereby_JRE8_x86_silent.bat b/CLIENT_DATA/Sereby_JRE8_x86_silent.bat
index e729e61..8337853 100644
--- a/CLIENT_DATA/Sereby_JRE8_x86_silent.bat
+++ b/CLIENT_DATA/Sereby_JRE8_x86_silent.bat
@@ -3,4 +3,4 @@ SET pfdir=%ProgramFiles(x86)%
 IF "%pfdir%"=="" SET pfdir=%ProgramFiles%
 
 title Installiere Java 8
-%~dp0jre.exe /s INSTALLDIR="%pfdir%\Java\jre8"
\ No newline at end of file
+msiexec /i %~dp0jre.msi ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome INSTALLDIR="%pfdir%\Java\jre8" /quiet
\ No newline at end of file
diff --git a/CLIENT_DATA/WinPKG.xml b/CLIENT_DATA/WinPKG.xml
index dfd0d58..bd6444b 100644
--- a/CLIENT_DATA/WinPKG.xml
+++ b/CLIENT_DATA/WinPKG.xml
@@ -3,7 +3,7 @@
   <set component="net4.7.1" checked="1" />
   <set component="msjsharp" checked="1" />
   <set component="silver" checked="1" />
-  <set component="jre10" checked="1" />
+  <set component="jre11" checked="1" />
   <set component="AdobeShock" checked="1" />
   <set component="basicruntimes" checked="1" />
   <set component="msdx9" checked="1" />
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index ee2ed34..c2e4118 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -58,14 +58,14 @@ if ($sereby_jre8$ = "uninstall")
     opsiservicecall_jre8_uninstall
     Set $reboot$ = "true"
 endif
-if ($sereby_jre10$ = "reinstall")
-    DosInAnIcon_jre10_uninstall
-    opsiservicecall_jre10_reinstall
+if ($sereby_jre11$ = "reinstall")
+    DosInAnIcon_jre11_uninstall
+    opsiservicecall_jre11_reinstall
     Set $reboot$ = "true"
 endif
-if ($sereby_jre10$ = "uninstall")
-    DosInAnIcon_jre10_uninstall
-    opsiservicecall_jre10_uninstall
+if ($sereby_jre11$ = "uninstall")
+    DosInAnIcon_jre11_uninstall
+    opsiservicecall_jre11_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeShock$ = "reinstall")
@@ -269,7 +269,7 @@ wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall
 "%opsiserviceUser%"
 ]
 
-[DosInAnIcon_jre10_uninstall]
+[DosInAnIcon_jre11_uninstall]
 @echo off
 rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
 rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
@@ -281,20 +281,20 @@ rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
 rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
 cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
 
-[opsiservicecall_jre10_reinstall]
+[opsiservicecall_jre11_reinstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_jre10",
+"sereby_jre11",
 "install",
 "%opsiserviceUser%"
 ]
 
-[opsiservicecall_jre10_uninstall]
+[opsiservicecall_jre11_uninstall]
 "method": "setProductProperty"
 "params": [
 "$ProductId$",
-"sereby_jre10",
+"sereby_jre11",
 "none",
 "%opsiserviceUser%"
 ]
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index 9a460d9..7c9bba9 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -16,8 +16,8 @@ endif
 if ($sereby_silver$ = "install")
     DosInAnIcon_silver_config
 endif
-if ($sereby_jre10$ = "install")
-    DosInAnIcon_jre10_config
+if ($sereby_jre11$ = "install")
+    DosInAnIcon_jre11_config
 endif
 if ($sereby_jre8$ = "install")
     DosInAnIcon_jre8_config
@@ -87,9 +87,9 @@ xml ed -O -u "/settings/set[@component='msfsharp']/@checked" -v 1 "$LogDir$\WinP
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
 xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
-[DosInAnIcon_jre10_config]
+[DosInAnIcon_jre11_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='jre10']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+xml ed -O -u "/settings/set[@component='jre11']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
 
 [DosInAnIcon_jre8_config]
 copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index 5ca0b2e..0e944d9 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -14,8 +14,8 @@ DefVar	$sereby_msfsharp$
 Set 	$sereby_msfsharp$ = GetProductProperty("sereby_msfsharp", "install")
 DefVar	$sereby_silver$
 Set 	$sereby_silver$ = GetProductProperty("sereby_silver", "install")
-DefVar	$sereby_jre10$
-Set 	$sereby_jre10$ = GetProductProperty("sereby_jre10", "install")
+DefVar	$sereby_jre11$
+Set 	$sereby_jre11$ = GetProductProperty("sereby_jre11", "install")
 DefVar	$sereby_jre8$
 Set 	$sereby_jre8$ = GetProductProperty("sereby_jre8", "install")
 DefVar	$sereby_AdobeShock$
diff --git a/OPSI/control b/OPSI/control
index 8ad5e69..27f2e0d 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -101,10 +101,10 @@ default: ["install"]
 
 [ProductProperty]
 type: unicode
-name: sereby_jre10
+name: sereby_jre11
 multivalue: False
 editable: False
-description: Install Java 10 Runtime Environment
+description: Install OpenJDK Java 11 Runtime Environment
 values: ["install", "none", "reinstall", "uninstall"]
 default: ["install"]
 
@@ -113,7 +113,7 @@ type: unicode
 name: sereby_jre8
 multivalue: False
 editable: False
-description: Install Java 8 Runtime Environment
+description: Install OpenJDK Java 8 Runtime Environment
 values: ["install", "none", "reinstall", "uninstall"]
 default: ["install"]
 
diff --git a/builder-product.cfg b/builder-product.cfg
index 086760c..d3a356a 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -36,17 +36,17 @@ AIRMAJOR="32.0"
 # Update Java 7/8
 # ==================================
 
-JRE10UPDATE="1"
-JRE10UVERSION="10.0.2"
-JRE10BUILD="13"
-JRE10VERSION="10.0.2"
-JRE10DLID="19aef61b38124481863b1413dce1855f"
+JRE11UPDATE="1"
+JRE11UVERSION="11.0.4"
+JRE11BUILD="11"
+JRE11VERSION="11.0.4"
+#JRE11DLID="19aef61b38124481863b1413dce1855f"
 
 JRE8UPDATE="1"
-JRE8UVERSION="212"
+JRE8UVERSION="222"
 JRE8BUILD="10"
-JRE8VERSION="8.0.2120.10"
-JRE8DLID="230deb18db3e4014bb8e3e8324f81b43"
+JRE8VERSION="8.0.2220.10"
+#JRE8DLID="230deb18db3e4014bb8e3e8324f81b43"
 
 
 # ==================================
@@ -167,27 +167,31 @@ DL_ARCH[11]="X86"
 DL_EXTRACT_FORMAT[11]="7zip"
 DL_EXTRACT_TO[11]="7ZipSFX"
 
-DL_FILE[12]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe"
+DL_FILE[12]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.msi"
 #DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106246"
-DL_SOURCE[12]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/${JRE8DLID}/jre-8u${JRE8UVERSION}-windows-i586.exe"
+#DL_SOURCE[12]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/${JRE8DLID}/jre-8u${JRE8UVERSION}-windows-i586.exe"
+DL_SOURCE[12]="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u${JRE8UVERSION}-b${JRE8BUILD}/OpenJDK8U-jre_x86-32_windows_hotspot_8u${JRE8UVERSION}b${JRE8BUILD}.msi"
 DL_ARCH[12]="X86"
 DL_WINST_NAME[12]=Install8Jre32Exe
 
-DL_FILE[13]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe"
+DL_FILE[13]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.msi"
 #DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=106248"
-DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/${JRE8DLID}/jre-8u${JRE8UVERSION}-windows-x64.exe"
+#DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/${JRE8DLID}/jre-8u${JRE8UVERSION}-windows-x64.exe"
+DL_SOURCE[13]="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u${JRE8UVERSION}-b${JRE8BUILD}/OpenJDK8U-jre_x64_windows_hotspot_8u${JRE8UVERSION}b${JRE8BUILD}.msi"
 DL_ARCH[13]="X86"
 DL_WINST_NAME[13]=InstallJ8re64Exe
 
-DL_FILE[14]="jre${JRE10UVERSION}-b${JRE10BUILD}-x86.exe"
-DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/${JRE10UVERSION}+${JRE10BUILD}/${JRE10DLID}/jre-${JRE10UVERSION}_windows-x64_bin.exe"
+DL_FILE[14]="jre${JRE11UVERSION}-b${JRE11BUILD}-x86.msi"
+#DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/${JRE11UVERSION}+${JRE11BUILD}/${JRE11DLID}/jre-${JRE11UVERSION}_windows-x64_bin.exe"
+DL_SOURCE[14]="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${JRE11UVERSION}%2B${JRE11BUILD}/OpenJDK11U-jre_x86-32_windows_hotspot_${JRE11UVERSION}_${JRE11BUILD}.msi"
 DL_ARCH[14]="X86"
-DL_WINST_NAME[14]=Install10Jre32Exe
+DL_WINST_NAME[14]=Install11Jre32Exe
 
-DL_FILE[15]="jre${JRE10UVERSION}-b${JRE10BUILD}-x64.exe"
-DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/${JRE10UVERSION}+${JRE10BUILD}/${JRE10DLID}/jre-${JRE10UVERSION}_windows-x64_bin.exe"
+DL_FILE[15]="jre${JRE11UVERSION}-b${JRE11BUILD}-x64.msi"
+#DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/${JRE11UVERSION}+${JRE11BUILD}/${JRE11DLID}/jre-${JRE11UVERSION}_windows-x64_bin.exe"
+DL_SOURCE[15]="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${JRE11UVERSION}%2B${JRE11BUILD}/OpenJDK11U-jre_x64_windows_hotspot_${JRE11UVERSION}_${JRE11BUILD}.msi"
 DL_ARCH[15]="X86"
-DL_WINST_NAME[15]=Install10Jre64Exe
+DL_WINST_NAME[15]=Install11Jre64Exe
 
 DL_FILE[16]="install_flash_player-${FLASHVERSION}.exe"
 DL_SOURCE[16]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 84c74a7..df1123d 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -168,38 +168,38 @@ function create() {
 
   if [ "$JRE8UPDATE" = "1" ]; then
     mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/{x86,x64}
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/jre.exe
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/jre.msi
     rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/silent.bat
     rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*.xml
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE8_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE8_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/silent.bat
-    mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/jre.msi
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE8_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/silent.bat
-    mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/jre.msi
     patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/check[@type='os']"
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 8 Update ${JRE8UVERSION}"
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='NAME']/@value" "OpenJDK Runtime Environment 8 Update ${JRE8UVERSION}"
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml "/package/variable[@name='BUILD']/@value" "${JRE8VERSION}"
   fi
   sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
   sed -e 's/.*<\/settings>.*/\t<set component="jre8" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
   
-  if [ "$JRE10UPDATE" = "1" ]; then
-    mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/{x86,x64}
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*.exe
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/silent.bat
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*/jre.exe
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*/silent.bat
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/*.xml
-    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE10_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml
-    #mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE10_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x86/silent.bat
-    #mv $INST_DIR/CLIENT_DATA/X86/JRE10u${JRE10UVERSION}-b${JRE10BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x86/jre.exe
-    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE10_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x64/silent.bat
-    mv $INST_DIR/CLIENT_DATA/X86/jre${JRE10UVERSION}-b${JRE10BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/x64/jre.exe
-    patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml "/package/check[@type='os']"
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment ${JRE10UVERSION}"
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml "/package/variable[@name='BUILD']/@value" "${JRE10VERSION}"
+  if [ "$JRE11UPDATE" = "1" ]; then
+    mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/{x86,x64}
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/*.exe
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/silent.bat
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/*/jre.msi
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/*/silent.bat
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/*.xml
+    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE11_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml
+    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE11_x86_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x86/silent.bat
+    mv $INST_DIR/CLIENT_DATA/X86/JRE11u${JRE11UVERSION}-b${JRE11BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x86/jre.msi
+    mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE11_x64_silent.bat $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x64/silent.bat
+    mv $INST_DIR/CLIENT_DATA/X86/jre${JRE11UVERSION}-b${JRE11BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/x64/jre.msi
+    patch_delete_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml "/package/check[@type='os']"
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml "/package/variable[@name='NAME']/@value" "OpenJDK Runtime Environment ${JRE11UVERSION}"
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml "/package/variable[@name='BUILD']/@value" "${JRE11VERSION}"
   fi
-  sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml
+  sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml
   
   # ==========================================================================================================
   # Update Flash
@@ -351,17 +351,17 @@ function create() {
   sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v8 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
   tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml
   
-  echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
-  echo "if exist \"%PROGRAMFILES%\Java\jre10\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre10\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
-  echo "if exist \"%PROGRAMFILES(x86)%\Java\jre10\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre10\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
+  echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
+  echo "if exist \"%PROGRAMFILES%\Java\jre11\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre11\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
+  echo "if exist \"%PROGRAMFILES(x86)%\Java\jre11\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre11\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
   
-  echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
-  echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
-  echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
+  echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
+  echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
+  echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
   
-  echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/disable.bat
-  sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v10 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml
-  tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v10/package.xml
+  echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/disable.bat
+  sed -e 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java v11 Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml
+  tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v11/package.xml
   
   # ==========================================================================================================
   # Disable Flash Update Check
diff --git a/jre10.0.2-b13-x64.exe.sha1sum b/jre10.0.2-b13-x64.exe.sha1sum
deleted file mode 100644
index 41e2f63..0000000
--- a/jre10.0.2-b13-x64.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ca95256dbce87518fb74c282f75e1a6666f42492  /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/jre10.0.2-b13-x64.exe
diff --git a/jre10.0.2-b13-x86.exe.sha1sum b/jre10.0.2-b13-x86.exe.sha1sum
deleted file mode 100644
index e0ed3cf..0000000
--- a/jre10.0.2-b13-x86.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ca95256dbce87518fb74c282f75e1a6666f42492  /home/mario/.opsi-dist-cache/sereby.aio-2.4.6.1/X86/jre10.0.2-b13-x86.exe
diff --git a/jre11.0.4-b11-x64.msi.sha1sum b/jre11.0.4-b11-x64.msi.sha1sum
new file mode 100644
index 0000000..46dd0a0
--- /dev/null
+++ b/jre11.0.4-b11-x64.msi.sha1sum
@@ -0,0 +1 @@
+13d83abe13df98b020fe26af0cbf77c016171e81  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/jre11.0.4-b11-x64.msi
diff --git a/jre11.0.4-b11-x86.msi.sha1sum b/jre11.0.4-b11-x86.msi.sha1sum
new file mode 100644
index 0000000..7c0c312
--- /dev/null
+++ b/jre11.0.4-b11-x86.msi.sha1sum
@@ -0,0 +1 @@
+97931c6518508c9f1ea14019aafbe9a4289a1f69  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/jre11.0.4-b11-x86.msi
diff --git a/jre8u212-b10-x64.exe.sha1sum b/jre8u212-b10-x64.exe.sha1sum
deleted file mode 100644
index 6a0dade..0000000
--- a/jre8u212-b10-x64.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-befb42af9de280753b0bef3760e0319bea95c488  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/jre8u212-b10-x64.exe
diff --git a/jre8u212-b10-x86.exe.sha1sum b/jre8u212-b10-x86.exe.sha1sum
deleted file mode 100644
index 4a754f4..0000000
--- a/jre8u212-b10-x86.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-adfb9bbabdf63592fb873b83f9192dd13d5bee7c  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/jre8u212-b10-x86.exe
diff --git a/jre8u222-b10-x64.msi.sha1sum b/jre8u222-b10-x64.msi.sha1sum
new file mode 100644
index 0000000..2d69ec3
--- /dev/null
+++ b/jre8u222-b10-x64.msi.sha1sum
@@ -0,0 +1 @@
+77b9f973db4f85fe7d48a6f562b968aea879028f  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/jre8u222-b10-x64.msi
diff --git a/jre8u222-b10-x86.msi.sha1sum b/jre8u222-b10-x86.msi.sha1sum
new file mode 100644
index 0000000..09b6bfc
--- /dev/null
+++ b/jre8u222-b10-x86.msi.sha1sum
@@ -0,0 +1 @@
+e90119797c2f1e1f078c303936d39e6390e96da6  /home/mario/.opsi-dist-cache/sereby.aio-2.4.8.1/X86/jre8u222-b10-x86.msi