diff --git a/.github/workflow/docker-build.yml b/.github/workflow/docker-build.yml
new file mode 100644
index 000000000..1775b8eb8
--- /dev/null
+++ b/.github/workflow/docker-build.yml
@@ -0,0 +1,36 @@
+name: Build and push release Docker image
+
+#on:
+#  push:
+#    tags:
+#      - "v*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Setup Docker buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        platforms: linux/amd64
+        #push: true
+        tags: |
+          mapbender/mapbender:latest
+          mapbender/mapbender:${{ github.ref_name }}