diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a424c514..5cdcb557 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,48 +21,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#       version:
-#         - '1.10'
-#         - '1.11'
-#      os:
-#         - ubuntu-latest
-#         - macOS-latest
-#         - windows-latest
-#       arch:
-#         - x64
-#       pocl: [jll,]
-        include:
-          - version: '1.10'
-            os: ubuntu-latest
+        version: ['1.10', '1.11']
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-13, macOS-15, windows-2025]
+        arch: [x64, arm64]
+        pocl: [jll, local]
+        exclude:
+          - os: ubuntu-24.04
+            arch: arm64
+          - os: windows-2025
+            arch: arm64
+          - os: ubuntu-24.04-arm
             arch: x64
-            pocl: local
-            allow_failure: false
-          - version: '1.11'
-            os: ubuntu-latest
+          # macOS 13 is Intel-only, while macOS 14+ only support Apple Silicon
+          - os: macOS-15
             arch: x64
+          - os: macOS-13
+            arch: arm64
+          - os: macOS-13
             pocl: local
-            allow_failure: false
-          - version: '1.12'
-            os: ubuntu-latest
-            arch: x64
+          - os: macOS-15
             pocl: local
-            allow_failure: false
-#          - version: 'nightly'
-#            os: ubuntu-latest
-#            arch: x64
-#            pocl: local
-#            allow_failure: true
-#          - version: 'nightly'
-#            os: ubuntu-latest
-#            arch: x64
-#            pocl: local
-#            allow_failure: true
-#          - version: 'nightly'
-#            os: ubuntu-latest
-#            arch: x64
-#            pocl: jll
-#            allow_failure: true
-#          
+          - os: windows-2025
+            pocl: local    
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/install-juliaup@v2
@@ -151,8 +131,21 @@ jobs:
           '
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
+        if: runner.os != 'Windows'
         with:
           annotate: true
+      - name: Setup BusyBox
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          Invoke-WebRequest https://frippery.org/files/busybox/busybox64.exe -OutFile C:\Windows\drop.exe
+      - name: Test KernelAbstractions.jl (de-escalated)
+        if: runner.os == 'Windows'
+        shell: drop -c "julia '{0}'"
+        run: |
+          using Pkg
+          Pkg.activate(".")
+          Pkg.test()
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v4
         with:
diff --git a/Project.toml b/Project.toml
index 3119fc9e..acd4e89d 100644
--- a/Project.toml
+++ b/Project.toml
@@ -18,6 +18,16 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 pocl_jll = "627d6b7a-bbe6-5189-83e7-98cc0a5aeadd"
 
+[weakdeps]
+EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[extensions]
+EnzymeExt = "EnzymeCore"
+LinearAlgebraExt = "LinearAlgebra"
+SparseArraysExt = "SparseArrays"
+
 [compat]
 Adapt = "0.4, 1.0, 2.0, 3.0, 4"
 Atomix = "0.1, 1"
@@ -33,18 +43,9 @@ SparseArrays = "<0.0.1, 1.6"
 StaticArrays = "0.12, 1.0"
 UUIDs = "<0.0.1, 1.6"
 julia = "1.10"
-
-[extensions]
-EnzymeExt = "EnzymeCore"
-LinearAlgebraExt = "LinearAlgebra"
-SparseArraysExt = "SparseArrays"
+pocl_jll = "7"
 
 [extras]
 EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-
-[weakdeps]
-EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"