diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/Dockerfile b/Dockerfile
index bc4d2b0..edaa8f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,24 @@
-ARG metabase_repo=metabase
-ARG metabase_version=latest
-FROM metabase/${metabase_repo}:${metabase_version} as metabase
-
-# From https://github.com/metabase/metabase/issues/13119#issuecomment-1000350647
-
-FROM ubuntu:22.04
+FROM adoptopenjdk/openjdk11:debianslim-jre
 
 ENV FC_LANG en-US LC_CTYPE en_US.UTF-8
 
 # dependencies
-RUN apt-get update -yq && apt-get install -yq bash fonts-dejavu-core fonts-dejavu-extra fontconfig curl openjdk-11-jre-headless && \
+RUN apt-get update -yq && apt-get install -yq bash ttf-dejavu fontconfig curl openjdk-11-jre-headless && \
     apt-get clean && \
     rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
     mkdir -p /app/certs && \
     curl https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem -o /app/certs/rds-combined-ca-bundle.pem  && \
-    keytool -noprompt -import -trustcacerts -alias aws-rds -file /app/certs/rds-combined-ca-bundle.pem -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit && \
+    /opt/java/openjdk/bin/keytool -noprompt -import -trustcacerts -alias aws-rds -file /app/certs/rds-combined-ca-bundle.pem -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit && \
     curl https://cacerts.digicert.com/DigiCertGlobalRootG2.crt.pem -o /app/certs/DigiCertGlobalRootG2.crt.pem  && \
-    keytool -noprompt -import -trustcacerts -alias azure-cert -file /app/certs/DigiCertGlobalRootG2.crt.pem -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit && \
+    /opt/java/openjdk/bin/keytool -noprompt -import -trustcacerts -alias azure-cert -file /app/certs/DigiCertGlobalRootG2.crt.pem -keystore /etc/ssl/certs/java/cacerts -keypass changeit -storepass changeit && \
     mkdir -p /plugins && chmod a+rwx /plugins && \
     useradd --shell /bin/bash metabase
 
-
-WORKDIR /app
 USER metabase
+WORKDIR /app
 
 # copy app from the offical image
-COPY --from=metabase --chown=metabase /app /app
+COPY --from=metabase/metabase:latest /app /app
 
 # expose our default runtime port
 EXPOSE 3000