diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml
index 472480d..af34832 100644
--- a/.github/workflows/with-defaults.yml
+++ b/.github/workflows/with-defaults.yml
@@ -11,44 +11,26 @@ jobs:
       matrix:
         name: ["master"]
         openstack_version: ["master"]
-        ubuntu_version: ["22.04"]
+        ubuntu_version: ["24.04"]
         include:
-          - name: "master-22.04"
-            openstack_version: "master"
-            ubuntu_version: "22.04"
-            additional_services: "openstack-cli-server"
-          - name: "master-24.04"
-            openstack_version: "master"
+          - name: "gazpacho"
+            openstack_version: "stable/2026.1"
             ubuntu_version: "24.04"
-            additional_services: "openstack-cli-server"
-          - name: "flamingo-22.04"
-            openstack_version: "stable/2025.2"
-            ubuntu_version: "22.04"
-            additional_services: ""
-          - name: "flamingo-24.04"
+          - name: "flamingo"
             openstack_version: "stable/2025.2"
             ubuntu_version: "24.04"
-            additional_services: ""
-          - name: "epoxy-22.04"
-            openstack_version: "stable/2025.1"
-            ubuntu_version: "22.04"
-            additional_services: ""
           - name: "epoxy-24.04"
             openstack_version: "stable/2025.1"
             ubuntu_version: "24.04"
-            additional_services: ""
-          - name: "dalmatian-22.04"
-            openstack_version: "stable/2024.2"
+          - name: "epoxy-22.04"
+            openstack_version: "stable/2025.1"
             ubuntu_version: "22.04"
-            additional_services: "openstack-cli-server"
           - name: "dalmatian-24.04"
             openstack_version: "stable/2024.2"
             ubuntu_version: "24.04"
-            additional_services: "openstack-cli-server"
-          - name: "caracal-22.04"
-            openstack_version: "stable/2024.1"
+          - name: "dalmatian-22.04"
+            openstack_version: "stable/2024.2"
             ubuntu_version: "22.04"
-            additional_services: ""
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: A job to deploy devstack with defaults
     steps:
@@ -58,7 +40,7 @@ jobs:
         uses: ./
         with:
           branch: ${{ matrix.openstack_version }}
-          enabled_services: '${{ matrix.additional_services }}'
+          enabled_services: 'openstack-cli-server'
       - name: Upload logs artifacts on failure
         if: failure()
         uses: actions/upload-artifact@v4