diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index 24deca0d..051deefd 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -101,7 +101,7 @@ case $1 in
         run_asm ${mapping[$1]}
         ;;
     chipyard-ibex)
-        make run-binary-fast -C $LOCAL_SIM_DIR ${mapping[$1]} BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/multiply.riscv
+        run_bmark ${mapping[$1]}
         ;;
     chipyard-nvdla)
         make -C $LOCAL_CHIPYARD_DIR/tests
diff --git a/.gitmodules b/.gitmodules
index d19a3eb1..caac6751 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -142,4 +142,4 @@
 	url = https://github.com/ucb-bar/rocket-dsp-utils
 [submodule "generators/ibex"]
 	path = generators/ibex
-	url = https://github.com/schwarz-em/ibex-wrapper
+	url = https://github.com/ucb-bar/ibex-wrapper
diff --git a/generators/chipyard/src/main/scala/config/IbexConfigs.scala b/generators/chipyard/src/main/scala/config/IbexConfigs.scala
index ef4f52ac..b38b22f1 100644
--- a/generators/chipyard/src/main/scala/config/IbexConfigs.scala
+++ b/generators/chipyard/src/main/scala/config/IbexConfigs.scala
@@ -8,7 +8,8 @@ import freechips.rocketchip.config.{Config}
 // Ibex Configs
 // ---------------------
 
+// Multi-core and 32b heterogeneous configs are supported
+
 class IbexConfig extends Config(
-  new chipyard.config.WithBootROM ++               // Ibex reset vector is at 0x80
-  new ibex.WithNIbexCores(1) ++                    // single Ibex core
+  new ibex.WithNIbexCores(1) ++
   new chipyard.config.AbstractConfig)
\ No newline at end of file