diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a197e9..93fe6ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,30 +119,6 @@ unit_test windows/x86:
     - linux-build
   timeout: 5m
 
-build linux/ubuntu/2204/amd64/gcc:
-  <<: *build_linux_ubuntu_gcc
-  image: ubuntu:22.04
-
-unit_test linux/ubuntu/2204/amd64/gcc:
-  <<: *test_linux_ubuntu_gcc
-  image: ubuntu:22.04
-  dependencies:
-    - build linux/ubuntu/2204/amd64/gcc
-  needs:
-    - build linux/ubuntu/2204/amd64/gcc
-
-build linux/ubuntu/2204/amd64/clang:
-  <<: *build_linux_ubuntu_clang
-  image: ubuntu:22.04
-
-unit_test linux/ubuntu/2204/amd64/clang:
-  <<: *test_linux_ubuntu_clang
-  image: ubuntu:22.04
-  dependencies:
-    - build linux/ubuntu/2204/amd64/clang
-  needs:
-    - build linux/ubuntu/2204/amd64/clang
-
 build linux/ubuntu/2404/amd64/gcc:
   <<: *build_linux_ubuntu_gcc
   image: ubuntu:24.04
@@ -167,6 +143,30 @@ unit_test linux/ubuntu/2404/amd64/clang:
   needs:
     - build linux/ubuntu/2404/amd64/clang
 
+build linux/ubuntu/2604/amd64/gcc:
+  <<: *build_linux_ubuntu_gcc
+  image: ubuntu:26.04
+
+unit_test linux/ubuntu/2604/amd64/gcc:
+  <<: *test_linux_ubuntu_gcc
+  image: ubuntu:26.04
+  dependencies:
+    - build linux/ubuntu/2604/amd64/gcc
+  needs:
+    - build linux/ubuntu/2604/amd64/gcc
+
+build linux/ubuntu/2604/amd64/clang:
+  <<: *build_linux_ubuntu_clang
+  image: ubuntu:26.04
+
+unit_test linux/ubuntu/2604/amd64/clang:
+  <<: *test_linux_ubuntu_clang
+  image: ubuntu:26.04
+  dependencies:
+    - build linux/ubuntu/2604/amd64/clang
+  needs:
+    - build linux/ubuntu/2604/amd64/clang
+
 #-------------------------------------------------------------------------------
 # Fedora
 #-------------------------------------------------------------------------------
@@ -243,30 +243,6 @@ unit_test linux/ubuntu/2404/amd64/clang:
     - linux-build
   timeout: 5m
 
-build linux/fedora/42/amd64/gcc:
-  <<: *build_linux_fedora_gcc
-  image: fedora:42
-
-unit_test linux/fedora/42/amd64/gcc:
-  <<: *test_linux_fedora_gcc
-  image: fedora:42
-  dependencies:
-    - build linux/fedora/42/amd64/gcc
-  needs:
-    - build linux/fedora/42/amd64/gcc
-
-build linux/fedora/42/amd64/clang:
-  <<: *build_linux_fedora_clang
-  image: fedora:42
-
-unit_test linux/fedora/42/amd64/clang:
-  <<: *test_linux_fedora_clang
-  image: fedora:42
-  dependencies:
-    - build linux/fedora/42/amd64/clang
-  needs:
-    - build linux/fedora/42/amd64/clang
-
 build linux/fedora/43/amd64/gcc:
   <<: *build_linux_fedora_gcc
   image: fedora:43
@@ -291,6 +267,30 @@ unit_test linux/fedora/43/amd64/clang:
   needs:
     - build linux/fedora/43/amd64/clang
 
+build linux/fedora/44/amd64/gcc:
+  <<: *build_linux_fedora_gcc
+  image: fedora:44
+
+unit_test linux/fedora/44/amd64/gcc:
+  <<: *test_linux_fedora_gcc
+  image: fedora:44
+  dependencies:
+    - build linux/fedora/44/amd64/gcc
+  needs:
+    - build linux/fedora/44/amd64/gcc
+
+build linux/fedora/44/amd64/clang:
+  <<: *build_linux_fedora_clang
+  image: fedora:44
+
+unit_test linux/fedora/44/amd64/clang:
+  <<: *test_linux_fedora_clang
+  image: fedora:44
+  dependencies:
+    - build linux/fedora/44/amd64/clang
+  needs:
+    - build linux/fedora/44/amd64/clang
+
 #-------------------------------------------------------------------------------
 # Python Module
 #-------------------------------------------------------------------------------