diff --git a/Dockerfile b/Dockerfile
index 3c713bd..cb6a1f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,47 +1,23 @@
 FROM alpine:latest
 
-# Set environment for non-interactive installs
-ENV VNC_BUILTIN_WIDTH=1024
-ENV VNC_BUILTIN_HEIGHT=768
-ENV VNC_BUILTIN_PIXELDEPTH=32
-ENV VNC_BUILTIN_DISABLED=true
-ENV DISPLAY=:0
+ENV VNC_BUILTIN_WIDTH=1024 \
+    VNC_BUILTIN_HEIGHT=768 \
+    VNC_BUILTIN_PIXELDEPTH=32 \
+    VNC_BUILTIN_DISABLED=true \
+    DISPLAY=:0
 
-# Install X/VNC packages
+# Install packages: X/VNC, fonts, terminal, i3, and utilities
 RUN apk add --no-cache \
-    x11vnc \
-    xvfb \
-    xterm \
-    bash \
-    procps \
-    iproute2 \
-    inetutils-telnet \
-    xdpyinfo \
-    wget
+    x11vnc xvfb xterm bash \
+    procps iproute2 inetutils-telnet xdpyinfo wget \
+    font-noto font-noto-cjk font-noto-emoji font-noto-mono fontconfig \
+    i3wm i3blocks i3status htop
 
-# Create working directory and expose volume for user data
-WORKDIR /
-
-# Install Fonts
-RUN apk add --no-cache \
-    font-noto \
-    font-noto-cjk \
-    font-noto-emoji \
-    fontconfig
-
-# Intall and Setup i3 window manager
-RUN apk add --no-cache \
-    i3wm \
-    i3blocks \
-    i3status\
-    htop
-
-# Copy minimal config
-RUN mkdir -p /root/.config/i3
+# Configure i3
 COPY i3.config /root/.config/i3/config
 
-# Copy and prepare entrypoint script
-COPY ./vnc.sh /vnc.sh
+# Entrypoint script
+COPY vnc.sh /vnc.sh
 RUN chmod +x /vnc.sh
 
 ENTRYPOINT ["/vnc.sh"]