diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 2ec6b3d4b..ae4c2aff9 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -13,15 +13,14 @@ jobs:
       - uses: docker/setup-buildx-action@v1
       - uses: docker/login-action@v1
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - uses: docker/metadata-action@v3
         id: meta
         with:
-          images: ghcr.io/${{ github.repository_owner }}/mastodon
+          images: tootsuite/mastodon
           flavor: |
-            latest=true
+            latest=auto
           tags: |
             type=edge,branch=main
             type=semver,pattern={{ raw }}
@@ -30,5 +29,5 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest
+          cache-from: type=registry,ref=tootsuite/mastodon:latest
           cache-to: type=inline