diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804
index 8f947aa..b32a1ae 100644
--- a/Dockerfile.ubuntu-1804
+++ b/Dockerfile.ubuntu-1804
@@ -1,22 +1,7 @@
 FROM ubuntu:18.04
 
 LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
-
-# Install UTF-8 unicode
-RUN echo "**** Install UTF-8 ****" \
-  && apt-get update \
-  && apt-get install -y locales apt-utils debconf-utils ca-certificates \
-  && apt-get -y autoremove \
-  && apt-get -y clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm -rf /tmp/* \
-  && rm -rf /var/tmp/*
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-# Add unicode support
-RUN locale-gen en_US.UTF-8
-ENV LANG 'en_US.UTF-8'
-ENV LANGUAGE 'en_US:en'
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Install SteamCMD
 RUN echo "**** Install SteamCMD ****" \
@@ -24,7 +9,7 @@ RUN echo "**** Install SteamCMD ****" \
   && echo steam steam/license note '' | debconf-set-selections \
   && dpkg --add-architecture i386 \
   && apt-get update \
-  && apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \
+  && apt-get install -y --no-install-recommends ca-certificates locales lib32gcc1 steamcmd \
   && ln -s /usr/games/steamcmd /usr/bin/steamcmd \
   && apt-get -y autoremove \
   && apt-get -y clean \
@@ -32,6 +17,11 @@ RUN echo "**** Install SteamCMD ****" \
   && rm -rf /tmp/* \
   && rm -rf /var/tmp/*
 
+# Add unicode support
+RUN locale-gen en_US.UTF-8
+ENV LANG 'en_US.UTF-8'
+ENV LANGUAGE 'en_US:en'
+
 # Update SteamCMD
 RUN steamcmd +quit
 
diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index fe2a561..7527c4f 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -1,22 +1,7 @@
 FROM ubuntu:20.04
 
 LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
-
-# Install UTF-8 unicode
-RUN echo "**** Install UTF-8 ****" \
-  && apt-get update \
-  && apt-get install -y locales apt-utils debconf-utils ca-certificates \
-  && apt-get -y autoremove \
-  && apt-get -y clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm -rf /tmp/* \
-  && rm -rf /var/tmp/*
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-# Add unicode support
-RUN locale-gen en_US.UTF-8
-ENV LANG 'en_US.UTF-8'
-ENV LANGUAGE 'en_US:en'
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Install SteamCMD
 RUN echo "**** Install SteamCMD ****" \
@@ -24,7 +9,7 @@ RUN echo "**** Install SteamCMD ****" \
   && echo steam steam/license note '' | debconf-set-selections \
   && dpkg --add-architecture i386 \
   && apt-get update \
-  && apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \
+  && apt-get install -y --no-install-recommends ca-certificates locales lib32gcc1 steamcmd \
   && ln -s /usr/games/steamcmd /usr/bin/steamcmd \
   && apt-get -y autoremove \
   && apt-get -y clean \
@@ -32,6 +17,11 @@ RUN echo "**** Install SteamCMD ****" \
   && rm -rf /tmp/* \
   && rm -rf /var/tmp/*
 
+# Add unicode support
+RUN locale-gen en_US.UTF-8
+ENV LANG 'en_US.UTF-8'
+ENV LANGUAGE 'en_US:en'
+
 # Update SteamCMD
 RUN steamcmd +quit
 
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index 14b4e78..e839fb4 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -1,24 +1,7 @@
 FROM ubuntu:22.04
 
 LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
-
-LABEL maintainer="LinuxGSM <me@danielgibbs.co.uk>"
-
-# Install UTF-8 unicode
-RUN echo "**** Install UTF-8 ****" \
-  && apt-get update \
-  && apt-get install -y locales apt-utils debconf-utils ca-certificates \
-  && apt-get -y autoremove \
-  && apt-get -y clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm -rf /tmp/* \
-  && rm -rf /var/tmp/*
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-# Add unicode support
-RUN locale-gen en_US.UTF-8
-ENV LANG 'en_US.UTF-8'
-ENV LANGUAGE 'en_US:en'
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Install SteamCMD
 RUN echo "**** Install SteamCMD ****" \
@@ -26,7 +9,7 @@ RUN echo "**** Install SteamCMD ****" \
   && echo steam steam/license note '' | debconf-set-selections \
   && dpkg --add-architecture i386 \
   && apt-get update \
-  && apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \
+  && apt-get install -y --no-install-recommends ca-certificates locales lib32gcc-s1 steamcmd \
   && ln -s /usr/games/steamcmd /usr/bin/steamcmd \
   && apt-get -y autoremove \
   && apt-get -y clean \
@@ -34,6 +17,11 @@ RUN echo "**** Install SteamCMD ****" \
   && rm -rf /tmp/* \
   && rm -rf /var/tmp/*
 
+# Add unicode support
+RUN locale-gen en_US.UTF-8
+ENV LANG 'en_US.UTF-8'
+ENV LANGUAGE 'en_US:en'
+
 # Update SteamCMD
 RUN steamcmd +quit