diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef3eaa55b..d0eacff20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
         shard_file:
           - shard.yml
         postgres_version:
@@ -44,11 +47,12 @@ jobs:
             crystal_version: latest
             postgres_version: 14
             experimental: true
+            os: ubuntu-latest
           - shard_file: shard.override.yml
             crystal_version: nightly
             postgres_version: 14
             experimental: true
-        os: [ubuntu-latest, windows-latest]
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     services: