diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index cb657ba5dc..1d9985de78 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -1577,6 +1577,7 @@ jobs:
         run: dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --winget-template-check ${{ steps.get-sha.outputs.pr_template_sha }}
 
   ci-completion-gate:
+    if: always() && !cancelled()
     name: CI Completion Gate
     needs:
       [
@@ -1592,8 +1593,10 @@ jobs:
       ]
     runs-on: ubuntu-latest
     steps:
-      - name: Mandatory Empty Step
-        run: exit 0
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@223e4bb7a751b91f43eda76992bcfbf23b8b0302
+        with:
+          jobs: ${{ toJSON(needs) }}
 
   deployment-gate:
     name: Deployment Start Gate
diff --git a/.github/workflows/scripts/rerunFlakyTests.js b/.github/workflows/scripts/rerunFlakyTests.js
index ae4cd73d90..b570c8c78b 100644
--- a/.github/workflows/scripts/rerunFlakyTests.js
+++ b/.github/workflows/scripts/rerunFlakyTests.js
@@ -10,7 +10,8 @@ const CONSIDERED_STEP_PREFIXES = [
 const CONSIDERED_JOBS = [
 	"Windows Live Tests",
 	"Linux Live Tests",
-	"Build .deb Package"
+	"Build .deb Package",
+	"CI Completion Gate"
 ];
 
 async function getFailedJobsForRun(github, context, workflowRunId, runAttempt) {
@@ -38,7 +39,7 @@ export async function rerunFlakyTests({ github, context }) {
 		context.payload.workflow_run.run_attempt
 	);
 
-	if (failingJobs.length > 3) {
+	if (failingJobs.length > 4) {
 		console.log("Many jobs failing. PROBABLY not flaky, Will not re-run.");
 		return;
 	}