diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml
index 5935fc560c..15d8c59683 100644
--- a/.github/workflows/nightly-release.yaml
+++ b/.github/workflows/nightly-release.yaml
@@ -41,4 +41,4 @@ jobs:
         with:
           context: .
           push: true
-          tags: nightly,${{ steps.short_sha.outputs.short_sha }}
+          tags: ghcr.io/jef/streetmerchant:nightly,ghcr.io/jef/streetmerchant:${{ steps.short_sha.outputs.short_sha }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index be63c072d2..82d711f1a8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -41,11 +41,11 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: github
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
-          tags: latest,${{ needs.release.outputs.tag_name_no_v }}
+          tags: ghcr.io/jef/streetmerchant:latest,ghcr.io/jef/streetmerchant:${{ needs.release.outputs.tag_name_no_v }}