diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index 211d5ef0..632063c0 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -76,8 +76,8 @@ mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
 mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"
 
 mapping["constellation"]=" SUB_PROJECT=constellation"
-mapping["firesim"]="SCALA_TEST=firesim.firesim.RocketNICF1Tests"
-mapping["fireboom"]="SCALA_TEST=firesim.firesim.BoomF1Tests"
+mapping["firesim"]="TARGET_CONFIG=WithNIC_DDR3FRFCFSLLC4MB_FireSimRocketConfig"
+mapping["fireboom"]="TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimLargeBoomConfig"
 mapping["icenet"]="SUB_PROJECT=icenet"
 mapping["testchipip"]="SUB_PROJECT=testchipip"
 mapping["rocketchip-amba"]="SUB_PROJECT=rocketchip CONFIG=AMBAUnitTestConfig"
diff --git a/.github/scripts/remote-run-firesim-scala-tests.sh b/.github/scripts/remote-run-firesim-scala-tests.sh
index 5d9a970d..69f28c52 100755
--- a/.github/scripts/remote-run-firesim-scala-tests.sh
+++ b/.github/scripts/remote-run-firesim-scala-tests.sh
@@ -13,10 +13,8 @@ source $SCRIPT_DIR/defaults.sh
 cd $REMOTE_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh
 
-# Run Firesim Scala Tests
+# Test firesim compile and metasim
 export FIRESIM_ENV_SOURCED=1
-export COURSIER_CACHE=$REMOTE_COURSIER_CACHE
-export JVM_MEMORY=10G
-export JAVA_TMP_DIR=$REMOTE_JAVA_TMP_DIR
-export TEST_DISABLE_VIVADO=1
-make -C $REMOTE_FIRESIM_DIR TARGET_SBT_PROJECT="{file:$REMOTE_CHIPYARD_DIR}firechip" testOnly ${mapping[$1]}
+cd $REMOTE_FIRESIM_DIR
+make TARGET_PROJECT=firesim EMUL=verilator ${mapping[$1]} run-verilator SIM_BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-simple
+
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
index 56f56506..dea63638 100755
--- a/scripts/build-setup.sh
+++ b/scripts/build-setup.sh
@@ -271,7 +271,8 @@ if run_step "6"; then
             echo $CYDIR
             source sourceme-manager.sh --skip-ssh-setup
             pushd sim
-            make sbt SBT_COMMAND="project {file:$CYDIR}firechip; compile" TARGET_PROJECT=firesim
+            make target-classpath
+            make firesim-main-classpath
             popd
         )
         exit_if_last_command_failed
diff --git a/sims/firesim b/sims/firesim
index ac8bcd8b..c0117464 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit ac8bcd8b349d89637750fb20e77545818df4ff2d
+Subproject commit c011746410594213fc229bd94cdeb17e506646eb