diff --git a/.github/workflows/test-query-engine-template.yml b/.github/workflows/test-query-engine-template.yml
index 77df6c42f95..408c5752e65 100644
--- a/.github/workflows/test-query-engine-template.yml
+++ b/.github/workflows/test-query-engine-template.yml
@@ -14,7 +14,7 @@ on:
         required: true
       ubuntu:
         type: string
-        default: 'latest'
+        required: true
       single_threaded:
         type: boolean
         default: false
diff --git a/.github/workflows/test-query-engine.yml b/.github/workflows/test-query-engine.yml
index c5d8b835452..a76e66050e5 100644
--- a/.github/workflows/test-query-engine.yml
+++ b/.github/workflows/test-query-engine.yml
@@ -122,8 +122,10 @@ jobs:
         database:
           - name: "mssql_2022"
             version: "2022"
+            ubuntu: "latest"
           - name: "mssql_2019"
             version: "2019"
+            ubuntu: "latest"
           - name: "mssql_2017"
             version: "2017"
             ubuntu: "20.04"
diff --git a/.github/workflows/test-schema-engine.yml b/.github/workflows/test-schema-engine.yml
index 7d9f76b69a8..a661fd0554c 100644
--- a/.github/workflows/test-schema-engine.yml
+++ b/.github/workflows/test-schema-engine.yml
@@ -62,7 +62,6 @@ jobs:
         database:
           - name: mssql_2017
             url: "sqlserver://localhost:1434;database=master;user=SA;password=<YourStrong@Passw0rd>;trustServerCertificate=true;socket_timeout=60;isolationLevel=READ UNCOMMITTED"
-            ubuntu: "20.04"
           - name: mssql_2019
             url: "sqlserver://localhost:1433;database=master;user=SA;password=<YourStrong@Passw0rd>;trustServerCertificate=true;socket_timeout=60;isolationLevel=READ UNCOMMITTED"
           - name: mssql_2022
@@ -105,7 +104,7 @@ jobs:
             is_vitess: true
             single_threaded: true
 
-    runs-on: "ubuntu-${{ matrix.database.ubuntu || 'latest' }}"
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1