diff --git a/Dockerfile b/Dockerfile
index cee7643..90446a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim-bullseye
+FROM eclipse-temurin:21
 
 ENV OPENFIRE_VERSION=4.9.2 \
     OPENFIRE_USER=openfire \
@@ -6,7 +6,7 @@ ENV OPENFIRE_VERSION=4.9.2 \
     OPENFIRE_LOG_DIR=/var/log/openfire
 
 RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y sudo wget fontconfig libfreetype6 \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y sudo wget fontconfig libfreetype6 adduser \
  && echo "Downloading openfire_${OPENFIRE_VERSION}_all.deb ..." \
  && wget --no-verbose "http://download.igniterealtime.org/openfire/openfire_${OPENFIRE_VERSION}_all.deb" -O /tmp/openfire_${OPENFIRE_VERSION}_all.deb \
  && dpkg -i --force-depends /tmp/openfire_${OPENFIRE_VERSION}_all.deb \
diff --git a/entrypoint.sh b/entrypoint.sh
index 777b25f..14dd90f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -62,7 +62,7 @@ initialize_log_dir
 
 # default behaviour is to launch openfire
 if [[ -z ${1} ]]; then
-  exec start-stop-daemon --start --chuid "${OPENFIRE_USER}:${OPENFIRE_USER}" --exec /usr/bin/java -- \
+  exec start-stop-daemon --start --chuid "${OPENFIRE_USER}:${OPENFIRE_USER}" --exec ${JAVA_HOME}/bin/java -- \
     -server \
     -Dlog4j.configurationFile="${OPENFIRE_DATA_DIR}/conf/log4j2.xml" \
     -DopenfireHome=/usr/share/openfire \