diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index a43e0f0c..adb18852 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -11,10 +11,8 @@ jobs:
           fetch-depth: 0
       - name: Set current version
         run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
-        # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-        # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
index fec2bac1..4b9e008d 100644
--- a/.github/workflows/release-nightly.yml
+++ b/.github/workflows/release-nightly.yml
@@ -41,12 +41,15 @@ jobs:
             modules/joex/target/docspell-joex_${{ env.DOCSPELL_VERSION }}_all.deb
             modules/joex/target/universal/docspell-joex-${{ env.DOCSPELL_VERSION }}.zip
             tools/target/docspell-tools-${{ env.DOCSPELL_VERSION }}.zip
-      - name: Build Docker Images (${{ env.DOCSPELL_VERSION }})
-        run: ./docker/dockerfiles/build.sh ${{ env.DOCSPELL_VERSION }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
       - name: Log in to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Publish Images (${{ env.DOCSPELL_VERSION }})
-        run: ./docker/dockerfiles/push.sh ${{ env.DOCSPELL_VERSION }}
+      - name: Build and push Docker Images (${{ env.DOCSPELL_VERSION }})
+        run: ./docker/dockerfiles/build.sh ${{ env.DOCSPELL_VERSION }} --push