diff --git a/7/80b15/jdk-dcevm/Dockerfile b/7/80b15/jdk-dcevm/standard/Dockerfile
similarity index 77%
rename from 7/80b15/jdk-dcevm/Dockerfile
rename to 7/80b15/jdk-dcevm/standard/Dockerfile
index e694f855..90aed22f 100644
--- a/7/80b15/jdk-dcevm/Dockerfile
+++ b/7/80b15/jdk-dcevm/standard/Dockerfile
@@ -22,16 +22,16 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /tmp/dcevm && \
-    curl -L -o /tmp/dcevm/DCEVM-full-7u79-installer.jar "https://github.com/dcevm/dcevm/releases/download/full-jdk7u79%2B8/DCEVM-full-7u79-installer.jar" && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/DCEVM-full-7u79-installer.jar "https://github.com/dcevm/dcevm/releases/download/full-jdk7u79%2B8/DCEVM-full-7u79-installer.jar" && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
@@ -39,11 +39,12 @@ RUN apk upgrade --update && \
     unzip DCEVM-full-7u79-installer.jar && \
     mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
     cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/7/80b15/jdk-dcevm/unlimited/Dockerfile b/7/80b15/jdk-dcevm/unlimited/Dockerfile
new file mode 100644
index 00000000..901ad847
--- /dev/null
+++ b/7/80b15/jdk-dcevm/unlimited/Dockerfile
@@ -0,0 +1,87 @@
+# AlpineLinux with a glibc-2.23 and Oracle Java 7
+FROM alpine:3.4
+
+MAINTAINER Anastas Dancha <anapsix@random.io>
+# thanks to Vladimir Krivosheev <develar@gmail.com> aka @develar for smaller image
+# and Victor Palma <palma.victor@gmail.com> aka @devx for pointing it out
+
+# Java Version and other ENV
+ENV JAVA_VERSION_MAJOR=7 \
+    JAVA_VERSION_MINOR=80 \
+    JAVA_VERSION_BUILD=15 \
+    JAVA_PACKAGE=jdk \
+    JAVA_JCE=unlimited \
+    JAVA_HOME=/opt/jdk \
+    PATH=${PATH}:/opt/jdk/bin \
+    GLIBC_VERSION=2.23-r3 \
+    LANG=C.UTF-8
+
+# do all in one step
+RUN apk upgrade --update && \
+    apk add --update libstdc++ curl ca-certificates bash && \
+    for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
+    apk add --allow-untrusted /tmp/*.apk && \
+    rm -v /tmp/*.apk && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
+    echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
+    /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
+    mkdir /tmp/dcevm && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/DCEVM-full-7u79-installer.jar "https://github.com/dcevm/dcevm/releases/download/full-jdk7u79%2B8/DCEVM-full-7u79-installer.jar" && \
+    mkdir /opt && \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+      http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
+    gunzip /tmp/java.tar.gz && \
+    tar -C /opt -xf /tmp/java.tar && \
+    ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
+    cd /tmp/dcevm && \
+    unzip DCEVM-full-7u79-installer.jar && \
+    mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
+    cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
+    fi && \
+    sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
+    apk del curl glibc-i18n && \
+    rm -rf /opt/jdk/*src.zip \
+           /opt/jdk/lib/missioncontrol \
+           /opt/jdk/lib/visualvm \
+           /opt/jdk/lib/*javafx* \
+           /opt/jdk/jre/plugin \
+           /opt/jdk/jre/bin/javaws \
+           /opt/jdk/jre/bin/jjs \
+           /opt/jdk/jre/bin/keytool \
+           /opt/jdk/jre/bin/orbd \
+           /opt/jdk/jre/bin/pack200 \
+           /opt/jdk/jre/bin/policytool \
+           /opt/jdk/jre/bin/rmid \
+           /opt/jdk/jre/bin/rmiregistry \
+           /opt/jdk/jre/bin/servertool \
+           /opt/jdk/jre/bin/tnameserv \
+           /opt/jdk/jre/bin/unpack200 \
+           /opt/jdk/jre/lib/javaws.jar \
+           /opt/jdk/jre/lib/deploy* \
+           /opt/jdk/jre/lib/desktop \
+           /opt/jdk/jre/lib/*javafx* \
+           /opt/jdk/jre/lib/*jfx* \
+           /opt/jdk/jre/lib/amd64/libdecora_sse.so \
+           /opt/jdk/jre/lib/amd64/libprism_*.so \
+           /opt/jdk/jre/lib/amd64/libfxplugins.so \
+           /opt/jdk/jre/lib/amd64/libglass.so \
+           /opt/jdk/jre/lib/amd64/libgstreamer-lite.so \
+           /opt/jdk/jre/lib/amd64/libjavafx*.so \
+           /opt/jdk/jre/lib/amd64/libjfx*.so \
+           /opt/jdk/jre/lib/ext/jfxrt.jar \
+           /opt/jdk/jre/lib/ext/nashorn.jar \
+           /opt/jdk/jre/lib/oblique-fonts \
+           /opt/jdk/jre/lib/plugin.jar \
+           /tmp/* /var/cache/apk/* && \
+    echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
+
+
+# EOF
diff --git a/7/80b15/jdk/Dockerfile b/7/80b15/jdk/standard/Dockerfile
similarity index 81%
rename from 7/80b15/jdk/Dockerfile
rename to 7/80b15/jdk/standard/Dockerfile
index 0dc376e3..81dcc9e7 100644
--- a/7/80b15/jdk/Dockerfile
+++ b/7/80b15/jdk/standard/Dockerfile
@@ -22,20 +22,22 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" >&2 && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/7/80b15/jdk/unlimited/Dockerfile b/7/80b15/jdk/unlimited/Dockerfile
new file mode 100644
index 00000000..de292343
--- /dev/null
+++ b/7/80b15/jdk/unlimited/Dockerfile
@@ -0,0 +1,79 @@
+# AlpineLinux with a glibc-2.23 and Oracle Java 7
+FROM alpine:3.4
+
+MAINTAINER Anastas Dancha <anapsix@random.io>
+# thanks to Vladimir Krivosheev <develar@gmail.com> aka @develar for smaller image
+# and Victor Palma <palma.victor@gmail.com> aka @devx for pointing it out
+
+# Java Version and other ENV
+ENV JAVA_VERSION_MAJOR=7 \
+    JAVA_VERSION_MINOR=80 \
+    JAVA_VERSION_BUILD=15 \
+    JAVA_PACKAGE=jdk \
+    JAVA_JCE=unlimited \
+    JAVA_HOME=/opt/jdk \
+    PATH=${PATH}:/opt/jdk/bin \
+    GLIBC_VERSION=2.23-r3 \
+    LANG=C.UTF-8
+
+# do all in one step
+RUN apk upgrade --update && \
+    apk add --update libstdc++ curl ca-certificates bash && \
+    for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
+    apk add --allow-untrusted /tmp/*.apk && \
+    rm -v /tmp/*.apk && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
+    echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
+    /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
+    mkdir /opt && \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+      http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
+    gunzip /tmp/java.tar.gz && \
+    tar -C /opt -xf /tmp/java.tar && \
+    ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
+    fi && \
+    sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
+    apk del curl glibc-i18n && \
+    rm -rf /opt/jdk/*src.zip \
+           /opt/jdk/lib/missioncontrol \
+           /opt/jdk/lib/visualvm \
+           /opt/jdk/lib/*javafx* \
+           /opt/jdk/jre/plugin \
+           /opt/jdk/jre/bin/javaws \
+           /opt/jdk/jre/bin/jjs \
+           /opt/jdk/jre/bin/keytool \
+           /opt/jdk/jre/bin/orbd \
+           /opt/jdk/jre/bin/pack200 \
+           /opt/jdk/jre/bin/policytool \
+           /opt/jdk/jre/bin/rmid \
+           /opt/jdk/jre/bin/rmiregistry \
+           /opt/jdk/jre/bin/servertool \
+           /opt/jdk/jre/bin/tnameserv \
+           /opt/jdk/jre/bin/unpack200 \
+           /opt/jdk/jre/lib/javaws.jar \
+           /opt/jdk/jre/lib/deploy* \
+           /opt/jdk/jre/lib/desktop \
+           /opt/jdk/jre/lib/*javafx* \
+           /opt/jdk/jre/lib/*jfx* \
+           /opt/jdk/jre/lib/amd64/libdecora_sse.so \
+           /opt/jdk/jre/lib/amd64/libprism_*.so \
+           /opt/jdk/jre/lib/amd64/libfxplugins.so \
+           /opt/jdk/jre/lib/amd64/libglass.so \
+           /opt/jdk/jre/lib/amd64/libgstreamer-lite.so \
+           /opt/jdk/jre/lib/amd64/libjavafx*.so \
+           /opt/jdk/jre/lib/amd64/libjfx*.so \
+           /opt/jdk/jre/lib/ext/jfxrt.jar \
+           /opt/jdk/jre/lib/ext/nashorn.jar \
+           /opt/jdk/jre/lib/oblique-fonts \
+           /opt/jdk/jre/lib/plugin.jar \
+           /tmp/* /var/cache/apk/* && \
+    echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
+
+# EOF
diff --git a/7/80b15/server-jre/Dockerfile b/7/80b15/server-jre/standard/Dockerfile
similarity index 79%
rename from 7/80b15/server-jre/Dockerfile
rename to 7/80b15/server-jre/standard/Dockerfile
index f414039a..69c15f50 100644
--- a/7/80b15/server-jre/Dockerfile
+++ b/7/80b15/server-jre/standard/Dockerfile
@@ -22,24 +22,24 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
     find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
     cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/7/80b15/server-jre/unlimited/Dockerfile b/7/80b15/server-jre/unlimited/Dockerfile
new file mode 100644
index 00000000..4e1895dd
--- /dev/null
+++ b/7/80b15/server-jre/unlimited/Dockerfile
@@ -0,0 +1,77 @@
+# AlpineLinux with a glibc-2.23 and Oracle Java 7
+FROM alpine:3.4
+
+MAINTAINER Anastas Dancha <anapsix@random.io>
+# thanks to Vladimir Krivosheev <develar@gmail.com> aka @develar for smaller image
+# and Victor Palma <palma.victor@gmail.com> aka @devx for pointing it out
+
+# Java Version and other ENV
+ENV JAVA_VERSION_MAJOR=7 \
+    JAVA_VERSION_MINOR=80 \
+    JAVA_VERSION_BUILD=15 \
+    JAVA_PACKAGE=server-jre \
+    JAVA_JCE=unlimited \
+    JAVA_HOME=/opt/jdk \
+    PATH=${PATH}:/opt/jdk/bin \
+    GLIBC_VERSION=2.23-r3 \
+    LANG=C.UTF-8
+
+# do all in one step
+RUN apk upgrade --update && \
+    apk add --update libstdc++ curl ca-certificates bash && \
+    for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
+    apk add --allow-untrusted /tmp/*.apk && \
+    rm -v /tmp/*.apk && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
+    echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
+    /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
+    mkdir /opt && \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+      http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
+    gunzip /tmp/java.tar.gz && \
+    tar -C /opt -xf /tmp/java.tar && \
+    ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
+    find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
+    cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
+    fi && \
+    sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
+    apk del curl glibc-i18n && \
+    rm -rf /opt/jdk/jre/plugin \
+           /opt/jdk/jre/bin/javaws \
+           /opt/jdk/jre/bin/jjs \
+           /opt/jdk/jre/bin/keytool \
+           /opt/jdk/jre/bin/orbd \
+           /opt/jdk/jre/bin/pack200 \
+           /opt/jdk/jre/bin/policytool \
+           /opt/jdk/jre/bin/rmid \
+           /opt/jdk/jre/bin/rmiregistry \
+           /opt/jdk/jre/bin/servertool \
+           /opt/jdk/jre/bin/tnameserv \
+           /opt/jdk/jre/bin/unpack200 \
+           /opt/jdk/jre/lib/javaws.jar \
+           /opt/jdk/jre/lib/deploy* \
+           /opt/jdk/jre/lib/desktop \
+           /opt/jdk/jre/lib/*javafx* \
+           /opt/jdk/jre/lib/*jfx* \
+           /opt/jdk/jre/lib/amd64/libdecora_sse.so \
+           /opt/jdk/jre/lib/amd64/libprism_*.so \
+           /opt/jdk/jre/lib/amd64/libfxplugins.so \
+           /opt/jdk/jre/lib/amd64/libglass.so \
+           /opt/jdk/jre/lib/amd64/libgstreamer-lite.so \
+           /opt/jdk/jre/lib/amd64/libjavafx*.so \
+           /opt/jdk/jre/lib/amd64/libjfx*.so \
+           /opt/jdk/jre/lib/ext/jfxrt.jar \
+           /opt/jdk/jre/lib/ext/nashorn.jar \
+           /opt/jdk/jre/lib/oblique-fonts \
+           /opt/jdk/jre/lib/plugin.jar \
+           /tmp/* /var/cache/apk/* && \
+    echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
+
+# EOF
diff --git a/8/102b14/jdk-dcevm/standard/Dockerfile b/8/102b14/jdk-dcevm/standard/Dockerfile
index c2384500..d93c58ac 100644
--- a/8/102b14/jdk-dcevm/standard/Dockerfile
+++ b/8/102b14/jdk-dcevm/standard/Dockerfile
@@ -22,16 +22,16 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /tmp/dcevm && \
-    curl -L -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
@@ -39,11 +39,12 @@ RUN apk upgrade --update && \
     unzip DCEVM-light-8u74-installer.jar && \
     mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
     cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/102b14/jdk-dcevm/unlimited/Dockerfile b/8/102b14/jdk-dcevm/unlimited/Dockerfile
index 057de85a..2af7ff26 100644
--- a/8/102b14/jdk-dcevm/unlimited/Dockerfile
+++ b/8/102b14/jdk-dcevm/unlimited/Dockerfile
@@ -22,16 +22,16 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /tmp/dcevm && \
-    curl -L -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
@@ -39,11 +39,12 @@ RUN apk upgrade --update && \
     unzip DCEVM-light-8u74-installer.jar && \
     mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
     cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/102b14/jdk/standard/Dockerfile b/8/102b14/jdk/standard/Dockerfile
index cb081026..6500d8f2 100644
--- a/8/102b14/jdk/standard/Dockerfile
+++ b/8/102b14/jdk/standard/Dockerfile
@@ -22,20 +22,22 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" >&2 && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/102b14/jdk/unlimited/Dockerfile b/8/102b14/jdk/unlimited/Dockerfile
index d3bf39f1..fe0081f2 100644
--- a/8/102b14/jdk/unlimited/Dockerfile
+++ b/8/102b14/jdk/unlimited/Dockerfile
@@ -22,20 +22,22 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" >&2 && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/102b14/server-jre/standard/Dockerfile b/8/102b14/server-jre/standard/Dockerfile
index 1edda33e..9d724194 100644
--- a/8/102b14/server-jre/standard/Dockerfile
+++ b/8/102b14/server-jre/standard/Dockerfile
@@ -22,24 +22,24 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
     find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
     cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/102b14/server-jre/unlimited/Dockerfile b/8/102b14/server-jre/unlimited/Dockerfile
index 5697f225..b1b6790f 100644
--- a/8/102b14/server-jre/unlimited/Dockerfile
+++ b/8/102b14/server-jre/unlimited/Dockerfile
@@ -22,24 +22,24 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
     find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
     cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/92b14/jdk-dcevm/standard/Dockerfile b/8/92b14/jdk-dcevm/standard/Dockerfile
index 126f244b..d83f03ef 100644
--- a/8/92b14/jdk-dcevm/standard/Dockerfile
+++ b/8/92b14/jdk-dcevm/standard/Dockerfile
@@ -22,16 +22,16 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /tmp/dcevm && \
-    curl -L -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
@@ -39,11 +39,12 @@ RUN apk upgrade --update && \
     unzip DCEVM-light-8u74-installer.jar && \
     mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
     cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/92b14/jdk-dcevm/unlimited/Dockerfile b/8/92b14/jdk-dcevm/unlimited/Dockerfile
index 2f96e8e6..412e66c6 100644
--- a/8/92b14/jdk-dcevm/unlimited/Dockerfile
+++ b/8/92b14/jdk-dcevm/unlimited/Dockerfile
@@ -22,16 +22,16 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /tmp/dcevm && \
-    curl -L -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/DCEVM-light-8u74-installer.jar "https://github.com/dcevm/dcevm/releases/download/light-jdk8u74%2B1/DCEVM-light-8u74-installer.jar" && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
@@ -39,11 +39,12 @@ RUN apk upgrade --update && \
     unzip DCEVM-light-8u74-installer.jar && \
     mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
     cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/92b14/jdk/standard/Dockerfile b/8/92b14/jdk/standard/Dockerfile
index 35ddbf63..2667d9e7 100644
--- a/8/92b14/jdk/standard/Dockerfile
+++ b/8/92b14/jdk/standard/Dockerfile
@@ -22,20 +22,22 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" >&2 && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/92b14/jdk/unlimited/Dockerfile b/8/92b14/jdk/unlimited/Dockerfile
index 1f2c74fd..6a7c34ad 100644
--- a/8/92b14/jdk/unlimited/Dockerfile
+++ b/8/92b14/jdk/unlimited/Dockerfile
@@ -22,20 +22,22 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" >&2 && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/92b14/server-jre/standard/Dockerfile b/8/92b14/server-jre/standard/Dockerfile
index 9062c144..d301b1a9 100644
--- a/8/92b14/server-jre/standard/Dockerfile
+++ b/8/92b14/server-jre/standard/Dockerfile
@@ -22,24 +22,24 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
     find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
     cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/8/92b14/server-jre/unlimited/Dockerfile b/8/92b14/server-jre/unlimited/Dockerfile
index a19ee75d..eacef3f9 100644
--- a/8/92b14/server-jre/unlimited/Dockerfile
+++ b/8/92b14/server-jre/unlimited/Dockerfile
@@ -22,24 +22,24 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
     find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
     cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/Dockerfile.jdk-dcevm.tpl b/Dockerfile.jdk-dcevm.tpl
index d613e0e8..67852154 100644
--- a/Dockerfile.jdk-dcevm.tpl
+++ b/Dockerfile.jdk-dcevm.tpl
@@ -22,16 +22,16 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /tmp/dcevm && \
-    curl -L -o /tmp/dcevm/%DCEVM_INSTALLER_NAME% "%DCEVM_INSTALLER_URL%" && \
+    echo "Downloading and Installing DCEVM" && \
+    curl -jkL# -o /tmp/dcevm/%DCEVM_INSTALLER_NAME% "%DCEVM_INSTALLER_URL%" && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
@@ -39,11 +39,12 @@ RUN apk upgrade --update && \
     unzip %DCEVM_INSTALLER_NAME% && \
     mkdir -p /opt/jdk/jre/lib/amd64/dcevm && \
     cp linux_amd64_compiler2/product/libjvm.so /opt/jdk/jre/lib/amd64/dcevm/libjvm.so && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/Dockerfile.jdk.tpl b/Dockerfile.jdk.tpl
index ff4a4b4d..9e2a18c8 100644
--- a/Dockerfile.jdk.tpl
+++ b/Dockerfile.jdk.tpl
@@ -22,20 +22,22 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" >&2 && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/Dockerfile.server-jre.tpl b/Dockerfile.server-jre.tpl
index 8155bba5..3fb99ff2 100644
--- a/Dockerfile.server-jre.tpl
+++ b/Dockerfile.server-jre.tpl
@@ -22,24 +22,24 @@ RUN apk upgrade --update && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
-    ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
+    ( /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=C.UTF-8" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
     mkdir /opt && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
+    echo "Downloading and Installing JAVA" && \
+    curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
       http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
-    curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-      http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
     gunzip /tmp/java.tar.gz && \
     tar -C /opt -xf /tmp/java.tar && \
     ln -s /opt/jdk1.${JAVA_VERSION_MAJOR}.0_${JAVA_VERSION_MINOR} /opt/jdk && \
     find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf && \
     cd /opt/jdk/ && ln -s ./jre/bin ./bin && \
-    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Installing Unlimited JCE policy" && \
-      curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip \
-        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cd /tmp && unzip /tmp/jce_policy-${JAVA_VERSION_MAJOR}.zip && \
-      cp -v /tmp/UnlimitedJCEPolicyJDK8/*.jar /opt/jdk/jre/lib/security/; \
+    if [ "${JAVA_JCE}" == "unlimited" ]; then echo "Downloading and Installing Unlimited JCE policy" && \
+      [ ${JAVA_VERSION_MAJOR} -eq 7 ] && JCE_FILENAME="UnlimitedJCEPolicyJDK${JAVA_VERSION_MAJOR}.zip" || JCE_FILENAME="jce_policy-${JAVA_VERSION_MAJOR}.zip" && \
+      curl -jkL#H "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/${JCE_FILENAME} \
+        http://download.oracle.com/otn-pub/java/jce/${JAVA_VERSION_MAJOR}/${JCE_FILENAME} && \
+      cd /tmp && unzip /tmp/${JCE_FILENAME} && \
+      cp -v /tmp/UnlimitedJCEPolicy*/*.jar /opt/jdk/jre/lib/security/; \
     fi && \
     sed -i s/#networkaddress.cache.ttl=-1/networkaddress.cache.ttl=30/ $JAVA_HOME/jre/lib/security/java.security && \
     apk del curl glibc-i18n && \
diff --git a/generate_dockerfiles.sh b/generate_dockerfiles.sh
index a88a6e78..969551bb 100755
--- a/generate_dockerfiles.sh
+++ b/generate_dockerfiles.sh
@@ -63,16 +63,11 @@ for version in ${JAVA_VERSIONS[@]}; do
   fi
 
   for JVM_FLAVOR in ${JVM_FLAVORS[@]}; do
-    
-    if [ "${JVM_MAJOR}" -eq "8" ]; then
-      for JAVA_JCE in ${JCE_FLAVORS[@]}; do
-        gen_dockerfile $JVM_FLAVOR
-      done
-    else
+    for JAVA_JCE in ${JCE_FLAVORS[@]}; do
       gen_dockerfile $JVM_FLAVOR
-    fi
-
+    done
   done
+
 done
 
 echo -n "Generating symlinks for current versions.. "