diff --git a/.github/scripts/run-parallel-vcs-metasims.py b/.github/scripts/run-parallel-vcs-metasims.py
index 7d9034cf..23ec5f15 100755
--- a/.github/scripts/run-parallel-vcs-metasims.py
+++ b/.github/scripts/run-parallel-vcs-metasims.py
@@ -58,7 +58,7 @@ def run_parallel_metasim():
                     else:
                         print(f"Workload {workload} successful.")
 
-            run_w_timeout(f"{ci_env['GITHUB_WORKSPACE']}/deploy/workloads/ci/hello-world-localhost-vcs-metasim.yaml", "45m")
+            run_w_timeout(f"{ci_env['REMOTE_WORK_DIR']}/deploy/workloads/ci/hello-world-localhost-vcs-metasim.yaml", "45m")
 
 if __name__ == "__main__":
     execute(run_parallel_metasim, hosts=["localhost"])
diff --git a/.github/scripts/run-xclbin-buildbitstream.py b/.github/scripts/run-xclbin-buildbitstream.py
index 1f96756b..7ad1678b 100755
--- a/.github/scripts/run-xclbin-buildbitstream.py
+++ b/.github/scripts/run-xclbin-buildbitstream.py
@@ -65,7 +65,7 @@ def run_xclbin_buildbitstream():
                         if "- firesim" in line:
                             # comment out AWS specific lines
                             byf.write("# " + line + '\n')
-                        elif "- {hwdb_entry_to_gen}" in line:
+                        elif f"- {hwdb_entry_to_gen}" in line:
                             # remove comment
                             byf.write(line.replace("# ", '') + '\n')
                         elif 'default_build_dir:' in line:
diff --git a/.github/workflows/firesim-run-tests.yml b/.github/workflows/firesim-run-tests.yml
index 059b88db..99693d90 100644
--- a/.github/workflows/firesim-run-tests.yml
+++ b/.github/workflows/firesim-run-tests.yml
@@ -440,22 +440,22 @@ jobs:
       - name: Check Vitis docs components that require manual re-generation (e.g. config_runtime.yaml example)
         run: ./.github/scripts/check-vitis-docs-generated-components.py
 
-  run-parallel-vcs-metasims-and-vitis-driver:
-    name: run-parallel-vcs-metasims-and-vitis-driver
-    needs: [setup-local-fpga-repo]
-    runs-on: local-fpga
-    steps:
-      # This forces a fresh clone of the repo during the `checkout` step
-      # to resolve stale submodule URLs. See https://github.com/ucb-bar/chipyard/pull/1156.
-      - name: Delete old checkout
-        run: |
-          rm -rf ${{ github.workspace }}/* || true
-          rm -rf ${{ github.workspace }}/.* || true
-      - uses: actions/checkout@v3
-      - name: Run parallel VCS metasims
-        run: .github/scripts/run-parallel-vcs-metasims.py
-      - name: Build Vitis driver
-        run: .github/scripts/build-vitis-driver.py
+  #run-parallel-vcs-metasims-and-vitis-driver:
+  #  name: run-parallel-vcs-metasims-and-vitis-driver
+  #  needs: [setup-local-fpga-repo]
+  #  runs-on: local-fpga
+  #  steps:
+  #    # This forces a fresh clone of the repo during the `checkout` step
+  #    # to resolve stale submodule URLs. See https://github.com/ucb-bar/chipyard/pull/1156.
+  #    - name: Delete old checkout
+  #      run: |
+  #        rm -rf ${{ github.workspace }}/* || true
+  #        rm -rf ${{ github.workspace }}/.* || true
+  #    - uses: actions/checkout@v3
+  #    - name: Run parallel VCS metasims
+  #      run: .github/scripts/run-parallel-vcs-metasims.py
+  #    - name: Build Vitis driver
+  #      run: .github/scripts/build-vitis-driver.py
 
   run-basic-linux-poweroff-vitis:
     if: contains(github.event.pull_request.labels.*.name, 'ci:fpga-deploy')