diff --git a/cruise-control-jar/Dockerfile b/cruise-control-jar/Dockerfile
new file mode 100644
index 0000000..355331c
--- /dev/null
+++ b/cruise-control-jar/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine:3.8
+
+RUN apk add --no-cache curl
+
+ENV VERSION=2.0.17
+
+RUN curl -fsL -o /cruise-control-metrics-reporter.jar https://linkedin.jfrog.io/linkedin/cruise-control/com/linkedin/cruisecontrol/cruise-control-metrics-reporter/${VERSION}/cruise-control-metrics-reporter-${VERSION}.jar
+
+FROM busybox
+
+COPY --from=0 /cruise-control-metrics-reporter.jar /cruise-control-metrics-reporter.jar
diff --git a/initutils/Dockerfile b/initutils/Dockerfile
index e0cf94a..89a2214 100644
--- a/initutils/Dockerfile
+++ b/initutils/Dockerfile
@@ -1,7 +1,7 @@
 # same FROM as kafka-jre, to keep pull times down and to provide the same shell distro+version
-FROM debian:stretch-slim@sha256:ea42520331a55094b90f6f6663211d4f5a62c5781673935fe17a4dfced777029
+FROM debian:9.6-slim@sha256:f05c05a218b7a4a5fe979045b1c8e2a9ec3524e5611ebfdd0ef5b8040f9008fa
 
-ENV KUBERNETES_VERSION=1.9.6 KUBERNETES_CLIENT_SHA256=2b1ab65171bcd43a099d4f7d05d7804c737272270e83f633e1c14ceed9a99133
+ENV KUBERNETES_VERSION=1.12.3 KUBERNETES_CLIENT_SHA256=4a3baa259869f3647f0b440effb04ce3455c1026ddac7e51b6692a0ee05eab1e
 
 RUN set -ex; \
   export DEBIAN_FRONTEND=noninteractive; \
diff --git a/jdk-oracle-open/Dockerfile b/jdk-oracle-open/Dockerfile
index bd78cb0..f3ded9d 100644
--- a/jdk-oracle-open/Dockerfile
+++ b/jdk-oracle-open/Dockerfile
@@ -1,4 +1,6 @@
-FROM debian:stretch-slim@sha256:613efd414e9818dcef858201484a94603a548a0e04fd4356e77eb758aeb16124
+FROM debian:9.6-slim@sha256:f05c05a218b7a4a5fe979045b1c8e2a9ec3524e5611ebfdd0ef5b8040f9008fa
+
+# See https://jdk.java.net/11/
 
 RUN set -ex; \
   export DEBIAN_FRONTEND=noninteractive; \
@@ -9,17 +11,17 @@ RUN set -ex; \
   cd /usr/lib; \
   mkdir jvm; \
   cd jvm; \
-  curl -SLs -o jdk.tar.gz https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz; \
-  echo "c851df838a51af52517b74e3a4b251d90c54cf478a4ebed99e7285ef134c3435 jdk.tar.gz" | sha256sum -c -; \
+  curl -SLs -o jdk.tar.gz https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz; \
+  echo "7a6bb980b9c91c478421f865087ad2d69086a0583aeeb9e69204785e8e97dcfd jdk.tar.gz" | sha256sum -c -; \
   tar xvzf jdk.tar.gz; \
   rm jdk.tar.gz; \
+  mv jdk-11.0.1 jdk-11; \
   \
-  rm -v jdk-10/lib/src.zip; \
-  rm -r jdk-10/man/; \
+  rm -v jdk-11/lib/src.zip; \
   \
   apt-get purge -y --auto-remove $buildDeps; \
   rm -rf /var/lib/apt/lists/*; \
   rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt
 
-# Instead of: find /usr/lib/jvm/jdk-10/bin/ -executable -exec ln -s '{}' /usr/local/bin/
-ENV PATH="$PATH:/usr/lib/jvm/jdk-10/bin"
+# Instead of: find /usr/lib/jvm/jdk-11/bin/ -executable -exec ln -s '{}' /usr/local/bin/
+ENV PATH="$PATH:/usr/lib/jvm/jdk-11/bin"
diff --git a/kafka/Dockerfile b/kafka/Dockerfile
index e286ce5..88f674f 100644
--- a/kafka/Dockerfile
+++ b/kafka/Dockerfile
@@ -1,23 +1,29 @@
 # The only assumption we make about this FROM is that it has a JRE in path
-FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
+FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
 
-ENV KAFKA_VERSION=2.0.0 SCALA_VERSION=2.11
+ENV KAFKA_VERSION=2.1.0 SCALA_VERSION=2.12 RELEASE_MANAGER_KEY=BEED4F6CB9F77D0E
 
 RUN set -ex; \
   export DEBIAN_FRONTEND=noninteractive; \
   runDeps='netcat-openbsd'; \
-  buildDeps='curl ca-certificates'; \
+  buildDeps='curl ca-certificates gnupg dirmngr'; \
   apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \
   \
+  gpg --keyserver pgpkeys.mit.edu --recv-key $RELEASE_MANAGER_KEY; \
+  \
   SCALA_BINARY_VERSION=$(echo $SCALA_VERSION | cut -f 1-2 -d '.'); \
   mkdir -p /opt/kafka; \
-  curl -SLs "https://www-eu.apache.org/dist/kafka/$KAFKA_VERSION/kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz" | tar -xzf - --strip-components=1 -C /opt/kafka; \
+  curl -s   -o kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz.asc https://www.apache.org/dist/kafka/$KAFKA_VERSION/kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz.asc; \
+  curl -SLs -o kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz "https://www-eu.apache.org/dist/kafka/$KAFKA_VERSION/kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz"; \
+  gpg --verify kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz.asc kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz; \
+  tar xzf kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz --strip-components=1 -C /opt/kafka; \
+  rm kafka_$SCALA_BINARY_VERSION-$KAFKA_VERSION.tgz; \
   \
   rm -rf /opt/kafka/site-docs; \
   \
   apt-get purge -y --auto-remove $buildDeps; \
   rm -rf /var/lib/apt/lists/*; \
-  rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt
+  rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt /etc/ssl/certs /root/.gnupg
 
 WORKDIR /opt/kafka
 
diff --git a/kubectl-kafkacat/Dockerfile b/kubectl-kafkacat/Dockerfile
index 9d3a11a..039a4ba 100644
--- a/kubectl-kafkacat/Dockerfile
+++ b/kubectl-kafkacat/Dockerfile
@@ -1,7 +1,6 @@
-# Select digest to have the same FROM as kafka-jre
 FROM solsson/kafkacat@sha256:be85344e8932d5dd4492fb37122be0bb9e65e560fe960058e0460ec13eea6547
 
-ENV KUBERNETES_VERSION=1.8.5 KUBERNETES_CLIENTS_SHA256=c32b6f90f1e8a15451f0d412d6d1f3db28948d2f7d76d4e28d83c11e1eb25f20
+ENV KUBERNETES_VERSION=1.12.3 KUBERNETES_CLIENT_SHA256=4a3baa259869f3647f0b440effb04ce3455c1026ddac7e51b6692a0ee05eab1e
 
 RUN set -ex; \
   export DEBIAN_FRONTEND=noninteractive; \
@@ -11,7 +10,7 @@ RUN set -ex; \
   rm -rf /var/lib/apt/lists/*; \
   \
   curl -sLS -o k.tar.gz -k https://dl.k8s.io/v${KUBERNETES_VERSION}/kubernetes-client-linux-amd64.tar.gz; \
-  echo "$KUBERNETES_CLIENTS_SHA256  k.tar.gz" | sha256sum -c; \
+  echo "$KUBERNETES_CLIENT_SHA256  k.tar.gz" | sha256sum -c; \
   tar -xvzf k.tar.gz -C /usr/local/bin/ --strip-components=3 kubernetes/client/bin/kubectl; \
   rm k.tar.gz; \
   \
diff --git a/manager/Dockerfile b/manager/Dockerfile
index f907f25..fcac82a 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
+FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
 
 ENV KAFKA_MANAGER_VERSION=1.3.3.18
 
diff --git a/monitor/Dockerfile b/monitor/Dockerfile
index 27b6438..f2ce84a 100644
--- a/monitor/Dockerfile
+++ b/monitor/Dockerfile
@@ -1,4 +1,4 @@
-FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
+FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
 
 ENV KAFKA_MONITOR_REPO=https://github.com/linkedin/kafka-monitor \
     KAFKA_MONITOR_VERSION=2.0.0 \
@@ -11,9 +11,9 @@ RUN set -ex; \
   apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \
   \
   cd /opt; \
-  GRADLE_VERSION=4.3.1 PATH=$PATH:$(pwd)/gradle-$GRADLE_VERSION/bin; \
+  GRADLE_VERSION=4.10.2 PATH=$PATH:$(pwd)/gradle-$GRADLE_VERSION/bin; \
   curl -SLs -o gradle-$GRADLE_VERSION-bin.zip https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip; \
-  echo "15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7  gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -; \
+  echo "b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29  gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -; \
   unzip gradle-$GRADLE_VERSION-bin.zip; \
   rm gradle-$GRADLE_VERSION-bin.zip; \
   gradle -v; \
@@ -25,7 +25,8 @@ RUN set -ex; \
   rm monitor.tar.gz; \
   \
   cd /opt/kafka-monitor; \
-  ./gradlew jar; \
+  rm gradlew; \
+  gradle --no-daemon jar; \
   \
   sed -i 's/localhost:2181/zookeeper:2181/' config/kafka-monitor.properties; \
   sed -i 's/localhost:9092/bootstrap:9092/' config/kafka-monitor.properties; \
diff --git a/prometheus-jmx-exporter/Dockerfile b/prometheus-jmx-exporter/Dockerfile
index ed2bb78..0f8702f 100644
--- a/prometheus-jmx-exporter/Dockerfile
+++ b/prometheus-jmx-exporter/Dockerfile
@@ -1,4 +1,4 @@
-FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
+FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
 
 ENV EXPORTER_VERSION=parent-0.3.1
 ENV EXPORTER_REPO=github.com/prometheus/jmx_exporter