diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml
deleted file mode 100644
index ed25aa1..0000000
--- a/.github/workflows/publish-docker-images.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Publish Docker Images
-on:
-  push:
-    branches: [ master ]
-  release:
-    types: [ published ]
-jobs:
-  push_to_registries:
-    name: Push Docker images
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Push to Docker Hub
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: garethflowers/mediawiki-ldap
-          add_git_labels: true
-          tag_with_ref: true
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: ${{ github.repository }}/mediawiki-ldap
-          add_git_labels: true
-          tag_with_ref: true
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..96a608e
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,54 @@
+name: Publish
+on:
+  push:
+    branches: main
+    tags:
+      - "*.*.*"
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Prepare
+        id: prep
+        uses: crazy-max/ghaction-docker-meta@v2
+        with:
+          images: |
+            ${{ github.repository_owner }}/mediawiki-ldap
+            ghcr.io/${{ github.repository_owner }}/mediawiki-ldap
+          tags: |
+            type=edge,branch=main
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
+          push: true
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: ${{ steps.prep.outputs.labels }}
+      - name: Update Description
+        continue-on-error: true
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          short-description: ${{ github.event.repository.description }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}