diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh
index dc94146f..1332ce8d 100755
--- a/.github/scripts/check-commit.sh
+++ b/.github/scripts/check-commit.sh
@@ -52,11 +52,37 @@ dir="generators"
 branches=("master" "main" "dev")
 search
 
-submodules=("riscv-tools" "esp-tools")
-dir="toolchains"
+submodules=("esp-tools-feedstock")
+dir="toolchains/esp-tools"
 branches=("main")
 search
 
+submodules=("riscv-isa-sim" "riscv-pk" "riscv-tests")
+dir="toolchains/esp-tools"
+branches=("master")
+search
+
+submodules=("riscv-tools-feedstock")
+dir="toolchains/riscv-tools"
+branches=("main")
+search
+
+submodules=("riscv-isa-sim" "riscv-pk" "riscv-tests")
+dir="toolchains/riscv-tools"
+branches=("master")
+search
+
+# riscv-openocd doesn't use its master branch
+submodules=("riscv-openocd")
+dir="toolchains/riscv-tools"
+branches=("riscv")
+search
+
+submodules=("libgloss")
+dir="toolchains"
+branches=("master")
+search
+
 submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
 dir="software"
 branches=("master" "dev")
diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh
index 80631b8c..5d79dd8d 100755
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -84,7 +84,8 @@ cd "$CHIPYARD_DIR"
         # Call the given subcommand (shell function) on each submodule
         # path to temporarily exclude during the recursive update
         for name in \
-            toolchains/* \
+            toolchains/*-tools/* \
+            toolchains/libgloss \
             generators/sha3 \
             generators/gemmini \
             sims/firesim \