diff --git a/Dockerfile b/Dockerfile
index b3f9b62..f7dab3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,15 +10,15 @@ RUN mkdir -p /opt/forge
 
 # Download the latest Forge snapshot at build time
 WORKDIR /tmp/forge-download
-# Dockerfile snippet
-RUN apt update && apt install -y curl jq bzip2 && rm -rf /var/lib/apt/lists/* && \
+RUN apt update && apt install -y curl jq bzip2 tar && rm -rf /var/lib/apt/lists/* && \
     SNAPSHOT_URL=$(curl -s https://api.github.com/repos/Card-Forge/forge/releases/tags/daily-snapshots \
       | jq -r '.assets[] | select(.name | test("forge-installer-.*\\.tar\\.bz2")) | .browser_download_url') && \
     curl -L "$SNAPSHOT_URL" -o forge.tar.bz2 && \
-    tar -xjf forge.tar.bz2 && \
-    mv forge-gui-desktop-*.jar /opt/forge/forge.jar && \
+    mkdir -p /opt/forge && \
+    tar -xjf forge.tar.bz2 --strip-components=1 -C /opt/forge && \
     rm forge.tar.bz2
 
+
 # Add launcher
 COPY start.sh /start.sh
 RUN chmod +x /start.sh
diff --git a/start.sh b/start.sh
index 28eb95a..53ee5d5 100644
--- a/start.sh
+++ b/start.sh
@@ -1,3 +1,9 @@
 #!/bin/bash
 echo "[Forge] Launching..."
-exec java -jar /opt/forge/forge.jar
+
+export DISPLAY=:1
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+cd /opt/forge
+bash forge.sh &
+sleep infinity