diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 17b17a98..5635e680 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,5 +1,4 @@
-name: Docker Image Build
-
+name: Publish Docker image
 on:
   push:
     branches:
@@ -8,14 +7,36 @@ on:
       - "*"
 
 jobs:
-  build:
+  push_to_registry:
+    name: Push Docker image to Docker Hub and ghcr.io
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/metadata-action@v4
+        id: meta
+        with:
+          images: |
+            ${{ github.repository }}
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=sha
+      - uses: docker/login-action@v2
+        name: Login to Docker Hub
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: praekeltfoundation/ndoh-hub
-          tag_with_ref: true
-          tag_with_sha: true
+      - uses: docker/login-action@v2
+        name: Login to ghcr.io
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/build-push-action@v4
+        name: Build and push image
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}