diff --git a/Dockerfile b/Dockerfile
index ccdde58..0eaa87a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,20 @@
-FROM jlesage/baseimage-gui:debian-10
+FROM jlesage/baseimage-gui:ubuntu-24.04-v4.7.1
+  # Install app
   RUN apt-get update && apt-get install -y openscad
 
-  RUN sed-patch 's/<application type="normal">/<application type="normal" title="OpenSCAD">/' /etc/xdg/openbox/rc.xml && \
-    echo "#!/bin/sh\nexport HOME=/home\nexec openscad" > /startapp.sh
+  # Setup dirs and files
+  RUN mkdir -p /home/openscad
+  RUN echo "#!/bin/sh\nexec openscad" > /startapp.sh
 
+  # Internal env vars
   ENV APP_NAME="OpenSCAD"
+  ENV HOME="/home/openscad"
+
+  # User
   ENV USER_ID=0
   ENV GROUP_ID=0
+
+  # App config
   ENV DISPLAY_WIDTH=2340
   ENV DISPLAY_HEIGHT=1542
   ENV KEEP_APP_RUNNING=1