diff --git a/Dockerfile b/Dockerfile
index 32fad18..8dcb5c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM docker.io/library/archlinux:latest AS arch
 
-COPY system-files /
-
 # Pacman Initialization
 # Create build user
 RUN sed -i 's/#Color/Color/g' /etc/pacman.conf && \
@@ -24,8 +22,11 @@ RUN pacman -Syu \
         firefox konsole dolphin \
         flatpak \
         steam lutris \
+	cargo \
         --noconfirm
 
+RUN cargo install dcspkg --root /usr
+
 # Add paru and install AUR packages
 USER build
 WORKDIR /home/build
@@ -34,10 +35,16 @@ RUN git clone https://aur.archlinux.org/paru-bin.git --single-branch && \
     makepkg -si --noconfirm && \
     cd .. && \
     rm -drf paru-bin
-RUN paru --noconfirm -S prismlauncher-qt5-bin jre17-openjdk
+RUN paru --noconfirm -S prismlauncher-qt5-bin jre17-openjdk jre21-openjdk
 USER root
 WORKDIR /
 
+RUN mkdir -p /home/fng
+WORKDIR /home/fng
+RUN git clone https://github.com/UWCS/fng-home.git .
+RUN git clone https://github.com/UWCS/dcslauncher.git
+WORKDIR /
+
 # Cleanup
 # We do this last because it'll only apply to updates the user makes going forward. We don't want to optimize for the build host's environment.
 RUN sed -i 's/-march=x86-64 -mtune=generic/-march=native -mtune=native/g' /etc/makepkg.conf && \
diff --git a/host/.xsession b/host/.xsession
index 0f3991b..af6b711 100755
--- a/host/.xsession
+++ b/host/.xsession
@@ -12,7 +12,7 @@ podman rm -f arch
 
 podman pull ghcr.io/uwcs/fng:latest
 
-$distrobox create --nvidia -i ghcr.io/uwcs/fng:latest -n arch -I --no-entry --pre-init-hooks "mkdir -p /usr/local/bin && chown -R $(id -u):$(id -g) /home/fng" -d | sed -e '\#--volume "'$HOME'":#d' -e '\#--home "'$HOME'"#c\--home "/home/fng"' -e '\#--volume /dcs:#d' | tr '\n' ' ' | source /dev/stdin
+$distrobox create --nvidia -i uwcs/fng:latest -n arch -I --no-entry --pre-init-hooks "mkdir -p /usr/local/bin && chown -R $(id -u):$(id -g) /home/fng" -d | sed -e '\#--volume "'$HOME'":#d' -e '\#--home "'$HOME'"#c\--home "/home/fng"' -e '\#--volume /dcs:#d' | tr '\n' ' ' | source /dev/stdin
 
 $distrobox enter arch -- echo launched
 podman exec --interactive --detach-keys="" --user=$USER --workdir="/home/fng" --env "CONTAINER_ID=arch" --env "DISPLAY=${DISPLAY}" --env "HOME=/home/fng" arch dbus-run-session startplasma-x11
diff --git a/system-files/home/fng b/system-files/home/fng
deleted file mode 160000
index f2b974c..0000000
--- a/system-files/home/fng
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f2b974ce014b13faa0495e31384be1f9995f0278