diff --git a/.gitmodules b/.gitmodules
index 4e35f605..01aa80c0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -97,9 +97,3 @@
 [submodule "generators/fft-generator"]
 	path = generators/fft-generator
 	url = https://github.com/ucb-bar/FFTGenerator.git
-[submodule "toolchains/esp-tools"]
-	path = toolchains/esp-tools
-	url = https://github.com/ucb-bar/esp-tools-feedstock.git
-[submodule "toolchains/riscv-tools"]
-	path = toolchains/riscv-tools
-	url = https://github.com/ucb-bar/riscv-tools-feedstock.git
diff --git a/scripts/conda-requirements.yaml b/scripts/conda-requirements.yaml
index d3d7bd31..31220e4c 100644
--- a/scripts/conda-requirements.yaml
+++ b/scripts/conda-requirements.yaml
@@ -1,7 +1,8 @@
 name: chipyard
 channels:
-  - conda-forge
   - ucb-bar
+  - conda-forge
+  - nodefaults
 dependencies:
   # firemarshal deps
   - python=3.9
@@ -22,7 +23,7 @@ dependencies:
   - readline
   - coreutils
   - lzop
-  - qemu # from ucb-bar
+  - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
 
   # doc requirements
   - sphinx
@@ -44,7 +45,7 @@ dependencies:
   - verilator==4.034
 
   # chipyard deps
-  - dromajo # from ucb-bar
+  - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
 
   # other misc. deps
   - ca-certificates
diff --git a/toolchains/esp-tools b/toolchains/esp-tools
deleted file mode 160000
index a1af866e..00000000
--- a/toolchains/esp-tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a1af866ef834b951c1566c1b517406980578c6d4
diff --git a/toolchains/riscv-tools b/toolchains/riscv-tools
deleted file mode 160000
index eb4848b3..00000000
--- a/toolchains/riscv-tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eb4848b39ccd873447e65a5ff93b6c4b2c992e7b