diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile
index 8b4c007..5aea861 100644
--- a/jigasi/Dockerfile
+++ b/jigasi/Dockerfile
@@ -1,6 +1,6 @@
 ARG JITSI_REPO=jitsi
 ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base:${BASE_TAG}
+FROM ${JITSI_REPO}/base-java:${BASE_TAG}
 
 LABEL org.opencontainers.image.title="Jitsi Gateway to SIP (jigasi)"
 LABEL org.opencontainers.image.description="Server-side application that allows regular SIP clients to join conferences."
@@ -10,13 +10,7 @@ LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
 ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
 
-# 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/ bullseye 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 && \
+RUN apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y jigasi jq && \
     apt-cleanup