diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 1329d8d..702801f 100755
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -1,14 +1,5 @@
 #!/usr/bin/env sh
 set -eou pipefail
 
-if [ "$BUILDKITE_BRANCH" = "master" ]; then
-  branch_type="master"
-  build_agent="build-restricted"
-else
-  branch_type="development"
-  build_agent="build-unrestricted"
-fi
-
-export BRANCH_TYPE="$branch_type"
-export BUILD_ROLE="arn:aws:iam::226140413739:role/build-role-$branch_type-cfparams"
-export BUILD_AGENT="$build_agent"
\ No newline at end of file
+export BUILD_ROLE="arn:aws:iam::226140413739:role/build-role-master-cfparams"
+export BUILD_AGENT="build-restricted"
\ No newline at end of file
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 8ab8872..38be2cb 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -1,7 +1,7 @@
 steps:
   - block: "Release build"
     branches:
-      - master
+      - main
     fields:
       - select: "Prerelease?"
         key: "release-type"
@@ -21,7 +21,7 @@ steps:
 
   - label: ":github: Trigger release"
     branches:
-      - master
+      - main
     command: "bin/ci_trigger_release"
     agents:
       queue: ${BUILD_AGENT}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ea9e2e9..eac8ac1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,7 +1,7 @@
 name: Release
 
 on:
-  # Release from master branch will be triggered by Buildkite,
+  # Release from main branch will be triggered by Buildkite,
   # passing a signing key and allowing a release-ready
   # build to be created.
   repository_dispatch: