diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b3c1c40f..e6c0c7d7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@
 
 <!-- must be filled out completely to be considered for merging -->
 **Contributor Checklist**:
-- [ ] Did you set `dev` as the base branch?
+- [ ] Did you set `main` as the base branch?
 - [ ] Did you delete any extraneous prints/debugging code?
 - [ ] (If applicable) Did you add documentation for the feature?
 - [ ] (If applicable) Did you add a test demonstrating the PR?
diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh
index e056921d..f7d94189 100755
--- a/.github/scripts/check-commit.sh
+++ b/.github/scripts/check-commit.sh
@@ -49,12 +49,7 @@ search () {
 
 submodules=("cva6" "ibex" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip" "riscv-sodor")
 dir="generators"
-if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
-then
-    branches=("master" "main")
-else
-    branches=("master" "main" "dev")
-fi
+branches=("master" "main" "dev")
 search
 
 submodules=("riscv-gnu-toolchain" "riscv-isa-sim" "riscv-pk" "riscv-tests")
@@ -81,22 +76,12 @@ search
 
 submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
 dir="software"
-if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
-then
-    branches=("master")
-else
-    branches=("master" "dev")
-fi
+branches=("master" "dev")
 search
 
 submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "rocket-dsp-utils" "torture")
 dir="tools"
-if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
-then
-    branches=("master")
-else
-    branches=("master" "dev")
-fi
+branches=("master" "dev")
 search
 
 submodules=("dromajo-src")
@@ -106,12 +91,7 @@ search
 
 submodules=("firesim")
 dir="sims"
-if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
-then
-    branches=("master")
-else
-    branches=("master" "dev")
-fi
+branches=("master" "dev")
 search
 
 submodules=("hammer")
diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml
index 245bfd74..b6193c5f 100644
--- a/.github/workflows/chipyard-run-tests.yml
+++ b/.github/workflows/chipyard-run-tests.yml
@@ -1,11 +1,9 @@
 name: chipyard-ci-process
 
 on:
-  # run ci on pull requests targeting dev, master, main only (since the ci runs on the merge commit)
+  # run ci on pull requests targeting main only (since the ci runs on the merge commit)
   pull_request:
     branches:
-      - dev
-      - master
       - main
 
 env: