diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index c0869bf5..c192f0c0 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -14,10 +14,17 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  cancel-previous-runs:
-    name: Cancel Previous Workflow Runs
-    runs-on: ubuntu-latest
+  fmt:
+    runs-on: ubuntu-22.04
+
     steps:
+    - uses: actions/checkout@v4
+    - uses: Swatinem/rust-cache@v2
+    - uses: ./.github/actions/setup
+
+    - name: Cancel Previous Workflow Runs
+      uses: styfle/cancel-workflow-action
+
     - name: Checkout code
       uses: actions/checkout@v4
 
@@ -26,15 +33,6 @@ jobs:
       with:
         access_token: ${{ github.token }}
         workflow_id: ${{ github.workflow }}
-
-  fmt:
-    runs-on: ubuntu-22.04
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: Swatinem/rust-cache@v2
-    - uses: ./.github/actions/setup
-
     - name: Setup SSH
       uses: webfactory/ssh-agent@v0.5.3
       with:
@@ -54,6 +52,9 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - uses: ./.github/actions/setup
 
+    - name: Cancel Previous Workflow Runs
+      uses: styfle/cancel-workflow-action
+
     - name: Setup SSH
       uses: webfactory/ssh-agent@v0.5.3
       with:
@@ -74,6 +75,9 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/setup
 
+    - name: Cancel Previous Workflow Runs
+      uses: styfle/cancel-workflow-action
+
     - name: Install psvm
       run: |
         cargo install --git https://github.com/paritytech/psvm psvm
@@ -90,6 +94,9 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - uses: ./.github/actions/setup
 
+      - name: Cancel Previous Workflow Runs
+        uses: styfle/cancel-workflow-action
+
       - name: Checkout the source code
         uses: actions/checkout@v3
 
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 4323a60a..ef640bbb 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -13,19 +13,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  cancel-previous-runs:
-    name: Cancel Previous Workflow Runs
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.9.1
-      with:
-        access_token: ${{ github.token }}
-        workflow_id: ${{ github.workflow }}
-
   block-production:
     runs-on: ubuntu-latest
 
@@ -34,6 +21,9 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - uses: ./.github/actions/setup
 
+    - name: Cancel Previous Workflow Runs
+      uses: styfle/cancel-workflow-action
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1