diff --git a/steamcmd/entrypoint.sh b/steamcmd/entrypoint.sh
index df10978..a546a4b 100644
--- a/steamcmd/entrypoint.sh
+++ b/steamcmd/entrypoint.sh
@@ -34,9 +34,16 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Set environment for Steam Proton
-mkdir -p /home/container/.steam/steam/steamapps/compatdata/${SRCDS_APPID}
-export STEAM_COMPAT_CLIENT_INSTALL_PATH="/home/container/.steam/steam"
-export STEAM_COMPAT_DATA_PATH="/home/container/.steam/steam/steamapps/compatdata/${SRCDS_APPID}"
+if [ -f "/usr/local/bin/proton" ]; then
+    if [ ! -z ${SRCDS_APPID} ]; then
+	    mkdir -p /home/container/.steam/steam/steamapps/compatdata/${SRCDS_APPID}
+        export STEAM_COMPAT_CLIENT_INSTALL_PATH="/home/container/.steam/steam"
+        export STEAM_COMPAT_DATA_PATH="/home/container/.steam/steam/steamapps/compatdata/${SRCDS_APPID}"
+    else
+        echo -e "No appid set. Stopping server"
+        exit 1
+        fi
+fi
 
 # Switch to the container's working directory
 cd /home/container || exit 1
diff --git a/steamcmd/proton/Dockerfile b/steamcmd/proton/Dockerfile
index 14982d3..ed5f559 100644
--- a/steamcmd/proton/Dockerfile
+++ b/steamcmd/proton/Dockerfile
@@ -8,8 +8,8 @@ LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 ## install required packages
 RUN         dpkg --add-architecture i386
 RUN         apt update
-RUN         apt install -y --no-install-recommends wget iproute2 gnupg2 software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5-dev:i386 libncurses6 dbus libgdiplus lib32gcc-s1
-RUN         apt install -y alsa-tools libpulse0 pulseaudio libpulse-dev libasound2 libao-common gnutls-bin gnupg locales numactl cabextract curl
+RUN         apt install -y --no-install-recommends wget iproute2 gnupg2 software-properties-common libntlm0 winbind xvfb xauth libncurses5-dev:i386 libncurses6 dbus libgdiplus lib32gcc-s1
+RUN         apt install -y alsa-tools libpulse0 pulseaudio libpulse-dev libasound2 libao-common gnutls-bin gnupg locales numactl cabextract curl python3 python3-pip python3-setuptools python3-venv pipx
 RUN         useradd -d /home/container -m container
 
 # Download Proton GE
@@ -23,6 +23,13 @@ RUN         dbus-uuidgen --ensure=/etc/machine-id
 RUN         rm /var/lib/dbus/machine-id
 RUN         dbus-uuidgen --ensure
 
+#Setup Protontricks
+RUN         pipx install protontricks
+
+# Set up Winetricks
+RUN	        wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+            && chmod +x /usr/sbin/winetricks
+
 ## install rcon
 RUN         cd /tmp/ \
             && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.2/rcon-0.10.2-amd64_linux.tar.gz > rcon.tar.gz \