diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 01255ca..96695dd 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -28,10 +28,23 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
+      - name: Build and push (Ubuntu 22.04)
         uses: docker/build-push-action@v3.2.0
         with:
           context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            gameservermanagers/steamcmd:latest
+            gameservermanagers/steamcmd:ubuntu-22.04
+            ghcr.io/gameservermanagers/steamcmd:latest
+            ghcr.io/gameservermanagers/steamcmd:ubuntu-22.04
+      - name: Build and push (Ubuntu 20.04)
+        uses: docker/build-push-action@v3.2.0
+        with:
+          context: .
+          file: ./Dockerfile.ubuntu-20.04
           platforms: linux/amd64
           push: true
           tags: |
diff --git a/Dockerfile.ubuntu2004 b/Dockerfile.ubuntu2004
new file mode 100644
index 0000000..07c2655
--- /dev/null
+++ b/Dockerfile.ubuntu2004
@@ -0,0 +1,31 @@
+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
+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'
+
+# Install SteamCMD
+RUN echo "**** Install SteamCMD ****" \
+&& echo steam steam/question select "I AGREE" | debconf-set-selections \
+&& 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 \
+&& ln -s /usr/games/steamcmd /usr/bin/steamcmd \
+&& apt-get -y autoremove \
+&& apt-get -y clean \
+&& rm -rf /var/lib/apt/lists/* \
+&& rm -rf /tmp/* \
+&& rm -rf /var/tmp/*
+
+# Update SteamCMD
+RUN steamcmd +quit