diff --git a/openliberty-kernel-dev/Dockerfile b/openliberty-kernel-dev/Dockerfile
index 2890db7..4150473 100644
--- a/openliberty-kernel-dev/Dockerfile
+++ b/openliberty-kernel-dev/Dockerfile
@@ -1,18 +1,16 @@
 FROM airhacks/java
 LABEL maintainer="Adam Bien, adam-bien.com" description="OpenLiberty Kernel Development Builds"
-ENV RELEASE 2017-12-10_0757
-ENV VERSION 17.0.0.4-201712100749
-ENV INSTALL_DIR /opt/
+ENV RELEASE 2018-07-07_1412
+ENV VERSION 20180707-1300
+ENV INSTALL_DIR /opt
 
 # Download OpenLiberty
-ENV OPENLIBERTY_HOME ${INSTALL_DIR}/openliberty-${VERSION}
-ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/standalone/deployments/
-RUN curl -O https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly//${RELEASE}/openliberty-all-${VERSION}.zip \
-    && unzip openliberty-all-${VERSION}.zip -d ${INSTALL_DIR} \
+ADD https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/${RELEASE}/openliberty-all-${VERSION}.zip .
+RUN unzip openliberty-all-${VERSION}.zip -d ${INSTALL_DIR} \
     && rm openliberty-all-${VERSION}.zip
-ENV CONFIG /opt/wlp/usr/servers/defaultServer/
+
+ENV OPENLIBERTY_HOME ${INSTALL_DIR}/wlp/usr/servers/defaultServer
+ENV CONFIG ${OPENLIBERTY_HOME}
+ENV DEPLOYMENT_DIR ${OPENLIBERTY_HOME}/dropins
 EXPOSE 9080 9443
 ENTRYPOINT /opt/wlp/bin/server run defaultServer
-
-
-
diff --git a/openliberty-kernel/Dockerfile b/openliberty-kernel/Dockerfile
index 8d53f2b..c12d459 100644
--- a/openliberty-kernel/Dockerfile
+++ b/openliberty-kernel/Dockerfile
@@ -1,7 +1,7 @@
 FROM airhacks/java
 LABEL maintainer="Tobias N. Sasse, @tnsasse and Adam Bien, adam-bien.com" description="OpenLiberty Kernel"
-ENV RELEASE 2017-09-27_1951
-ENV VERSION 17.0.0.3
+ENV RELEASE 2018-06-19_0502
+ENV VERSION 18.0.0.2
 ENV INSTALL_DIR /opt/ibm
 
 # Download OpenLiberty
diff --git a/payara-micro/Dockerfile b/payara-micro/Dockerfile
index 1f132e4..8fd8d83 100644
--- a/payara-micro/Dockerfile
+++ b/payara-micro/Dockerfile
@@ -1,10 +1,10 @@
 FROM airhacks/java
 MAINTAINER Adam Bien, adam-bien.com
-ENV PAYARA_ARCHIVE payaramicro41
+ENV PAYARA_ARCHIVE payara-micro-5.182
 ENV INSTALL_DIR /opt
-RUN curl -o ${INSTALL_DIR}/${PAYARA_ARCHIVE}.jar -L "http://info.payara.fish/cs/c/?cta_guid=21e00628-5d9e-400a-9805-1fc99fe0de87&placement_guid=0c1037e0-adaf-4401-b888-05088602db6a&portal_id=334594&redirect_url=APefjpFVsQB_htu3NVKna4zRjs_tCLoARwgBizSGCLsVswTfkZOF31FUJjd72xy37zAEH_s6iGa44DKv_MGBdW13uPEDWWEbDt9E8smFH24YTNNbBsGIGWM"
 ENV PAYARA_HOME ${INSTALL_DIR}
 ENV DEPLOYMENT_DIR ${PAYARA_HOME}
+ADD "https://cms2.hubspot.com/ctas/v2/public/cs/c/?cta_guid=21e00628-5d9e-400a-9805-1fc99fe0de87&placement_guid=0c1037e0-adaf-4401-b888-05088602db6a" ${INSTALL_DIR}/${PAYARA_ARCHIVE}.jar
 ENTRYPOINT java -jar ${PAYARA_ARCHIVE}.jar --deploy ${ARCHIVE_NAME}
 WORKDIR ${INSTALL_DIR}
-EXPOSE 8080 5900
\ No newline at end of file
+EXPOSE 8080 5900