diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index eddcd80f266fe5..0ea553cfda2335 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -35,7 +35,7 @@ jobs:
       labels: |
         org.opencontainers.image.description=Nightly build image used for testing purposes
       flavor: |
-        latest=true
+        latest=auto
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
@@ -56,7 +56,7 @@ jobs:
       labels: |
         org.opencontainers.image.description=Nightly build image used for testing purposes
       flavor: |
-        latest=true
+        latest=auto
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
index f0fc8b0db729e3..945315d52d4bb8 100644
--- a/.github/workflows/rebase-needed.yml
+++ b/.github/workflows/rebase-needed.yml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   label-rebase-needed:
     runs-on: ubuntu-latest
-    if: github.repository == 'mastodon/mastodon'
+    if: github.repository == 'glitch-soc/mastodon'
 
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}