diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml
index ec293b49..bb10727c 100644
--- a/.github/workflows/quic.yml
+++ b/.github/workflows/quic.yml
@@ -127,7 +127,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['windows-2022']
-        tls: [schannel] # , openssl, openssl3]
+        tls: [schannel, openssl, openssl3]
     uses: microsoft/msquic/.github/workflows/build-reuse-win.yml@main
     with:
       os: ${{ matrix.os }}
@@ -154,7 +154,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: 'ubuntu-20.04'
+          - os: 'ubuntu-22.04'
             tls: 'openssl'
           - os: 'ubuntu-22.04'
             tls: 'openssl3'
diff --git a/.github/workflows/quic_matrix.json b/.github/workflows/quic_matrix.json
index ff7a2c56..bdceca8c 100644
--- a/.github/workflows/quic_matrix.json
+++ b/.github/workflows/quic_matrix.json
@@ -1,13 +1,18 @@
 [
     { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "openssl3", "io": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "azure", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl",  "io": "epoll", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl3", "io": "epoll", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "openssl3", "io": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "xdp", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "lab",   "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl",  "io": "epoll" },
+    { "env": "lab",   "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl3", "io": "epoll" },
     { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp" },
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "openssl3", "io": "iocp" },
     { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp" },
-    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" },
-    { "env": "lab",   "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl",  "io": "epoll" }
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" }
 ]