diff --git a/.github/scripts/workflow-monitor.py b/.github/scripts/workflow-monitor.py
index bcf41646..0a8d4ed9 100755
--- a/.github/scripts/workflow-monitor.py
+++ b/.github/scripts/workflow-monitor.py
@@ -60,9 +60,9 @@ def main(platform: Platform, issue_id: int):
 
                 print(f"Workflow {ci_env['GITHUB_RUN_ID']} status: {state_status} {state_concl}")
 
-                # check that select instances are terminated on time
+                # check that select instances are terminated on time (45m for run farm insts, 12h for build farm insts)
                 platform_lib.check_and_terminate_run_farm_instances(45, ci_env['GITHUB_RUN_ID'], issue_id)
-                platform_lib.check_and_terminate_build_farm_instances(12, ci_env['GITHUB_RUN_ID'], issue_id)
+                platform_lib.check_and_terminate_build_farm_instances(12*60, ci_env['GITHUB_RUN_ID'], issue_id)
 
                 if state_status in ['completed']:
                     if state_concl in TERMINATE_STATES:
diff --git a/.github/workflows/firesim-run-tests.yml b/.github/workflows/firesim-run-tests.yml
index 6bc5b4c9..c555968b 100644
--- a/.github/workflows/firesim-run-tests.yml
+++ b/.github/workflows/firesim-run-tests.yml
@@ -138,7 +138,7 @@ jobs:
   #      if: ${{ (env.CI_LABEL_DEBUG != 'true') }}
   #      uses: ./.github/actions/setup-workflow-monitor
   #      with:
-  #        max-runtime-hours: 4
+  #        max-runtime-hours: 8
   #    - name: Initial Scala compilation
   #      uses: ./.github/actions/initial-scala-compile
   #    - name: Catch potentially orphaned manager