diff --git a/.github/workflows/ci-baseline.yml b/.github/workflows/ci-baseline.yml
index f9c9c0f..a1c7a55 100644
--- a/.github/workflows/ci-baseline.yml
+++ b/.github/workflows/ci-baseline.yml
@@ -23,17 +23,17 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - fedora-clang-17
-          - fedora-gnu-13
-          - ubuntu-clang-14
-          - ubuntu-gnu-11
+          - fedora-clang17
+          - fedora-gnu13
+          - ubuntu-clang14
+          - ubuntu-gnu11
         build_type:
           - Release
           - Debug
         cmake_extra_args:
           - ''
         include:
-          - image: ubuntu-clang-14
+          - image: ubuntu-clang14
             build_type: Release
             cmake_extra_args: '-D CMAKE_CXX_STANDARD=20 -D PRESSIO_ENABLE_CXX20=ON'
 
diff --git a/.github/workflows/ci-kokkos.yml b/.github/workflows/ci-kokkos.yml
index dce0051..84adb18 100644
--- a/.github/workflows/ci-kokkos.yml
+++ b/.github/workflows/ci-kokkos.yml
@@ -23,8 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - ubuntu-gnu-kokkos-cpu-serial-11
-          - ubuntu-gnu-kokkos-cpu-openmp-11
+          - ubuntu-gnu11-kokkos-cpu-serial
+          - ubuntu-gnu11-kokkos-cpu-openmp
         build_type:
           - Debug
 
diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml
index 0e07b16..a93e32a 100644
--- a/.github/workflows/ci-trilinos.yml
+++ b/.github/workflows/ci-trilinos.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - ubuntu-gnu-trilinos-11
+          - ubuntu-gnu11-trilinos
         tag:
           - 0dc4553
           - 5bbda25