diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bd0117..3988b70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         # Remember if you commit this, newly built images will replace those tags.
         # Prefer incrementing the version to unused one
-        tag: [11-mingw32, 11-jammy, 11-jammy32, 11-noble, 11-noble32, 11-noblevcpkg]
+        tag: [11-mingw32, 11-ubuntu26.04, 11-ubuntu26.04.32, 11-ubuntu26.04.vcpkg]
     env:
       dockertag: ${{ matrix.tag }}
       REGISTRY: ghcr.io
diff --git a/11/noble32/Dockerfile b/11/ubuntu26.04.32/Dockerfile
similarity index 96%
rename from 11/noble32/Dockerfile
rename to 11/ubuntu26.04.32/Dockerfile
index f282330..5ef3fca 100644
--- a/11/noble32/Dockerfile
+++ b/11/ubuntu26.04.32/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386 \
diff --git a/11/noblevcpkg/Dockerfile b/11/ubuntu26.04.vcpkg/Dockerfile
similarity index 97%
rename from 11/noblevcpkg/Dockerfile
rename to 11/ubuntu26.04.vcpkg/Dockerfile
index 0fb542b..08915ce 100644
--- a/11/noblevcpkg/Dockerfile
+++ b/11/ubuntu26.04.vcpkg/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386 \
diff --git a/11/noble/Dockerfile b/11/ubuntu26.04/Dockerfile
similarity index 96%
rename from 11/noble/Dockerfile
rename to 11/ubuntu26.04/Dockerfile
index d1867ee..00bda3c 100644
--- a/11/noble/Dockerfile
+++ b/11/ubuntu26.04/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
@@ -21,3 +21,4 @@ RUN apt-get update \
         pkg-config \
     && update-ca-certificates \
     && rm -rf /var/lib/apt/lists/*
+