diff --git a/.github/workflows/azure-deploy-f24.yml b/.github/workflows/azure-deploy-f24.yml
index 24eaa1530f..b4e07c5e84 100644
--- a/.github/workflows/azure-deploy-f24.yml
+++ b/.github/workflows/azure-deploy-f24.yml
@@ -4,17 +4,24 @@
 name: Build and deploy Node.js app to Azure Web App - nodebb-f24
 
 on:
-  workflow_run:
-      workflows: [Lint and test]
-      branches: [f24]
-      types:
-        - completed
+  push:
+    branches:
+      - f24
   workflow_dispatch:
+    
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
 
 jobs:
+  lint-and-test:
+    uses:
+      .github/workflows/test.yaml
+
   build-and-deploy:
-    # Run only on the CMU-313 repo, and either if manually deployed via UI or if the Lint & Test succeeded
-    if: github.repository == 'cmu-313/NodeBB' && (github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success')
+    if: github.repository == 'cmu-313/NodeBB'
+    needs: lint-and-test
+
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4aa5f448fe..c4e8f090bd 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,12 +1,10 @@
 name: Lint and test
 
 on:
-  push:
-    branches:
-      - f24
   pull_request:
     branches:
       - f24
+  workflow_call: # Usually called from deploy
 
 defaults:
   run: