diff --git a/.github/workflows/check-unit-tests-intel.yml b/.github/workflows/check-unit-tests-intel.yml
index 426a267d6..f1cd12eeb 100644
--- a/.github/workflows/check-unit-tests-intel.yml
+++ b/.github/workflows/check-unit-tests-intel.yml
@@ -11,7 +11,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  cancel-nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Nightly Tests
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          workflow_id: nightly-tests.yml
+          all_but_latest: true
+
   unit-tests-llvm-16-debug:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -23,6 +33,7 @@ jobs:
         run: ./scripts/unit_tests.sh debug llvm-16
         shell: bash
   unit-tests-llvm-16-release:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -34,6 +45,7 @@ jobs:
         run: ./scripts/unit_tests.sh release llvm-16
         shell: bash
   unit-tests-llvm-17-debug:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -45,6 +57,7 @@ jobs:
         run: ./scripts/unit_tests.sh debug llvm-17
         shell: bash
   unit-tests-llvm-17-release:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -56,6 +69,7 @@ jobs:
         run: ./scripts/unit_tests.sh release llvm-17
         shell: bash
   unit-tests-llvm-18-debug:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -67,6 +81,7 @@ jobs:
         run: ./scripts/unit_tests.sh debug llvm-18
         shell: bash
   unit-tests-llvm-18-release:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -78,6 +93,7 @@ jobs:
         run: ./scripts/unit_tests.sh release llvm-18
         shell: bash
   unit-tests-llvm-19-debug:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
@@ -89,6 +105,7 @@ jobs:
         run: ./scripts/unit_tests.sh debug llvm-19
         shell: bash
   unit-tests-llvm-19-release:
+    needs: cancel-nightly
     runs-on: X64
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/compile-and-cache-main.yml b/.github/workflows/compile-and-cache-main.yml
index 2388bfc92..704cc0acc 100644
--- a/.github/workflows/compile-and-cache-main.yml
+++ b/.github/workflows/compile-and-cache-main.yml
@@ -1,3 +1,5 @@
+name: Compile and Cache Main
+
 on:
   push:
     branches:
@@ -5,7 +7,17 @@ on:
   workflow_dispatch:
 
 jobs:
+  cancel-nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Nightly Tests
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          workflow_id: nightly-tests.yml
+          all_but_latest: true
+
   build:
+    needs: cancel-nightly
     runs-on: [self-hosted, X64]
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
index b1ba5a245..1e6861705 100644
--- a/.github/workflows/nightly-tests.yml
+++ b/.github/workflows/nightly-tests.yml
@@ -1,8 +1,8 @@
-name: Nightly Tests
+name: Nightly Tests Intel GPUs
 
 on:
   schedule:
-    - cron: '*/5 * * * *'  # Run every 5 minutes
+    - cron: '* * * * *' 
   workflow_dispatch:  # Allows manual triggering
 
 concurrency:
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index df4c156b3..61d2b4cbc 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,7 +7,17 @@ on:
     branches: [ main ]
 
 jobs:
+  cancel-nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Nightly Tests
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          workflow_id: nightly-tests.yml
+          all_but_latest: true
+
   docker:
+    needs: cancel-nightly
     runs-on: [self-hosted, Linux, X64]
     steps:
     - uses: actions/checkout@v3
diff --git a/scripts/unit_tests.sh b/scripts/unit_tests.sh
index 3ed327513..3ee50f528 100755
--- a/scripts/unit_tests.sh
+++ b/scripts/unit_tests.sh
@@ -142,7 +142,7 @@ else
   if [ "$host" = "salami" ]; then
     CHIP_OPTIONS="-DCHIP_MALI_GPU_WORKAROUNDS=ON -DCHIP_SKIP_TESTS_WITH_DOUBLES=ON"
   else
-    CHIP_OPTIONS="-DCHIP_BUILD_HIPBLAS=ON"
+    CHIP_OPTIONS="-DCHIP_BUILD_HIPBLAS=ON -DCHIP_BUILD_HIPFFT=ON"
   fi
   # Build the project
   echo "Building project..."