diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f17569a..d487d4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 defaults:
   run:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6016f7d..759d86d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -7,10 +7,10 @@ permissions:
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
   workflow_dispatch:
   schedule:
     - cron: '0 6 * * *'
@@ -86,7 +86,7 @@ jobs:
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
       - name: Login to GHCR
         uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
-        if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
+        if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
         with:
           registry: ghcr.io
           username: rust-lang
@@ -94,7 +94,7 @@ jobs:
 
       - name: Login to Docker Hub
         uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
-        if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
+        if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
         with:
           username: rustopsbot
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -154,6 +154,6 @@ jobs:
           platforms: ${{ matrix.platforms }}
           build-args: |
             RUST_VERSION=nightly-${{ steps.date.outputs.date }}
-          push: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master' }}
+          push: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/x.py b/x.py
index 4202882..46892d0 100755
--- a/x.py
+++ b/x.py
@@ -334,6 +334,7 @@ def generate_stackbrew_library():
              Scott Schafer <schaferjscott@gmail.com> (@Muscraft),
              Jakub Beránek <berykubik@gmail.com> (@kobzol)
 GitRepo: https://github.com/rust-lang/docker-rust.git
+GitFetch: refs/heads/main
 """
 
     for release in debian_releases: