diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 983046f2f2..0c6185c8df 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           context: .
           file: ${{ inputs.file }}
-          tags: ${{ inputs.tag }}
+          tags: ${{ (inputs.push && format('{0}/', secrets.DOCKERHUB_ORGANIZATION)) || '' }}${{ inputs.tag }}
           load: ${{ inputs.load }}
           push: ${{ inputs.push }}
       - name: Upload ${{ inputs.tag }} Docker image to artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f3bb684828..1795dc08a4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,8 +35,7 @@ jobs:
           - image: revad-ceph
             tag: revad:${{ github.ref_name }}-ceph
     uses: ./.github/workflows/docker.yml
-    secrets: inherit
     with:
       file: docker/Dockerfile.${{ matrix.image }}
-      tag: ${{ secrets.DOCKERHUB_ORGANIZATION }}/${{ matrix.tag }}
+      tag: ${{ matrix.tag }}
       push: true