diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d24df04..0ef7eef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
     windows:
-        runs-on: windows-latest
+        runs-on: ${{matrix.os}}
         name: "Windows: Build and test"
         defaults:
             run:
@@ -18,10 +18,19 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]
+                os: [ windows-2019, windows-2022 ]
+                php: ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3","8.4"]
                 arch: [x86, x64]
                 ts: [nts, ts]
                 experimental: [false]
+                exclude:
+                  - { os: windows-2019, php: "8.4" }
+                  - { os: windows-2019, php: "8.3" }
+                  - { os: windows-2019, php: "8.2" }
+                  - { os: windows-2019, php: "8.1" }
+                  - { os: windows-2019, php: "8.0" }
+                  - { os: windows-2022, php: "7.4" }
+                  - { os: windows-2022, php: "7.3" }
         steps:
                 - name: Checkout Repository
                   uses: actions/checkout@v3
@@ -36,11 +45,12 @@ jobs:
                     echo $extension_version >> $env:GITHUB_ENV
                 - name: Setup PHP
                   id: setup-php
-                  uses: php/setup-php-sdk@v0.8
+                  uses: php/setup-php-sdk@v0.10
                   with:
                       version: ${{matrix.php}}
                       arch: ${{matrix.arch}}
                       ts: ${{matrix.ts}}
+                      cache: true
                 - name: Enable Developer Command Prompt
                   uses: ilammy/msvc-dev-cmd@v1
                   with:
@@ -70,6 +80,8 @@ jobs:
                     if ('8.0' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
                     if ('8.1' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
                     if ('8.2' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
+                    if ('8.3' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs16' }
+                    if ('8.4' -eq '${{matrix.php}}') { $artifact_name = $artifact_name + '-vs17' }
 
                     if ('nts' -eq '${{matrix.ts}}') { $artifact_name = $artifact_name + '-nts' }
                     if ('x64' -eq '${{matrix.arch}}') { $artifact_name = $artifact_name + '-x86_64' }
diff --git a/composer.json b/composer.json
index 1cca064..eeb70e1 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,13 @@
         "php": ">=5.4"
     },
     "php-ext": {
+        "extension-name": "timezonedb",
         "priority": 20,
-        "configure-options": []
+        "configure-options": [
+            {
+                "name": "enable-timezonedb",
+                "description": "Enable timezonedb support"
+            }
+        ]
     }
 }