diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af6e5323..f5f3f582 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -184,7 +184,7 @@ jobs:
         env:
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
-        if: ${{ (github.event_name != 'pull_request') || ((env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '')) }}
+        if: ${{ (github.event_name != 'pull_request') && (env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
         uses: docker/login-action@v3
         with:
           # username is not really a secret
@@ -209,7 +209,7 @@ jobs:
           IMAGE_NAME: docker.io/${{ github.repository }}
           IMAGE_SUFFIX_AMD64: amd64
           IMAGE_SUFFIX_ARM64V8: arm64v8
-        if: ${{ (github.event_name != 'pull_request') || ((env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '')) }}
+        if: ${{ (github.event_name != 'pull_request') && (env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
         run: |
           docker load -i oci-image-amd64.tar.gz
           IMAGE_ID_AMD64=$(docker images -q conduit:main)