diff --git a/Dockerfile.arch b/Dockerfile.arch
index 7cdee2c..b8130a1 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -150,7 +150,6 @@ RUN \
             libva-mesa-driver \
             mesa-utils \
             mesa-vdpau \
-            opencl-mesa \
             pciutils \
             vulkan-mesa-layers \
             vdpauinfo \
@@ -162,6 +161,9 @@ RUN \
     echo
 
 # Install X Server requirements
+ENV \
+    XORG_SOCKET_DIR="/tmp/.X11-unix" \
+    XDG_RUNTIME_DIR="/tmp/.X11-unix/run"
 RUN \
     echo "**** Install X Server requirements ****" \
 	    && pacman -Syu --noconfirm --needed \
@@ -197,6 +199,9 @@ RUN \
     echo
 
 # Install audio requirements
+ENV \
+    PULSE_SOCKET_DIR="/tmp/pulse" \
+    PULSE_SERVER="unix:/tmp/pulse/pulse-socket"
 RUN \
     echo "**** Install X Server requirements ****" \
 	    && pacman -Syu --noconfirm --needed \
@@ -252,6 +257,8 @@ RUN \
 #   At the moment this is only working beacuse /proc is being mounted again in 10-setup_user.sh
 #   Need to find a better solution for this...
 ARG BUBBLEWRAP_VERSION=0.8.0
+ENV \
+    XDG_DATA_DIRS="/home/default/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share/:/usr/share/"
 RUN \
     echo "**** Install flatpak support ****" \
 	    && pacman -Syu --noconfirm --needed \
@@ -385,9 +392,27 @@ RUN \
     && \
     echo
 
+# Install Steam
+RUN \
+    echo "**** Install X Server requirements ****" \
+	    && pacman -Syu --noconfirm --needed \
+            steam \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+        && rm -fr /var/lib/pacman/sync/* \
+    && \
+    echo
+
 # Add FS overlay
 COPY overlay /
 
+RUN \
+    echo "**** Setup Steam Supervisor ****" \
+            && sed -i 's#/usr/games/steam#/usr/bin/steam#g' /etc/supervisor.d/steam.ini \
+    && \
+    echo
+
 # Set display environment variables
 ENV \
     DISPLAY_CDEPTH="24" \
@@ -396,19 +421,10 @@ ENV \
     DISPLAY_SIZEW="1600" \
     DISPLAY_VIDEO_PORT="DFP" \
     DISPLAY=":55"
-ENV \
-    XORG_SOCKET_DIR="/tmp/.X11-unix" \
-    XDG_RUNTIME_DIR="/tmp/.X11-unix/run" \
-    XDG_DATA_DIRS="/home/default/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share/:/usr/share/"
 ENV \
     NVIDIA_DRIVER_CAPABILITIES="all" \
     NVIDIA_VISIBLE_DEVICES="all"
 
-# Set pulseaudio environment variables
-ENV \
-    PULSE_SOCKET_DIR="/tmp/pulse" \
-    PULSE_SERVER="unix:/tmp/pulse/pulse-socket"
-
 # Set container configuration environment variables
 ENV \
     MODE="primary" \
@@ -416,12 +432,13 @@ ENV \
     ENABLE_VNC_AUDIO="true" \
     NEKO_PASSWORD=neko \
     NEKO_PASSWORD_ADMIN=admin \
+    ENABLE_STEAM="true" \
+    STEAM_ARGS="-silent" \
     ENABLE_SUNSHINE="false" \
     ENABLE_EVDEV_INPUTS="false"
 
 # Configure required ports
 ENV \
-    PORT_SSH="" \
     PORT_NOVNC_WEB="8083" \
     NEKO_NAT1TO1=""