diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index f335e2397f..bbca7e9649 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -8,6 +8,7 @@
   [(#788)](https://github.com/PennyLaneAI/pennylane-lightning/pull/788)
 
 ### Improvements
+
 * Add a Catalyst-specific wrapping class for Lightning Kokkos.
   [(#770)](https://github.com/PennyLaneAI/pennylane-lightning/pull/770)
 
@@ -15,6 +16,9 @@
 
 ### Bug fixes
 
+* Fix conditions for skipping build & push steps in the Docker build workflows.
+  [(#790)](https://github.com/PennyLaneAI/pennylane-lightning/pull/790)
+
 * Downgrade Scipy on Lightning stable version tests.
   [(#783)](https://github.com/PennyLaneAI/pennylane-lightning/pull/783)
 
diff --git a/.github/workflows/docker_linux_x86_64.yml b/.github/workflows/docker_linux_x86_64.yml
index c9bb35ca39..0ce9fdb95f 100644
--- a/.github/workflows/docker_linux_x86_64.yml
+++ b/.github/workflows/docker_linux_x86_64.yml
@@ -81,25 +81,12 @@ jobs:
 
       - name: Build and push version
         uses: docker/build-push-action@v5
-        if: ${{ inputs.push-to-dockerhub == 'true' }}
+        if: ${{ inputs.push-to-dockerhub }}
         with:
           push: ${{ inputs.push-to-dockerhub }}
           context: .
           file: docker/Dockerfile
-          tags: pennylaneai/pennylane:${{ inputs.lightning-version }}-${{ matrix.pl_backend }}
-          target: wheel-${{ matrix.pl_backend }}
-          build-args: |
-            LIGHTNING_VERSION=${{ inputs.lightning-version }}
-            PENNYLANE_VERSION=${{ inputs.pennylane-version }}
-
-      - name: Build and push latest
-        uses: docker/build-push-action@v5
-        if: ${{ inputs.push-to-dockerhub == 'true' }}
-        with:
-          push: ${{ inputs.push-to-dockerhub }}
-          context: .
-          file: docker/Dockerfile
-          tags: pennylaneai/pennylane:latest-${{ matrix.pl_backend }}
+          tags: pennylaneai/pennylane:${{ inputs.lightning-version }}-${{ matrix.pl_backend }},pennylaneai/pennylane:latest-${{ matrix.pl_backend }}
           target: wheel-${{ matrix.pl_backend }}
           build-args: |
             LIGHTNING_VERSION=${{ inputs.lightning-version }}
diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py
index 495216b173..5d317504f4 100644
--- a/pennylane_lightning/core/_version.py
+++ b/pennylane_lightning/core/_version.py
@@ -16,4 +16,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.38.0-dev3"
+__version__ = "0.38.0-dev4"