diff --git a/.github/workflows/update-version-number.yaml b/.github/workflows/update-version-number.yaml
index 8641df47..1afa6ca5 100644
--- a/.github/workflows/update-version-number.yaml
+++ b/.github/workflows/update-version-number.yaml
@@ -1,4 +1,4 @@
-name: Update Version number
+name: Update Version number and build docker images
 
 "on":
   push:
@@ -24,3 +24,30 @@ jobs:
           git push origin HEAD:main > /dev/null 2>&1
           git tag -f "v$VERSION"
           git push -f origin "v$VERSION" > /dev/null 2>&1
+  
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/fedifetcher:${{ github.ref_name }}
+            ghcr.io/${{ github.repository_owner }}/fedifetcher:latest