diff --git a/base-java/Dockerfile b/base-java/Dockerfile
index c847fd6..fc69468 100644
--- a/base-java/Dockerfile
+++ b/base-java/Dockerfile
@@ -3,8 +3,6 @@ ARG BASE_TAG=latest
 FROM ${JITSI_REPO}/base:${BASE_TAG}
 
 RUN mkdir -p /usr/share/man/man1 && \
-    wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
-    echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
     apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
+    apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless && \
     apt-cleanup
diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile
index 62743a5..126d981 100644
--- a/jigasi/Dockerfile
+++ b/jigasi/Dockerfile
@@ -1,10 +1,16 @@
 ARG JITSI_REPO=jitsi
 ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base-java:${BASE_TAG}
+FROM ${JITSI_REPO}/base:${BASE_TAG}
 
 ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
 
-RUN apt-dpkg-wrap apt-get update && \
+# Jigasi doesn't yet work well with Java 11, let's ccontinue to use 8.
+
+RUN mkdir -p /usr/share/man/man1 && \
+    wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmour > /etc/apt/trusted.gpg.d/openjdk.gpg && \
+    echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
+    apt-dpkg-wrap apt-get update && \
+    apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
     apt-dpkg-wrap apt-get install -y jigasi jq && \
     apt-cleanup