diff --git a/builder-product.cfg b/builder-product.cfg
index c6564c0..e2ffa63 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -36,14 +36,14 @@ AIRVERSION="17.0.0.124"
 # ==================================
 
 JRE7UPDATE="1"
-JRE7UVERSION="75"
+JRE7UVERSION="76"
 JRE7BUILD="13"
-JRE7VERSION="7.0.750.13"
+JRE7VERSION="7.0.760.13"
 
 JRE8UPDATE="0"
 JRE8UVERSION="40"
-JRE8BUILD="25"
-JRE8VERSION="8.0.400.25"
+JRE8BUILD="28"
+JRE8VERSION="8.0.400.28"
 
 # ==================================
 # Update Adobe Flash
@@ -88,7 +88,7 @@ RICKTENDONET="2015.02.11"
 # ==================================
 
 GENERALUPDATE="1"
-GENERALVERSION="1.1.0.12-go1"
+GENERALVERSION="1.1.0.13-go1"
 
 # ==================================
 # MSVC Runtimes Verison
@@ -162,29 +162,29 @@ DL_ARCH[11]="X86"
 DL_EXTRACT_FORMAT[11]="7zip"
 DL_EXTRACT_TO[11]="7ZipSFX"
 
-DL_FILE[12]="jre7u${JRE7UVERSION}-x86.exe"
+DL_FILE[12]="jre7u${JRE7UVERSION}-b${JRE7BUILD}-x86.exe"
 DL_SOURCE[12]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=101467"
 #DL_SOURCE[12]="http://download.oracle.com/otn-pub/java/jdk/7u${JRE7UVERSION}-b${JRE7BUILD}/jre-7u${JRE7UVERSION}-windows-i586.exe"
 #DL_DOWNLOADER_OPTION[12]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[12]="X86"
 DL_WINST_NAME[12]=Install7Jre32Exe
 
-DL_FILE[13]="jre7u${JRE7UVERSION}-x64.exe"
+DL_FILE[13]="jre7u${JRE7UVERSION}-b${JRE7BUILD}-x64.exe"
 DL_SOURCE[13]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=101469"
 #DL_SOURCE[13]="http://download.oracle.com/otn-pub/java/jdk/7u${JRE7UVERSION}-b${JRE7BUILD}/jre-7u${JRE7UVERSION}-windows-x64.exe"
 #DL_DOWNLOADER_OPTION[13]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[13]="X86"
 DL_WINST_NAME[13]=Install7Jre64Exe
 
-DL_FILE[14]="jre8u${JRE8UVERSION}-x86.exe"
-DL_SOURCE[14]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=103426"
+DL_FILE[14]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x86.exe"
+DL_SOURCE[14]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=104766"
 #DL_SOURCE[14]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-i586.exe"
 #DL_DOWNLOADER_OPTION[14]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[14]="X86"
 DL_WINST_NAME[14]=Install8Jre32Exe
 
-DL_FILE[15]="jre8u${JRE8UVERSION}-x64.exe"
-DL_SOURCE[15]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=103428"
+DL_FILE[15]="jre8u${JRE8UVERSION}-b${JRE8BUILD}-x64.exe"
+DL_SOURCE[15]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=104768"
 #DL_SOURCE[15]="http://download.oracle.com/otn-pub/java/jdk/8u${JRE8UVERSION}-b${JRE8BUILD}/jre-8u${JRE8UVERSION}-windows-x64.exe"
 #DL_DOWNLOADER_OPTION[15]="--no-cookies --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'"
 DL_ARCH[15]="X86"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 884f54c..ca19e1d 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -166,8 +166,8 @@ function create() {
   if [ "$JRE7UPDATE" = "1" ]; then
     mkdir -p $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/{x86,x64}
     mv -v $INST_DIR/CLIENT_DATA/Sereby_JRE7_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
-    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
-    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-b${JRE7BUILD}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JRE7UVERSION}-b${JRE7BUILD}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JRE7UVERSION}"
     patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='BUILD']/@value" "${JRE7VERSION}"
     sed -e 's!/s!/s REBOOT=Suppress!' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
@@ -178,8 +178,8 @@ function create() {
   
   if [ "$JRE8UPDATE" = "1" ]; then
     rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/*/jre.exe
-    mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x86/jre.exe
-    mv $INST_DIR/CLIENT_DATA/X86/jre8u${JRE8UVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/jre.exe
+    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}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/x64/jre.exe
     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='BUILD']/@value" "${JRE8VERSION}"
   fi
diff --git a/geos_one-general-runtimes_1.1.0.12-go1.7z.sha1sum b/geos_one-general-runtimes_1.1.0.12-go1.7z.sha1sum
deleted file mode 100644
index ff47cac..0000000
--- a/geos_one-general-runtimes_1.1.0.12-go1.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c48c5ee6794b1ac363147efd89a3fa894e0bbe59  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/geos_one-general-runtimes_1.1.0.12-go1.7z
diff --git a/geos_one-general-runtimes_1.1.0.13-go1.7z.sha1sum b/geos_one-general-runtimes_1.1.0.13-go1.7z.sha1sum
new file mode 100644
index 0000000..796eea0
--- /dev/null
+++ b/geos_one-general-runtimes_1.1.0.13-go1.7z.sha1sum
@@ -0,0 +1 @@
+3fb5c86b746b833deaedf00c13ccd63aa9b0f72f  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/geos_one-general-runtimes_1.1.0.13-go1.7z
diff --git a/jre7u75-x64.exe.sha1sum b/jre7u76-b13-x64.exe.sha1sum
similarity index 53%
rename from jre7u75-x64.exe.sha1sum
rename to jre7u76-b13-x64.exe.sha1sum
index 2d0da30..4251880 100644
--- a/jre7u75-x64.exe.sha1sum
+++ b/jre7u76-b13-x64.exe.sha1sum
@@ -1 +1 @@
-488492de778fc47f67a33c65ea922124279c20d4  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/jre7u75-x64.exe
+488492de778fc47f67a33c65ea922124279c20d4  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/jre7u76-b13-x64.exe
diff --git a/jre7u75-x86.exe.sha1sum b/jre7u76-b13-x86.exe.sha1sum
similarity index 53%
rename from jre7u75-x86.exe.sha1sum
rename to jre7u76-b13-x86.exe.sha1sum
index f023611..4bca3e3 100644
--- a/jre7u75-x86.exe.sha1sum
+++ b/jre7u76-b13-x86.exe.sha1sum
@@ -1 +1 @@
-cd5f2222c6a9db6adfb385eaaeff8f95ea32446f  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.8.1/X86/jre7u75-x86.exe
+cd5f2222c6a9db6adfb385eaaeff8f95ea32446f  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/jre7u76-b13-x86.exe
diff --git a/jre8u40-b28-x64.exe.sha1sum b/jre8u40-b28-x64.exe.sha1sum
new file mode 100644
index 0000000..71a17a9
--- /dev/null
+++ b/jre8u40-b28-x64.exe.sha1sum
@@ -0,0 +1 @@
+56aef75dd8452275d04d8b3098b3886c43adaf8f  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/jre8u40-b28-x64.exe
diff --git a/jre8u40-b28-x86.exe.sha1sum b/jre8u40-b28-x86.exe.sha1sum
new file mode 100644
index 0000000..1680023
--- /dev/null
+++ b/jre8u40-b28-x86.exe.sha1sum
@@ -0,0 +1 @@
+037a1df1df2ed13aed1e8a984ec66e0ba60fac8c  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/jre8u40-b28-x86.exe
diff --git a/jre8u40-x64.exe.sha1sum b/jre8u40-x64.exe.sha1sum
deleted file mode 100644
index 7d0163e..0000000
--- a/jre8u40-x64.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3034ee9474c8829cb9145f3ceadf4e4f8618b9f8  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.0.1/X86/jre8u40-x64.exe
diff --git a/jre8u40-x86.exe.sha1sum b/jre8u40-x86.exe.sha1sum
deleted file mode 100644
index 0ee99c4..0000000
--- a/jre8u40-x86.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c583ea81fe3cf6b06e2851f6805ec895226a0053  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.0.1/X86/jre8u40-x86.exe