diff --git a/.drone.jsonnet b/.drone.jsonnet
index 1096978..62d8807 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -142,27 +142,6 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
         { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a', ADDRMD: '32,64' },
     ),
 
-    linux_pipeline(
-        "Linux 20.04 GCC 9* ARM64 UBSAN",
-        "cppalliance/droneubuntu2004:multiarch",
-        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a' } + ubsan,
-        arch="arm64",
-    ),
-
-    linux_pipeline(
-        "Linux 20.04 GCC 9* ARM64 ASAN",
-        "cppalliance/droneubuntu2004:multiarch",
-        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a' } + asan,
-        arch="arm64",
-    ),
-
-    linux_pipeline(
-        "Linux 20.04 GCC 9* S390x UBSAN",
-        "cppalliance/droneubuntu2004:multiarch",
-        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a' } + ubsan,
-        arch="s390x",
-    ),
-
     linux_pipeline(
         "Linux 20.04 GCC 10 32/64",
         "cppalliance/droneubuntu2004:1",
@@ -176,6 +155,27 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
         { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a', ADDRMD: '32,64' },
     ),
 
+    linux_pipeline(
+        "Linux 22.04 GCC 11* ARM64 UBSAN",
+        "cppalliance/droneubuntu2204:multiarch",
+        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a' } + ubsan,
+        arch="arm64",
+    ),
+
+    linux_pipeline(
+        "Linux 22.04 GCC 11* ARM64 ASAN",
+        "cppalliance/droneubuntu2204:multiarch",
+        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a' } + asan,
+        arch="arm64",
+    ),
+
+    linux_pipeline(
+        "Linux 22.04 GCC 11* S390x UBSAN",
+        "cppalliance/droneubuntu2204:multiarch",
+        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14,17,2a' } + ubsan,
+        arch="s390x",
+    ),
+
     linux_pipeline(
         "Linux 22.04 GCC 12 32/64 UBSAN",
         "cppalliance/droneubuntu2204:1",