diff --git a/util/alpine.sh b/util/alpine.sh
index 96c3929..d18c36a 100755
--- a/util/alpine.sh
+++ b/util/alpine.sh
@@ -77,6 +77,9 @@ case "$1" in
     3.20)
         alp 3.20 "main community"
         ;;
+    3.21)
+        alp 3.21 "main community"
+        ;;
     old)
         $0 3.0
         $0 3.1
@@ -95,12 +98,13 @@ case "$1" in
         $0 3.14
         $0 3.15
         $0 3.16
+        $0 3.17
         ;;
     current)
-        $0 3.17 # till 2024-11-22
         $0 3.18 # till 2025-05-09
         $0 3.19 # till 2025-11-01
         $0 3.20 # till 2026-04-01
+        $0 3.21 # till 2026-11-01
         ;;
     all)
         $0 old
diff --git a/util/ubuntu.sh b/util/ubuntu.sh
index b6b2581..de27b6e 100755
--- a/util/ubuntu.sh
+++ b/util/ubuntu.sh
@@ -185,14 +185,14 @@ case $1 in
         $0 impish
         $0 kinetic
         $0 lunar
+        $0 mantic
         ;;
     current)
         $0 bionic   # until 2028-04
         $0 focal    # until 2030-04
         $0 jammy    # until 2032-04
-        $0 mantic   # until 2024-07
         $0 noble    # until 2034-04
-        #$0 oracular # until 2025-07
+        $0 oracular # until 2025-07
         ;;
     all)
         $0 old