diff --git a/Dockerfile b/Dockerfile
index e79f2f40..6fe6749a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
   curl \
   rlwrap \
   unzip \
-  openjdk-17-jre-headless \
+  openjdk-21-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/docker-compose.yml b/docker-compose.yml
index 353ecb32..8d3f700f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,9 @@ services:
       # with permissions that prevent normal users from accessing
       # the folder structure.
       - /var/games/mineos/minecraft:/var/games/minecraft
+      # Set timezone from the host
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
 
     environment:
       # Should the web interface use HTTPS or HTTP?