diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index 25bffb6a..8022a470 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -9,12 +9,11 @@ REMOTE_MAKE_NPROC=4
 VERILATOR_VERSION=v4.034
 
 HOME=$GITHUB_WORKSPACE
-CURRENT_BRANCH=$(git branch --show-current)
 
 # remote variables
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
-REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-$CURRENT_BRANCH
+REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME//\//-}
 REMOTE_WORK_DIR=$GITHUB_WORKSPACE
 REMOTE_RISCV_DIR=$GITHUB_WORKSPACE/riscv-tools-install
 REMOTE_ESP_DIR=$GITHUB_WORKSPACE/esp-tools-install
diff --git a/sims/firesim b/sims/firesim
index 9636f8f8..eab25ae1 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 9636f8f874671f8d1a3b8509d95febc34222a66f
+Subproject commit eab25ae18fb669a8d70b9b170160645e1e13c75f