diff --git a/additional_container_files/bin/install_oracle_jdk.sh b/additional_container_files/bin/install_oracle_jdk.sh
index d53df31..855f823 100755
--- a/additional_container_files/bin/install_oracle_jdk.sh
+++ b/additional_container_files/bin/install_oracle_jdk.sh
@@ -4,13 +4,14 @@
 
 # Uncomment all the following lines to download the JDK to your Shibboleth IDP image.  By uncommenting these lines, you agree to the Oracle Binary Code License Agreement for Java SE (http://www.oracle.com/technetwork/java/javase/terms/license/index.html)
 
-JAVA_VERSION=7u79
-BUILD_VERSION=b15
-JAVA_HOME=/usr/java/latest
+ENV JAVA_VERSION=8u152
+ENV BUILD_VERSION=b16
+ENV JAVA_BUNDLE_ID=aa0333dd3019491ca4f6ddbe78cdb6d0
 
-wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-7-linux-x64.rpm && \
-    yum -y install /tmp/jdk-7-linux-x64.rpm && \
-    rm -f /tmp/jdk-7-linux-x64.rpm && \
+# Install JAVA stuff
+RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$JAVA_BUNDLE_ID/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-8-linux-x64.rpm && \
+    yum -y install /tmp/jdk-8-linux-x64.rpm && \
+    rm -f /tmp/jdk-8-linux-x64.rpm && \
     alternatives --install /usr/bin/java jar $JAVA_HOME/bin/java 200000 && \
     alternatives --install /usr/bin/javaws javaws $JAVA_HOME/bin/javaws 200000 && \
-    alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 200000
\ No newline at end of file
+    alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 200000