diff --git a/Dockerfile.arch b/Dockerfile.arch
new file mode 100644
index 0000000..830a792
--- /dev/null
+++ b/Dockerfile.arch
@@ -0,0 +1,424 @@
+# Steam Headless (Arch Linux)
+# (WIP) An Arch variant of the steam-headless image
+# It is curerently my intent to switch to arch as the main 
+#   image base once SteamOS 3 is released (pending review)
+#
+FROM archlinux:latest
+LABEL maintainer="Josh.5 <jsunnex@gmail.com>"
+
+# Update package repos
+RUN \
+    echo "**** Update package manager ****" \
+        && sed -i 's/^NoProgressBar/#NoProgressBar/g' /etc/pacman.conf \
+        && echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf \
+    && \
+    echo
+
+# Update locale
+RUN \
+    echo "**** Configure locals ****" \
+        && echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
+        && locale-gen \
+    && \
+    echo
+ENV \
+    LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
+# Re-install certificates
+RUN \
+    echo "**** Install certificates ****" \
+	    && pacman -Syu --noconfirm --needed \
+            ca-certificates \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# Install core packages
+RUN \
+    echo "**** Install tools ****" \
+	    && pacman -Syu --noconfirm --needed \
+            bash \
+            bash-completion \
+            curl \
+            git \
+            less \
+            man-db \
+            nano \
+            net-tools \
+            pkg-config \
+            rsync \
+            screen \
+            sudo \
+            unzip \
+            vim \
+            wget \
+            xz \
+    && \
+    echo "**** Install python ****" \
+	    && pacman -Syu --noconfirm --needed \
+            python \
+            python-numpy \
+            python-pip \
+            python-setuptools \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# Install supervisor
+RUN \
+    echo "**** Install supervisor ****" \
+	    && pacman -Syu --noconfirm --needed \
+            supervisor \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# XFS requirements
+RUN \
+    echo "**** Install XFS requirements ****" \
+	    && pacman -Syu --noconfirm --needed \
+            xfsdump \
+            xfsprogs \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# Install mesa requirements
+RUN \
+    echo "**** Install mesa and vulkan requirements ****" \
+	    && pacman -Syu --noconfirm --needed \
+            glu \
+            libva-mesa-driver \
+            mesa-utils \
+            mesa-vdpau \
+            opencl-mesa \
+            pciutils \
+            vulkan-mesa-layers \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# Install X Server requirements
+# TODO: Remove doubles
+# TODO: Things that are not required
+RUN \
+    echo "**** Install X Server requirements ****" \
+	    && pacman -Syu --noconfirm --needed \
+            avahi \
+            dbus \
+            lib32-fontconfig \
+            ttf-liberation \
+            x11vnc \
+            xorg \
+            xorg-apps \
+            xorg-font-util \
+            xorg-fonts-misc \
+            xorg-fonts-type1 \
+            xorg-server \
+            xorg-server-xephyr \
+            xorg-server-xvfb \
+            xorg-xauth \
+            xorg-xbacklight \
+            xorg-xhost \
+            xorg-xinit \
+            xorg-xinput \
+            xorg-xkill \
+            xorg-xprop \
+            xorg-xrandr \
+            xorg-xsetroot \
+            xorg-xwininfo \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# pacman -Syu --noconfirm --needed \
+#     xorg-server \
+#     xorg-server-xephyr \
+#     xorg-xwininfo \
+#     xorg-xhost \
+#     xorg-xinit \
+#     xorg-xinput \
+#     xorg-xrandr \
+#     xorg-xprop \
+#     xorg-xkill \
+#     xorg-xbacklight \
+#     xorg-xsetroot
+# s
+# pacman -Syu --noconfirm --needed autorandr xdg-desktop-portal xdg-desktop-portal-gtk wmctrl xbindkeys xdotool xautolock
+# 
+# 
+# pacman -Syu --noconfirm --needed gestures
+# pacman -Syu --noconfirm --needed numlockx
+# 
+# echo 'Server = https://mirror.fsmg.org.nz/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist
+# 
+# Server = https://mirror.pkgbuild.com/$repo/os/$arch
+# Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+# Server = https://mirror.leaseweb.net/archlinux/$repo/os/$arch
+
+# Install audio requirements
+RUN \
+    echo "**** Install X Server requirements ****" \
+	    && pacman -Syu --noconfirm --needed \
+            pulseaudio \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# Install openssh server
+RUN \
+    echo "**** Install openssh server ****" \
+	    && pacman -Syu --noconfirm --needed \
+            openssh \
+        && echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# Install noVNC
+ARG NOVNC_VERSION=1.2.0
+RUN \
+    echo "**** Fetch noVNC ****" \
+        && cd /tmp \
+        && wget -O /tmp/novnc.tar.gz https://github.com/novnc/noVNC/archive/v${NOVNC_VERSION}.tar.gz \
+    && \
+    echo "**** Extract noVNC ****" \
+        && cd /tmp \
+        && tar -xvf /tmp/novnc.tar.gz \
+    && \
+    echo "**** Configure noVNC ****" \
+        && cd /tmp/noVNC-${NOVNC_VERSION} \
+        && sed -i 's/credentials: { password: password } });/credentials: { password: password },\n                           wsProtocols: ["'"binary"'"] });/g' app/ui.js \
+        && mkdir -p /opt \
+        && rm -rf /opt/noVNC \
+        && cd /opt \
+        && mv -f /tmp/noVNC-${NOVNC_VERSION} /opt/noVNC \
+        && cd /opt/noVNC \
+        && ln -s vnc.html index.html \
+        && chmod -R 755 /opt/noVNC \
+    && \
+    echo "**** Modify noVNC title ****" \
+        && sed -i '/    document.title =/c\    document.title = "Steam Headless - noVNC";' \
+            /opt/noVNC/app/ui.js \
+    && \
+    echo "**** Section cleanup ****" \
+        && rm -rf \
+            /tmp/noVNC* \
+            /tmp/novnc.tar.gz
+
+# Install Websockify
+ARG WEBSOCKETIFY_VERSION=0.10.0
+RUN \
+    echo "**** Fetch Websockify ****" \
+        && cd /tmp \
+        && wget -O /tmp/websockify.tar.gz https://github.com/novnc/websockify/archive/v${WEBSOCKETIFY_VERSION}.tar.gz \
+    && \
+    echo "**** Extract Websockify ****" \
+        && cd /tmp \
+        && tar -xvf /tmp/websockify.tar.gz \
+    && \
+    echo "**** Install Websockify to main ****" \
+        && cd /tmp/websockify-${WEBSOCKETIFY_VERSION} \
+        && python3 ./setup.py install \
+    && \
+    echo "**** Install Websockify to noVNC path ****" \
+        && cd /tmp \
+        && mv -v /tmp/websockify-${WEBSOCKETIFY_VERSION} /opt/noVNC/utils/websockify \
+    && \
+    echo "**** Section cleanup ****" \
+        && rm -rf \
+            /tmp/websockify-* \
+            /tmp/websockify.tar.gz
+
+# Install firefox
+# TODO: MOve under de
+RUN \
+    echo "**** Install firefox ****" \
+	    && pacman -Syu --noconfirm --needed \
+            firefox \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+# # Install Steam
+# RUN \
+#     echo "**** Install steam ****" \
+# 	    && pacman -Syu --noconfirm --needed \
+#             lib32-vulkan-icd-loader
+#             steam \
+#             vulkan-icd-loader \
+#     && \
+#     echo "**** Section cleanup ****" \
+# 	    && pacman -Scc --noconfirm \
+#     && \
+#     echo
+
+# Install desktop environment
+RUN \
+    echo "**** Install desktop environment ****" \
+	    && pacman -Syu --noconfirm --needed \
+            gedit \
+            xfce4 \
+            xfce4-terminal \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+
+# Add support for flatpaks
+RUN \
+    echo "**** Install flatpak support ****" \
+	    && pacman -Syu --noconfirm --needed \
+            flatpak \
+            xdg-desktop-portal-gtk \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+
+# TODO Append to tools
+RUN \
+    echo "**** Install flatpak support ****" \
+	    && pacman -Syu --noconfirm --needed \
+            patch \
+    && \
+    echo "**** Section cleanup ****" \
+	    && pacman -Scc --noconfirm \
+    && \
+    echo
+
+
+
+# # Install desktop environment
+# RUN \
+#     echo "**** Install desktop environment ****" \
+# 	    && pacman -Syu --noconfirm --needed \
+#             kde-system-meta \
+#             konsole \
+#             plasma-desktop \
+#     && \
+#     echo "**** Section cleanup ****" \
+# 	    && pacman -Scc --noconfirm \
+#     && \
+#     echo
+
+# # Install desktop environment
+# RUN \
+#     echo "**** Install desktop environment ****" \
+# 	    && pacman -Syu --noconfirm --needed \
+#             cinnamon \
+#             polkit-gnome \
+#             gnome-terminal \
+#     && \
+#     echo "**** Section cleanup ****" \
+# 	    && pacman -Scc --noconfirm \
+#     && \
+#     echo
+
+# # Setup browser audio streaming deps
+# RUN \
+#     echo "**** Update apt database ****" \
+#         && apt-get update \
+#     && \
+#     echo "**** Install audio streaming deps ****" \
+#         && apt-get install -y --no-install-recommends \
+#             bzip2 \
+#             gstreamer1.0-alsa \
+#             gstreamer1.0-gl \
+#             gstreamer1.0-gtk3 \
+#             gstreamer1.0-libav \
+#             gstreamer1.0-plugins-base \
+#             gstreamer1.0-plugins-good \
+#             gstreamer1.0-pulseaudio \
+#             gstreamer1.0-qt5 \
+#             gstreamer1.0-tools \
+#             gstreamer1.0-x \
+#             libgstreamer1.0-0 \
+#             libncursesw5 \
+#             libopenal1 \
+#             libsdl-image1.2 \
+#             libsdl-ttf2.0-0 \
+#             libsdl1.2debian \
+#             libsndfile1 \
+#             ucspi-tcp \
+#     && \
+#     echo "**** Section cleanup ****" \
+#         && apt-get clean autoclean -y \
+#         && apt-get autoremove -y \
+#         && rm -rf \
+#             /var/lib/apt/lists/* \
+#             /var/tmp/* \
+#             /tmp/* \
+#     && \
+#     echo
+
+# Configure default user and set env
+ENV \
+    USER="default" \
+    USER_PASSWORD="password" \
+    USER_HOME="/home/default" \
+    TZ="Pacific/Auckland" \
+    USER_LOCALES="en_US.UTF-8 UTF-8"
+RUN \
+    echo "**** Configure default user '${USER}' ****" \
+        && mkdir -p \
+            ${USER_HOME} \
+            /games \
+        && useradd -d ${USER_HOME} -s /bin/bash ${USER} \
+        && chown -R ${USER} \
+            ${USER_HOME} \
+            /games \
+        && echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+# Add FS overlay
+COPY overlay /
+
+# Set display environment variables
+ENV \
+    DISPLAY_CDEPTH="24" \
+    DISPLAY_DPI="96" \
+    DISPLAY_REFRESH="60" \
+    DISPLAY_SIZEH="900" \
+    DISPLAY_SIZEW="1600" \
+    DISPLAY_VIDEO_PORT="DFP" \
+    DISPLAY=":55" \
+    NVIDIA_DRIVER_CAPABILITIES="all" \
+    NVIDIA_VISIBLE_DEVICES="all"
+
+# Set container configuration environment variables
+ENV \
+    MODE="primary" \
+    ENABLE_VNC_AUDIO="true"
+
+# Be sure that the noVNC port is exposed
+EXPOSE 8083
+EXPOSE 5901
+EXPOSE 32123
+
+# Set entrypoint
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/overlay/etc/cont-init.d/80-configure_nvidia_driver.sh b/overlay/etc/cont-init.d/80-configure_gpu_driver.sh
similarity index 64%
rename from overlay/etc/cont-init.d/80-configure_nvidia_driver.sh
rename to overlay/etc/cont-init.d/80-configure_gpu_driver.sh
index 3621770..08192c9 100644
--- a/overlay/etc/cont-init.d/80-configure_nvidia_driver.sh
+++ b/overlay/etc/cont-init.d/80-configure_gpu_driver.sh
@@ -11,10 +11,14 @@ else
     fi
 fi
 
+# NVIDIA Params
 export nvidia_pci_address="$(nvidia-smi --format=csv --query-gpu=pci.bus_id --id="${gpu_select}" 2> /dev/null | sed -n 2p | cut -d ':' -f2,3)"
 export nvidia_gpu_name=$(nvidia-smi --format=csv --query-gpu=name --id="${gpu_select}" | sed -n 2p 2> /dev/null)
 export nvidia_host_driver_version="$(nvidia-smi 2> /dev/null | grep NVIDIA-SMI | cut -d ' ' -f3)"
 
+# Intel params
+export intel_cpu_model="$(lscpu | grep 'Model name:' | grep Intel | cut -d':' -f2 | xargs)"
+
 function download_driver {
     mkdir -p ${USER_HOME}/Downloads
     chown -R ${USER} ${USER_HOME}/Downloads
@@ -30,7 +34,7 @@ function download_driver {
     fi
 }
 
-function install_driver {
+function install_nvidia_driver {
     # Check here if the currently installed version matches using nvidia-settings
     nvidia_settings_version=$(nvidia-settings --version 2> /dev/null | grep version | cut -d ' ' -f 4)
     [[ "${nvidia_settings_version}x" == "${nvidia_host_driver_version}x" ]] && return 0;
@@ -38,7 +42,17 @@ function install_driver {
     # Download the driver (if it does not yet exist locally)
     download_driver
 
-    echo "Installing driver v${nvidia_host_driver_version} to match what is running on the host"
+    # if command -v pacman &> /dev/null; then
+    #     echo "Install NVIDIA vulkan utils" \
+    #         && pacman -Syu --noconfirm --needed \
+    #             lib32-nvidia-utils \
+    #             lib32-vulkan-icd-loader
+    #             nvidia-utils \
+    #             vulkan-icd-loader \
+    #         && echo
+    # fi
+
+    echo "Installing NVIDIA driver v${nvidia_host_driver_version} to match what is running on the host"
     chmod +x ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run
     ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run \
         --silent \
@@ -55,11 +69,41 @@ function install_driver {
         > ${USER_HOME}/Downloads/nvidia_gpu_install.log 2>&1
 }
 
-if [[ -z ${nvidia_pci_address} ]]; then
-    echo "**** No NVIDIA device found ****";
-else
+function install_amd_driver {
+    if command -v pacman &> /dev/null; then
+        echo "Install AMD vulkan driver" \
+        && pacman -Syu --noconfirm --needed \
+            lib32-mesa \
+            lib32-vulkan-icd-loader \
+            lib32-vulkan-radeon \
+            vulkan-icd-loader \
+            vulkan-radeon \
+        && echo
+    fi
+}
+
+function install_intel_driver {
+    if command -v pacman &> /dev/null; then
+        echo "Install Intel vulkan driver" \
+        && pacman -Syu --noconfirm --needed \
+            lib32-mesa \
+            lib32-vulkan-icd-loader \
+            lib32-vulkan-intel \
+            vulkan-icd-loader \
+            vulkan-intel \
+        && echo
+    fi
+}
+
+
+if [[ ! -z ${nvidia_pci_address} ]]; then
     echo "**** Found NVIDIA device '${nvidia_gpu_name}' ****";
-    install_driver
+    install_nvidia_driver
+elif [[ ! -z ${intel_cpu_model} ]]; then
+    echo "**** Found Intel device '${intel_cpu_model}' ****";
+    install_intel_driver
+else
+    echo "**** No NVIDIA device found ****";
 fi
 
 echo "DONE"
diff --git a/overlay/etc/home_directory_template/.bashrc b/overlay/etc/home_directory_template/.bashrc
index 097cf0e..4092d42 100644
--- a/overlay/etc/home_directory_template/.bashrc
+++ b/overlay/etc/home_directory_template/.bashrc
@@ -12,3 +12,5 @@ PS1='[\u@\h \W]\$ '
 PATH=$PATH:$HOME/.local/bin:$HOME/bin
 # Export /usr/games
 PATH=$PATH:/usr/games
+# Export flatpak data directories
+XDG_DATA_DIRS="${XDG_DATA_DIRS}:/var/lib/flatpak/exports/share:/home/${USER}/.local/share/flatpak/exports/share"