diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index bc32560dc..597774d52 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -112,7 +112,7 @@ jobs:
     permissions:
       packages: write
       contents: read
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' && !contains('release/', github.event.pull_request.head.ref}}
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' && !contains('release/', github.event.pull_request.head.ref) }}
     steps:
       - name: Find Current Pull Request
         uses: jwalton/gh-find-current-pr@v1
@@ -236,7 +236,7 @@ jobs:
     permissions:
       packages: write
       contents: read
-    if: github.event_name == 'pull_request' && contains('release/', github.event.pull_request.head.ref && github.event.pull_request.base.ref == 'develop'
+    if: github.event_name == 'pull_request' && contains('release/', github.event.pull_request.head.ref) && github.event.pull_request.base.ref == 'develop'
     steps:
 
       - name: Find Current Pull Request
@@ -337,7 +337,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build and push stable
-        id: docker_build
+        id: docker_build_stable
         uses: docker/build-push-action@v4
         with:
           context: .
@@ -346,7 +346,7 @@ jobs:
           tags: jvmilazz0/kavita:latest, jvmilazz0/kavita:${{ steps.parse-version.outputs.VERSION }}, ghcr.io/kareadita/kavita:latest, ghcr.io/kareadita/kavita:${{ steps.parse-version.outputs.VERSION }}
 
       - name: Build and push nightly
-        id: docker_build
+        id: docker_build_nightly
         uses: docker/build-push-action@v4
         with:
           context: .
@@ -355,7 +355,10 @@ jobs:
           tags: jvmilazz0/kavita:nightly, jvmilazz0/kavita:nightly-${{ steps.parse-version.outputs.VERSION }}, ghcr.io/kareadita/kavita:nightly, ghcr.io/kareadita/kavita:nightly-${{ steps.parse-version.outputs.VERSION }}
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        run: echo ${{ steps.docker_build_stable.outputs.digest }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build_nightly.outputs.digest }}
 
       - name: Notify Discord
         uses: rjstone/discord-webhook-notify@v1