diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
index d5cb35ddb93fc27e67f25e49587b5c3045367be1..82585ff8dc8eae859933ac40b3a8eb706e82ced5 100644
--- a/.github/workflows/publish-canary.yml
+++ b/.github/workflows/publish-canary.yml
@@ -74,11 +74,11 @@ jobs:
       - name: Docker Image Name
         id: docker_image_name
         run: |
-          if [ $CUSTOM_IMAGE_NAME == '' ]
+          if [ -z "${CUSTOM_IMAGE_NAME}" ]
           then
               echo "::set-output name=canary-docker-tag::${GITHUB_SHA::8}"
           else
-              echo "::set-output name=canary-docker-tag::prerelease-$CUSTOM_IMAGE_NAME"
+              echo "::set-output name=canary-docker-tag::prerelease-${CUSTOM_IMAGE_NAME}"
           fi
         env:
           CUSTOM_IMAGE_NAME: ${{ github.event.inputs.customImageName }}
@@ -112,7 +112,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.geth
           push: true
-          tags: ethereumoptimism/l2geth:${{ needs.canary-publish.outputs.l2geth }}
+          tags: ethereumoptimism/l2geth:${{ steps.docker_image_name.outputs.canary-docker-tag }}
 
   # pushes the base builder image to dockerhub
   builder: