diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 985f98fdb6..86197593a9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -117,13 +117,12 @@ jobs:
       - name: cargo clippy
         run: |
           cargo -Zgitoxide -Zgit clippy --locked --all-targets --features runtime-benchmarks -- -D warnings
-        # TODO: Windows should be compiled with CUDA as well once compilation succeeds
-        if: runner.os == 'macOS' || runner.os == 'Windows'
+        if: runner.os == 'macOS'
 
       - name: cargo clippy
         run: |
           cargo -Zgitoxide -Zgit clippy --locked --all-targets --features runtime-benchmarks,cuda -- -D warnings
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' || runner.os == 'Windows'
 
   cargo-docs:
     runs-on: ${{ fromJson(github.repository_owner == 'autonomys' && '["self-hosted", "ubuntu-20.04-x86-64"]' || '"ubuntu-22.04"') }}
diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
index c218beebdf..077d93ff6e 100644
--- a/.github/workflows/snapshot-build.yml
+++ b/.github/workflows/snapshot-build.yml
@@ -210,14 +210,13 @@ jobs:
       - name: Build farmer
         run: |
           cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer
-        # TODO: Windows should be compiled with CUDA as well once compilation succeeds
-        if: runner.os == 'macOS' || runner.os == 'Windows' || !startsWith(matrix.build.target, 'x86_64')
+        if: runner.os == 'macOS' || !startsWith(matrix.build.target, 'x86_64')
 
       - name: Build farmer
         run: |
           cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer --features cuda
         # TODO: We don't configure CUDA for cross-compilation purposes, hence only x86-64 for now
-        if: (runner.os == 'Linux') && startsWith(matrix.build.target, 'x86_64')
+        if: (runner.os == 'Linux' || runner.os == 'Windows') && startsWith(matrix.build.target, 'x86_64')
 
       - name: Build node
         run: |