diff --git a/.github/workflows/janitor.yml b/.github/workflows/janitor.yml
deleted file mode 100644
index e6401dbc87..0000000000
--- a/.github/workflows/janitor.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Janitor
-# Janitor cleans up previous runs of various workflows
-# Cancels Sims and Tests
-on:
-  pull_request:
-
-jobs:
-  cancel:
-    name: "Cancel Previous Runs"
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    steps:
-      - uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          workflow_id: 872925,1013614,1134055
-          access_token: ${{ github.token }}
diff --git a/.github/workflows/proto-docker.yml b/.github/workflows/proto-docker.yml
index 67480d5d6b..83dbd38bc3 100644
--- a/.github/workflows/proto-docker.yml
+++ b/.github/workflows/proto-docker.yml
@@ -7,6 +7,9 @@ on:
     paths:
       - "contrib/devtools/dockerfile"
 
+permissions:
+  contents: read
+  
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release-sims.yml b/.github/workflows/release-sims.yml
index 457eae3292..02726e7e82 100644
--- a/.github/workflows/release-sims.yml
+++ b/.github/workflows/release-sims.yml
@@ -30,6 +30,7 @@ jobs:
   test-sim-multi-seed-long:
     runs-on: ubuntu-latest
     needs: [build, install-runsim]
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v2.1.7
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
index b2752ebe4e..ba7c4b7eef 100644
--- a/.github/workflows/sims.yml
+++ b/.github/workflows/sims.yml
@@ -8,6 +8,13 @@ on:
       - master
 
 jobs:
+  cleanup-runs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: rokroskar/workflow-run-cleanup-action@master
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
   build:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip-sims')"
@@ -39,6 +46,7 @@ jobs:
   test-sim-nondeterminism:
     runs-on: ubuntu-latest
     needs: [build, install-runsim]
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -65,6 +73,7 @@ jobs:
   test-sim-import-export:
     runs-on: ubuntu-latest
     needs: [build, install-runsim]
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -93,6 +102,7 @@ jobs:
   test-sim-after-import:
     runs-on: ubuntu-latest
     needs: [build, install-runsim]
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -121,6 +131,7 @@ jobs:
   test-sim-multi-seed-short:
     runs-on: ubuntu-latest
     needs: [build, install-runsim]
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
diff --git a/.github/workflows/test-race.yml b/.github/workflows/test-race.yml
index 31e8fdbe73..2036ed406a 100644
--- a/.github/workflows/test-race.yml
+++ b/.github/workflows/test-race.yml
@@ -6,7 +6,19 @@ on:
   push:
     branches:
       - master
+
+permissions:
+  contents: read
+  
 jobs:
+  cleanup-runs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: rokroskar/workflow-run-cleanup-action@master
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+
   install-tparse:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2b55fd8c96..d310fa346b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,18 @@ on:
   push:
     branches:
       - master
+
+permissions:
+  contents: read
+  
 jobs:
+  cleanup-runs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: rokroskar/workflow-run-cleanup-action@master
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
   build:
     runs-on: ubuntu-latest
     strategy: