diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 2ef710ba..502ac48c 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -89,7 +89,7 @@ jobs:
           # list of Docker images to use as base name for tags
           images: |
             us-docker.pkg.dev/${{ vars.GCP_PROJECT }}/zebra/${{ inputs.image_name }}
-            zfnd/zebra,enable=${{ github.event_name == 'release' && !github.event.release.prerelease }}
+            zfnd/${{ inputs.image_name }},enable=${{ github.event_name == 'release' && !github.event.release.prerelease }}
           # appends inputs.tag_suffix to image tags/names
           flavor: |
             suffix=${{ inputs.tag_suffix }}
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index d307fd1e..8366f51d 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -18,14 +18,14 @@ jobs:
   # Each time this workflow is executed, a build will be triggered to create a new image
   # with the corresponding tags using information from git
 
-  # The image will be named `zebrad:<semver>`
+  # The image will be named `zebra:<semver>`
   build:
     name: Build Release Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
       dockerfile_target: runtime
-      image_name: zebrad
+      image_name: zebra
       network: Mainnet
       checkpoint_sync: true
       rust_backtrace: '1'
@@ -34,14 +34,14 @@ jobs:
     # This step needs access to Docker Hub secrets to run successfully
     secrets: inherit
 
-  # The image will be named `zebrad-mining-rpcs-testnet:<semver>.experimental`
+  # The image will be named `zebra:<semver>.experimental`
   build-mining-testnet:
     name: Build Release Testnet Mining Docker
     uses: ./.github/workflows/build-docker-image.yml
     with:
       dockerfile_path: ./docker/Dockerfile
       dockerfile_target: runtime
-      image_name: zebrad-mining-rpcs-testnet
+      image_name: zebra
       # TODO: change this to `-experimental` when we release Zebra `1.0.0`
       tag_suffix: .experimental
       network: Testnet