Merge ~cjdc/ubuntu-docker-images/+git/templates:fix-ubuntu-bionic-docs into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

[Cristovao Cordeiro]

Update all docs

feat: improve docs to better support EOL

fix: delete ubuntu.md since it is auto-generated

[Tomáš Virtus (virtustom)]

78afbb3e lgtm

review: Approve

diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md
index 4549ece..17eec3d 100644
--- a/docs/docker.io/ubuntu/apache2.md
+++ b/docs/docker.io/ubuntu/apache2.md
@@ -10,17 +10,17 @@ The Apache HTTP Server Project's goal is to build a secure, efficient and extens
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.4-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.4-21.10_beta` | -  | -  | Apache2 2.4.48 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.4-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.4-22.04_beta`** | - | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-21.10_beta` | - | Apache2 2.4.48 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-20.04_beta` | - | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md
index dc7f21c..583aab5 100644
--- a/docs/docker.io/ubuntu/bind9.md
+++ b/docs/docker.io/ubuntu/bind9.md
@@ -10,17 +10,17 @@ BIND 9 provides software for Domain Name System (DNS) management including both 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`9.18-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `9.16-21.10_beta` | -  | -  | Bind9 9.16.15 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `9.16-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`9.18-22.04_beta`** | - | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-21.10_beta` | - | Bind9 9.16.15 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-20.04_beta` | - | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md
index 3fbb412..cfd3526 100644
--- a/docs/docker.io/ubuntu/cassandra.md
+++ b/docs/docker.io/ubuntu/cassandra.md
@@ -21,15 +21,15 @@ Apache Cassandra is an open source NoSQL distributed database trusted by thousan
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`4.0-22.04_beta`** | -  | -  | Apache Cassandra 4.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`4.0-22.04_beta`** | - | Apache Cassandra 4.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/chiselled-jre.md b/docs/docker.io/ubuntu/chiselled-jre.md
index 487e86b..cc73d03 100644
--- a/docs/docker.io/ubuntu/chiselled-jre.md
+++ b/docs/docker.io/ubuntu/chiselled-jre.md
@@ -16,15 +16,15 @@ Read more about chiselled Ubuntu for OpenJRE, a new class of OCI images, on [the
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`8-22.04_edge`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu 22.04 LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`8-22.04_edge`** | - | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu 22.04 LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md
index 75f155b..9604a51 100644
--- a/docs/docker.io/ubuntu/cortex.md
+++ b/docs/docker.io/ubuntu/cortex.md
@@ -17,15 +17,15 @@ Read more on the [Cortex website](https://cortexmetrics.io/).
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.11-22.04_beta`** | -  | -  | Cortex 1.11 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.11-22.04_beta`** | - | Cortex 1.11 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/dotnet-aspnet.md b/docs/docker.io/ubuntu/dotnet-aspnet.md
index 2cb6f96..ffcda05 100644
--- a/docs/docker.io/ubuntu/dotnet-aspnet.md
+++ b/docs/docker.io/ubuntu/dotnet-aspnet.md
@@ -21,18 +21,18 @@ If you're looking for the .NET runtime (without ASP.NET), please then look at th
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Chiselled ASP.NET 6.0 on Ubuntu 22.04 LTS | `amd64`, `arm64` |
- | `7.0-23.04_edge` | -  | -  | Chiselled ASP.NET 7.0 on Ubuntu 23.04  | `amd64`, `arm64` |
- | `7.0-22.10_edge` | -  | -  | Chiselled ASP.NET 7.0 on Ubuntu 22.10  | `amd64`, `arm64` |
- | `6.0-21.10_edge` | -  | -  | Chiselled ASP.NET 6.0 on Ubuntu 21.10  | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.0-22.04_beta`** | - | Chiselled ASP.NET 6.0 on Ubuntu 22.04 LTS | `amd64`, `arm64` |
+ | `7.0-23.04_edge` | - | Chiselled ASP.NET 7.0 on Ubuntu 23.04 null | `amd64`, `arm64` |
+ | `7.0-22.10_edge` | - | Chiselled ASP.NET 7.0 on Ubuntu 22.10 null | `amd64`, `arm64` |
+ | `6.0-21.10_edge` | - | Chiselled ASP.NET 6.0 on Ubuntu 21.10 null | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/dotnet-deps.md b/docs/docker.io/ubuntu/dotnet-deps.md
index 4fc3d52..78626b9 100644
--- a/docs/docker.io/ubuntu/dotnet-deps.md
+++ b/docs/docker.io/ubuntu/dotnet-deps.md
@@ -19,18 +19,18 @@ If you're looking for the .NET or the ASP.NET runtime images, please have a look
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Chiselled .NET Deps 6.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `7.0-23.04_edge` | -  | -  | Chiselled .NET Deps 7.0 on Ubuntu 23.04  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `7.0-22.10_edge` | -  | -  | Chiselled .NET Deps 7.0 on Ubuntu 22.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `6.0-21.10_edge` | -  | -  | Chiselled .NET Deps 6.0 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.0-22.04_beta`** | - | Chiselled .NET Deps 6.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.0-23.04_edge` | - | Chiselled .NET Deps 7.0 on Ubuntu 23.04 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.0-22.10_edge` | - | Chiselled .NET Deps 7.0 on Ubuntu 22.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.10_edge` | - | Chiselled .NET Deps 6.0 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/dotnet-runtime.md b/docs/docker.io/ubuntu/dotnet-runtime.md
index 9641aec..1d6b8b5 100644
--- a/docs/docker.io/ubuntu/dotnet-runtime.md
+++ b/docs/docker.io/ubuntu/dotnet-runtime.md
@@ -21,18 +21,18 @@ If you're looking to publish an ASP.NET app, please then look at the `ubuntu/dot
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Chiselled .NET 6.0 on Ubuntu 22.04 LTS | `amd64`, `arm64` |
- | `7.0-23.04_edge` | -  | -  | Chiselled .NET 7.0 on Ubuntu 23.04  | `amd64`, `arm64` |
- | `7.0-22.10_edge` | -  | -  | Chiselled .NET 7.0 on Ubuntu 22.10  | `amd64`, `arm64` |
- | `6.0-21.10_edge` | -  | -  | Chiselled .NET 6.0 on Ubuntu 21.10  | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.0-22.04_beta`** | - | Chiselled .NET 6.0 on Ubuntu 22.04 LTS | `amd64`, `arm64` |
+ | `7.0-23.04_edge` | - | Chiselled .NET 7.0 on Ubuntu 23.04 null | `amd64`, `arm64` |
+ | `7.0-22.10_edge` | - | Chiselled .NET 7.0 on Ubuntu 22.10 null | `amd64`, `arm64` |
+ | `6.0-21.10_edge` | - | Chiselled .NET 6.0 on Ubuntu 21.10 null | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md
index 5a0f86e..76719bd 100644
--- a/docs/docker.io/ubuntu/grafana.md
+++ b/docs/docker.io/ubuntu/grafana.md
@@ -10,15 +10,15 @@ Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Ela
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`8.2-22.04_beta`** | -  | -  | Grafana™ software 8.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`8.2-22.04_beta`** | - | Grafana™ software 8.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/kafka.md b/docs/docker.io/ubuntu/kafka.md
index f2d40ce..e18a39d 100644
--- a/docs/docker.io/ubuntu/kafka.md
+++ b/docs/docker.io/ubuntu/kafka.md
@@ -10,15 +10,15 @@ Apache Kafka is an open-source distributed event streaming platform for high-per
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`3.1-22.04_beta`** | -  | -  | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`3.1-22.04_beta`** | - | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/loki.md b/docs/docker.io/ubuntu/loki.md
index 403c841..b0fd816 100644
--- a/docs/docker.io/ubuntu/loki.md
+++ b/docs/docker.io/ubuntu/loki.md
@@ -10,15 +10,15 @@ Loki is a horizontally scalable, highly available, multi-tenant log aggregation 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.4-22.04_beta`** | -  | -  | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.4-22.04_beta`** | - | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md
index a24861f..1489f77 100644
--- a/docs/docker.io/ubuntu/memcached.md
+++ b/docs/docker.io/ubuntu/memcached.md
@@ -10,17 +10,17 @@ Memcached is an in-memory key-value store for small chunks of arbitrary data (st
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.6-22.04_beta`** | -  | -  | Memcached 1.6 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.6-21.10_beta` | -  | -  | Memcached 1.6.9 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.5-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.6-22.04_beta`** | - | Memcached 1.6 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.6-21.10_beta` | - | Memcached 1.6.9 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.5-20.04_beta` | - | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
@@ -35,7 +35,7 @@ If your usage includes commercial redistribution, or requires ESM or unavailable
 Launch this image locally:
 
 ```sh
-docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.5-20.04_beta
+docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-22.04_beta
 ```
 
 #### Parameters
@@ -100,7 +100,7 @@ In this case you can append the flags themselves or a shell script to the run co
 Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`.
 
 Download
-[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.5-20.04_beta`), then:
+[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-22.04_beta`), then:
 
 ```sh
 kubectl apply -f memcached-deployment.yml
diff --git a/docs/docker.io/ubuntu/mlflow.md b/docs/docker.io/ubuntu/mlflow.md
index 0a8b88f..665d94f 100644
--- a/docs/docker.io/ubuntu/mlflow.md
+++ b/docs/docker.io/ubuntu/mlflow.md
@@ -10,15 +10,15 @@ MLflow is a platform to streamline machine learning development, including track
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.1.1_1.0-22.04_stable`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | MLflow 2.1.1_1.0 on Ubuntu 22.04 LTS | `amd64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.1.1_1.0-22.04_stable`** | - | MLflow 2.1.1_1.0 on Ubuntu 22.04 LTS | `amd64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md
index 363bcbc..9cb16fe 100644
--- a/docs/docker.io/ubuntu/mysql.md
+++ b/docs/docker.io/ubuntu/mysql.md
@@ -10,17 +10,17 @@ MySQL is a fast, stable and true multi-user, multi-threaded SQL database server.
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`8.0-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `8.0-21.10_beta` | -  | -  | MySQL™ software 8.0.27 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `8.0-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`8.0-22.04_beta`** | - | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-21.10_beta` | - | MySQL™ software 8.0.27 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-20.04_beta` | - | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md
index 18afed9..c548562 100644
--- a/docs/docker.io/ubuntu/nginx.md
+++ b/docs/docker.io/ubuntu/nginx.md
@@ -10,17 +10,17 @@ Nginx ("engine X") is a high-performance web and reverse proxy server created by
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.18-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.18-21.10_beta` | -  | -  | Nginx 1.18.0 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.18-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.18-22.04_beta`** | - | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-21.10_beta` | - | Nginx 1.18.0 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-20.04_beta` | - | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md
index af5d347..6db500f 100644
--- a/docs/docker.io/ubuntu/postgres.md
+++ b/docs/docker.io/ubuntu/postgres.md
@@ -10,17 +10,17 @@ PostgreSQL is a powerful, open source object-relational database system. It is f
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`14-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `13-21.10_beta` | -  | -  | Postgres 13.1 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `12-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`14-22.04_beta`** | - | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `13-21.10_beta` | - | Postgres 13.1 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `12-20.04_beta` | - | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md
index 6f9aaea..c6902a3 100644
--- a/docs/docker.io/ubuntu/prometheus-alertmanager.md
+++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md
@@ -10,15 +10,15 @@ The Alertmanager handles alerts sent by client applications such as the Promethe
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`0.23-22.04_beta`** | -  | -  | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`0.23-22.04_beta`** | - | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md
index d50cd2c..c474544 100644
--- a/docs/docker.io/ubuntu/prometheus.md
+++ b/docs/docker.io/ubuntu/prometheus.md
@@ -10,15 +10,15 @@ Prometheus is a systems and service monitoring system. It collects metrics from 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.33-22.04_beta`** | -  | -  | Prometheus 2.33 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.33-22.04_beta`** | - | Prometheus 2.33 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md
index a958668..f3abe8a 100644
--- a/docs/docker.io/ubuntu/redis.md
+++ b/docs/docker.io/ubuntu/redis.md
@@ -10,16 +10,16 @@ Redis is an open source (BSD licensed), in-memory data structure store, used as 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.2-22.04_beta`** | -  | -  | Redis™ software 6.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `6.0-21.10_beta` | -  | -  | Redis™ software 6.0.15 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.2-22.04_beta`** | - | Redis™ software 6.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.10_beta` | - | Redis™ software 6.0.15 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
@@ -34,7 +34,7 @@ If your usage includes commercial redistribution, or requires ESM or unavailable
 Launch this image locally:
 
 ```sh
-docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.10_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.2-22.04_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -72,7 +72,7 @@ This image also includes the `redis-cli` client for interactive container use:
 ```sh
 $ docker network create redis-network
 $ docker network connect redis-network redis-container
-$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network ubuntu/redis:6.2-22.04_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -90,7 +90,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.10_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md
index 90f91b9..2fa404b 100644
--- a/docs/docker.io/ubuntu/squid.md
+++ b/docs/docker.io/ubuntu/squid.md
@@ -10,17 +10,17 @@ Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It r
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`5.2-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.13-21.10_beta` | -  | -  | Squid 4.13 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.10-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)  | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`5.2-22.04_beta`** | - | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.13-21.10_beta` | - | Squid 4.13 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.10-20.04_beta` | - | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md
index 6540c57..ef1b995 100644
--- a/docs/docker.io/ubuntu/telegraf.md
+++ b/docs/docker.io/ubuntu/telegraf.md
@@ -10,16 +10,16 @@ Telegraf is an agent for collecting, processing, aggregating, and writing metric
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.21-22.04_beta`** | -  | -  | Telegraf™ software 1.21 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.19-21.10_beta` | -  | -  | Telegraf™ software 1.19.2 on Ubuntu 21.10  | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.21-22.04_beta`** | - | Telegraf™ software 1.21 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.19-21.10_beta` | - | Telegraf™ software 1.19.2 on Ubuntu 21.10 null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
@@ -34,7 +34,7 @@ If your usage includes commercial redistribution, or requires ESM or unavailable
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.19-21.10_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.21-22.04_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -68,7 +68,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.19-21.10_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.21-22.04_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/docs/docker.io/ubuntu/ubuntu.md b/docs/docker.io/ubuntu/ubuntu.md
deleted file mode 100644
index d46be3d..0000000
--- a/docs/docker.io/ubuntu/ubuntu.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Ubuntu
-
-**The Ubuntu container image maintained by Canonical.** Receives fast security updates, and rolls to a new version every six months.
-LTS releases every 2 years with a 5-year free security updates period. The Extended Security Maintenance (ESM) program provides up to 10-year security updates.
-[Read more](https://ubuntu.com/about/release-cycle).
-
-This repository is maintained by the Canonical team and receives security updates quicker than the [Ubuntu](https://hub.docker.com/_/ubuntu) image from the Docker Official Images library. Both are fine to use; however, please be sure to use this repository if you applied for [commercial support](https://ubuntu.com/security/docker-images#get-in-touch). **This repository is free to use and exempted from per-user rate limits.**
-
-
-## About Ubuntu
-
-![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
-
-Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
-
-## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) is a set of consistent, compliant, minimal and secure Ubuntu-based container images with Extended Security Maintenance (ESM) commitments from Canonical.
-
-## Tags and Architectures
-![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
-
-![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
-
-
-| Channel Tags | foo | | | Currently | Architectures |
-|---|---|---|---|---|---|
- | **`22.10_stable`** | **`22.10`, `22.10_beta`, `22.10_candidate`, `22.10_edge`, `kinetic`, `kinetic-22.10_edge`, `latest`** | -  | -  | Ubuntu 22.10 "Kinetic Kudu"  | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
- | `22.04_stable` | `22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `jammy`, `jammy-22.04_edge` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) <br>until 04/2027 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `focal`, `focal-20.04_edge` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) <br>until 04/2025 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa"  | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
- | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `bionic`, `bionic-18.04_edge` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) <br>until 04/2023 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver"  | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
- | `23.04_edge` | `23.04`, `edge`, `lunar`, `lunar-23.04_edge` | -  | -  | Ubuntu 23.04 "Lunar Lobster"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
-| _`track_risk`_ |
-
-_The following tags are not available in this repository but are shown here for completeness. [Contact Canonical for access](https://ubuntu.com/security/docker-images#get-in-touch)._
-
-| Channel Tag | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
-| _`16.04_stable`_ &nbsp;&nbsp; | - | 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
-| _`14.04_stable`_ &nbsp;&nbsp; | - | 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
-| _`track_risk`_ |
-
-
-Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
-
-### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
-
-## Usage
-
-Launch this image locally:
-
-```sh
-docker run -d --name ubuntu-container -e TZ=UTC  ubuntu/ubuntu:22.04_stable
-```
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f ubuntu-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it ubuntu-container /bin/bash
-```
-
-
-
-## Bugs and feature requests
-
-If you find a bug in our image or want to request a specific feature, please file a bug here:
-
-[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
-
-Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from:
-
-```sh
-docker images --no-trunc --quiet ubuntu/ubuntu:<tag>
-```
-
-
-## Deprecated channels & tags
-These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
-
-| Track | Version | EOL | Upgrade Path |
-|---|---|---|---|
- | ~~21.10-~~ | Ubuntu 21.10 "Impish Indri"  | 07/2022 | 22.04_stable |
- | ~~21.04-~~ | Ubuntu 21.04 "Hirsute Hippo"  | 01/2022 | ~~21.10~~ |
-| _`track`_ |
-
-## Licensing
-View [license information](https://www.ubuntu.com/about/about-ubuntu/licensing) for the software contained in this image.
-
-As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
-
-
diff --git a/docs/docker.io/ubuntu/zookeeper.md b/docs/docker.io/ubuntu/zookeeper.md
index ed1c96a..568b2a5 100644
--- a/docs/docker.io/ubuntu/zookeeper.md
+++ b/docs/docker.io/ubuntu/zookeeper.md
@@ -10,15 +10,15 @@ ZooKeeper is a centralized service for maintaining configuration information, na
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`3.1-22.04_beta`** | -  | -  | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`3.1-22.04_beta`** | - | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md
index 323ef7c..ec2a1c0 100644
--- a/docs/public.ecr.aws/lts/apache2.md
+++ b/docs/public.ecr.aws/lts/apache2.md
@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request 
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/apache2 but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.4-22.04_beta`** | 04/2027 | 04/2032 | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.4-20.04_beta` | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.4-22.04_beta`** | - | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-20.04_beta` | - | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md
index 92a046f..5f23816 100644
--- a/docs/public.ecr.aws/lts/bind9.md
+++ b/docs/public.ecr.aws/lts/bind9.md
@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/bind9 but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`9.18-22.04_beta`** | 04/2027 | 04/2032 | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `9.16-20.04_beta` | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`9.18-22.04_beta`** | - | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-20.04_beta` | - | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md
index 2b527f4..9fef39d 100644
--- a/docs/public.ecr.aws/lts/cassandra.md
+++ b/docs/public.ecr.aws/lts/cassandra.md
@@ -29,8 +29,8 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/cassandra but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/chiselled-jre.md b/docs/public.ecr.aws/lts/chiselled-jre.md
index e9611fe..a81b002 100644
--- a/docs/public.ecr.aws/lts/chiselled-jre.md
+++ b/docs/public.ecr.aws/lts/chiselled-jre.md
@@ -24,9 +24,9 @@ Up to 10 years customer security maintenance `from canonical/chiselled-jre`. [Re
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/chiselled-jre but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`8-22.04_edge`** | 04/2027 | 04/2032 | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`8-22.04_edge`** | - | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md
index 6e0a784..f46bee2 100644
--- a/docs/public.ecr.aws/lts/cortex.md
+++ b/docs/public.ecr.aws/lts/cortex.md
@@ -25,8 +25,8 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/cortex but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/dotnet-aspnet.md b/docs/public.ecr.aws/lts/dotnet-aspnet.md
index 251dd6a..8ea7a21 100644
--- a/docs/public.ecr.aws/lts/dotnet-aspnet.md
+++ b/docs/public.ecr.aws/lts/dotnet-aspnet.md
@@ -29,9 +29,9 @@ Up to 10 years customer security maintenance `from canonical/dotnet-aspnet`. [Re
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/dotnet-aspnet but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | 04/2027 | 04/2032 | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.0-22.04_beta`** | - | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/dotnet-deps.md b/docs/public.ecr.aws/lts/dotnet-deps.md
index 8ec64d7..7827bf3 100644
--- a/docs/public.ecr.aws/lts/dotnet-deps.md
+++ b/docs/public.ecr.aws/lts/dotnet-deps.md
@@ -27,9 +27,9 @@ Up to 10 years customer security maintenance `from canonical/dotnet-deps`. [Requ
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/dotnet-deps but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | 04/2027 | 04/2032 | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.0-22.04_beta`** | - | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/dotnet-runtime.md b/docs/public.ecr.aws/lts/dotnet-runtime.md
index 2e0b6c3..b82db01 100644
--- a/docs/public.ecr.aws/lts/dotnet-runtime.md
+++ b/docs/public.ecr.aws/lts/dotnet-runtime.md
@@ -29,9 +29,9 @@ Up to 10 years customer security maintenance `from canonical/dotnet-runtime`. [R
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/dotnet-runtime but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | 04/2027 | 04/2032 | Chiselled .NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.0-22.04_beta`** | - | Chiselled .NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md
index e62480e..953c66a 100644
--- a/docs/public.ecr.aws/lts/grafana.md
+++ b/docs/public.ecr.aws/lts/grafana.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request 
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/grafana but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/kafka.md b/docs/public.ecr.aws/lts/kafka.md
index 8a51d78..b5883f5 100644
--- a/docs/public.ecr.aws/lts/kafka.md
+++ b/docs/public.ecr.aws/lts/kafka.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/kafka but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/loki.md b/docs/public.ecr.aws/lts/loki.md
index 053eec7..9ca1216 100644
--- a/docs/public.ecr.aws/lts/loki.md
+++ b/docs/public.ecr.aws/lts/loki.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/loki but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md
index cf8c3c4..0700be1 100644
--- a/docs/public.ecr.aws/lts/memcached.md
+++ b/docs/public.ecr.aws/lts/memcached.md
@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/memcached but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.5-20.04_beta`** | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.5-20.04_beta`** | - | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md
index a239157..5772de5 100644
--- a/docs/public.ecr.aws/lts/mysql.md
+++ b/docs/public.ecr.aws/lts/mysql.md
@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/mysql but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`8.0-22.04_beta`** | 04/2027 | 04/2032 | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `8.0-20.04_beta` | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`8.0-22.04_beta`** | - | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-20.04_beta` | - | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md
index 110aa1c..9fca777 100644
--- a/docs/public.ecr.aws/lts/nginx.md
+++ b/docs/public.ecr.aws/lts/nginx.md
@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/nginx but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.18-22.04_beta`** | 04/2027 | 04/2032 | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.18-20.04_beta` | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.18-22.04_beta`** | - | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-20.04_beta` | - | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md
index 3e9a3cd..a236fa7 100644
--- a/docs/public.ecr.aws/lts/postgres.md
+++ b/docs/public.ecr.aws/lts/postgres.md
@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/postgres but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`14-22.04_beta`** | 04/2027 | 04/2032 | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `12-20.04_beta` | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`14-22.04_beta`** | - | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `12-20.04_beta` | - | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
index 2f22357..a22484c 100644
--- a/docs/public.ecr.aws/lts/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus-alertmanager but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md
index 70cd8af..fc98d7f 100644
--- a/docs/public.ecr.aws/lts/prometheus.md
+++ b/docs/public.ecr.aws/lts/prometheus.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/redis.md b/docs/public.ecr.aws/lts/redis.md
index bbd7367..4aa4d75 100644
--- a/docs/public.ecr.aws/lts/redis.md
+++ b/docs/public.ecr.aws/lts/redis.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/redis but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md
index 9f737e3..1e99710 100644
--- a/docs/public.ecr.aws/lts/squid.md
+++ b/docs/public.ecr.aws/lts/squid.md
@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/squid but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
- | **`5.2-22.04_beta`** | 04/2027 | 04/2032 | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.10-20.04_beta` | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`5.2-22.04_beta`** | - | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.10-20.04_beta` | - | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md
index 396d2e9..ba9ca94 100644
--- a/docs/public.ecr.aws/lts/telegraf.md
+++ b/docs/public.ecr.aws/lts/telegraf.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/telegraf but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/lts/ubuntu.md b/docs/public.ecr.aws/lts/ubuntu.md
deleted file mode 100644
index 4cf6972..0000000
--- a/docs/public.ecr.aws/lts/ubuntu.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Ubuntu
- 
-
-## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
-
-## About Ubuntu
-
-![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
-
-Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
-
-
-## Tags and Architectures
-![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance from this repository.
-
-![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from canonical/ubuntu`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
-
-<!-- _Tags in italics are not available in public.ecr.aws/lts/ubuntu but are shown here for completeness._ -->
-
-| Channel Tags  | |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|---|
- | **`22.04_stable`** | **`22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `edge`, `jammy`, `jammy-22.04_edge`, `latest`** | 04/2027 | 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | 04/2025 | 04/2030 | Ubuntu 20.04 LTS "Focal Fossa"  | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
- | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | 04/2023 | 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver"  | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
-| _`track_risk`_ |
-
-Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
-
-### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
-
diff --git a/docs/public.ecr.aws/lts/usage/redis.md b/docs/public.ecr.aws/lts/usage/redis.md
index fe20835..ad5094d 100644
--- a/docs/public.ecr.aws/lts/usage/redis.md
+++ b/docs/public.ecr.aws/lts/usage/redis.md
@@ -7,7 +7,7 @@
 Launch this image locally:
 
 ```sh
-docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.0-21.10_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.2-22.04_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -45,7 +45,7 @@ This image also includes the `redis-cli` client for interactive container use:
 ```sh
 $ docker network create redis-network
 $ docker network connect redis-network redis-container
-$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.2-22.04_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -63,7 +63,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.10_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/docs/public.ecr.aws/lts/usage/telegraf.md b/docs/public.ecr.aws/lts/usage/telegraf.md
index 618bd5c..a4a82fa 100644
--- a/docs/public.ecr.aws/lts/usage/telegraf.md
+++ b/docs/public.ecr.aws/lts/usage/telegraf.md
@@ -7,7 +7,7 @@
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.21-22.04_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -41,7 +41,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.21-22.04_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/docs/public.ecr.aws/lts/usage/ubuntu.md b/docs/public.ecr.aws/lts/usage/ubuntu.md
deleted file mode 100644
index 1c152b9..0000000
--- a/docs/public.ecr.aws/lts/usage/ubuntu.md
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-## Docker CLI
-
-Launch this image locally:
-
-```sh
-docker run -d --name ubuntu-container -e TZ=UTC  public.ecr.aws/ubuntu/ubuntu:22.04_stable
-```
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f ubuntu-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it ubuntu-container /bin/bash
-```
-
-
-
-## Bugs and feature requests
-
-If you find a bug in our image or want to request a specific feature, please file a bug here:
-
-[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
-
-Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from:
-
-```sh
-docker images --no-trunc --quiet public.ecr.aws/ubuntu/ubuntu:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/lts/zookeeper.md b/docs/public.ecr.aws/lts/zookeeper.md
index f68ae79..c6fe969 100644
--- a/docs/public.ecr.aws/lts/zookeeper.md
+++ b/docs/public.ecr.aws/lts/zookeeper.md
@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/zookeeper but are shown here for completeness._ -->
 
-| Channel Tags  |  ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-|---|---|---|---|---|
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
 | _`track_risk`_ |
 
 Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md
index faa02ff..6d7bb11 100644
--- a/docs/public.ecr.aws/ubuntu/apache2.md
+++ b/docs/public.ecr.aws/ubuntu/apache2.md
@@ -16,18 +16,18 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/apache2](https:
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/apache2`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.4-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2)  | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.4-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/apache2)  | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`2.4-22.04_beta`**_ | - | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-21.10_beta` | - | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/apache2, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/apache2, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`2.4-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2)  | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | _`2.4-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2)  | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`2.4-22.04_beta`**_ | - | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _`2.4-20.04_beta`_ | - | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md
index 0e17bcd..acd485a 100644
--- a/docs/public.ecr.aws/ubuntu/bind9.md
+++ b/docs/public.ecr.aws/ubuntu/bind9.md
@@ -16,18 +16,18 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/bind9](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`9.18-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9)  | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `9.16-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/bind9)  | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`9.18-22.04_beta`**_ | - | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-21.10_beta` | - | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/bind9, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/bind9, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`9.18-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9)  | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | _`9.16-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9)  | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`9.18-22.04_beta`**_ | - | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _`9.16-20.04_beta`_ | - | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md
index 90e22be..ddc00d1 100644
--- a/docs/public.ecr.aws/ubuntu/cassandra.md
+++ b/docs/public.ecr.aws/ubuntu/cassandra.md
@@ -26,9 +26,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/cassandra`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`4.0-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/cassandra)  | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`4.0-22.04_beta`** | - | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/chiselled-jre.md b/docs/public.ecr.aws/ubuntu/chiselled-jre.md
index 32cfac7..d1da671 100644
--- a/docs/public.ecr.aws/ubuntu/chiselled-jre.md
+++ b/docs/public.ecr.aws/ubuntu/chiselled-jre.md
@@ -22,16 +22,16 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/chiselled-jre](
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/chiselled-jre`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`8-22.04_edge`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/chiselled-jre)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/chiselled-jre)  | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`8-22.04_edge`**_ | - | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/chiselled-jre, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/chiselled-jre, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`8-22.04_edge`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/chiselled-jre)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/chiselled-jre)  | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`8-22.04_edge`**_ | - | Chiselled JRE (Java Runtime Environment) 8 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md
index 422f89e..28480f1 100644
--- a/docs/public.ecr.aws/ubuntu/cortex.md
+++ b/docs/public.ecr.aws/ubuntu/cortex.md
@@ -22,9 +22,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/cortex`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.11-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/cortex)  | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.11-22.04_beta`** | - | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/dotnet-aspnet.md b/docs/public.ecr.aws/ubuntu/dotnet-aspnet.md
index 40ccad2..a8e3f57 100644
--- a/docs/public.ecr.aws/ubuntu/dotnet-aspnet.md
+++ b/docs/public.ecr.aws/ubuntu/dotnet-aspnet.md
@@ -27,19 +27,19 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/dotnet-aspnet](
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/dotnet-aspnet`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-aspnet)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-aspnet)  | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
- | `7.0-23.04_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-aspnet)  | Chiselled ASP.NET 7.0 on Ubuntu&nbsp;23.04&nbsp; | `amd64`, `arm64` |
- | `7.0-22.10_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-aspnet)  | Chiselled ASP.NET 7.0 on Ubuntu&nbsp;22.10&nbsp; | `amd64`, `arm64` |
- | `6.0-21.10_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-aspnet)  | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`6.0-22.04_beta`**_ | - | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+ | `7.0-23.04_edge` | - | Chiselled ASP.NET 7.0 on Ubuntu&nbsp;23.04&nbsp;null | `amd64`, `arm64` |
+ | `7.0-22.10_edge` | - | Chiselled ASP.NET 7.0 on Ubuntu&nbsp;22.10&nbsp;null | `amd64`, `arm64` |
+ | `6.0-21.10_edge` | - | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/dotnet-aspnet, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/dotnet-aspnet, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`6.0-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-aspnet)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-aspnet)  | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`6.0-22.04_beta`**_ | - | Chiselled ASP.NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/dotnet-deps.md b/docs/public.ecr.aws/ubuntu/dotnet-deps.md
index 4901c5b..1e16734 100644
--- a/docs/public.ecr.aws/ubuntu/dotnet-deps.md
+++ b/docs/public.ecr.aws/ubuntu/dotnet-deps.md
@@ -25,19 +25,19 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/dotnet-deps](ht
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/dotnet-deps`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-deps)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-deps)  | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `7.0-23.04_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-deps)  | Chiselled .NET Deps 7.0 on Ubuntu&nbsp;23.04&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `7.0-22.10_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-deps)  | Chiselled .NET Deps 7.0 on Ubuntu&nbsp;22.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `6.0-21.10_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-deps)  | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`6.0-22.04_beta`**_ | - | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.0-23.04_edge` | - | Chiselled .NET Deps 7.0 on Ubuntu&nbsp;23.04&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.0-22.10_edge` | - | Chiselled .NET Deps 7.0 on Ubuntu&nbsp;22.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.10_edge` | - | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/dotnet-deps, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/dotnet-deps, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`6.0-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-deps)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-deps)  | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`6.0-22.04_beta`**_ | - | Chiselled .NET Deps 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/dotnet-runtime.md b/docs/public.ecr.aws/ubuntu/dotnet-runtime.md
index d872048..0d9266d 100644
--- a/docs/public.ecr.aws/ubuntu/dotnet-runtime.md
+++ b/docs/public.ecr.aws/ubuntu/dotnet-runtime.md
@@ -27,19 +27,19 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/dotnet-runtime]
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/dotnet-runtime`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.0-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-runtime)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-runtime)  | Chiselled .NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
- | `7.0-23.04_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-runtime)  | Chiselled .NET 7.0 on Ubuntu&nbsp;23.04&nbsp; | `amd64`, `arm64` |
- | `7.0-22.10_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-runtime)  | Chiselled .NET 7.0 on Ubuntu&nbsp;22.10&nbsp; | `amd64`, `arm64` |
- | `6.0-21.10_edge` | -  | [-](https://gallery.ecr.aws/lts/dotnet-runtime)  | Chiselled .NET 6.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`6.0-22.04_beta`**_ | - | Chiselled .NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+ | `7.0-23.04_edge` | - | Chiselled .NET 7.0 on Ubuntu&nbsp;23.04&nbsp;null | `amd64`, `arm64` |
+ | `7.0-22.10_edge` | - | Chiselled .NET 7.0 on Ubuntu&nbsp;22.10&nbsp;null | `amd64`, `arm64` |
+ | `6.0-21.10_edge` | - | Chiselled .NET 6.0 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/dotnet-runtime, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/dotnet-runtime, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`6.0-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-runtime)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/dotnet-runtime)  | Chiselled .NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`6.0-22.04_beta`**_ | - | Chiselled .NET 6.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md
index bb93f3b..6634545 100644
--- a/docs/public.ecr.aws/ubuntu/grafana.md
+++ b/docs/public.ecr.aws/ubuntu/grafana.md
@@ -15,9 +15,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/grafana`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`8.2-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/grafana)  | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`8.2-22.04_beta`** | - | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/kafka.md b/docs/public.ecr.aws/ubuntu/kafka.md
index 82b4bb2..162947e 100644
--- a/docs/public.ecr.aws/ubuntu/kafka.md
+++ b/docs/public.ecr.aws/ubuntu/kafka.md
@@ -15,9 +15,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/kafka`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`3.1-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/kafka)  | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`3.1-22.04_beta`** | - | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/loki.md b/docs/public.ecr.aws/ubuntu/loki.md
index 4c3c9da..f2988dc 100644
--- a/docs/public.ecr.aws/ubuntu/loki.md
+++ b/docs/public.ecr.aws/ubuntu/loki.md
@@ -15,9 +15,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/loki`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.4-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/loki)  | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.4-22.04_beta`** | - | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md
index c755896..64802ab 100644
--- a/docs/public.ecr.aws/ubuntu/memcached.md
+++ b/docs/public.ecr.aws/ubuntu/memcached.md
@@ -16,17 +16,17 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/memcached](http
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/memcached`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.6-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/memcached)  | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.6-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/memcached)  | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.6-22.04_beta`** | - | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.6-21.10_beta` | - | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/memcached, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/memcached, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`1.5-20.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached)  | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`1.5-20.04_beta`**_ | - | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md
index 1d0ba40..a4676b8 100644
--- a/docs/public.ecr.aws/ubuntu/mysql.md
+++ b/docs/public.ecr.aws/ubuntu/mysql.md
@@ -16,18 +16,18 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/mysql](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/mysql`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`8.0-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql)  | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `8.0-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/mysql)  | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`8.0-22.04_beta`**_ | - | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-21.10_beta` | - | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/mysql, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/mysql, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`8.0-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql)  | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | _`8.0-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql)  | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`8.0-22.04_beta`**_ | - | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _`8.0-20.04_beta`_ | - | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md
index da29bb0..cb237b4 100644
--- a/docs/public.ecr.aws/ubuntu/nginx.md
+++ b/docs/public.ecr.aws/ubuntu/nginx.md
@@ -16,18 +16,18 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/nginx](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/nginx`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.18-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx)  | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.18-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/nginx)  | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`1.18-22.04_beta`**_ | - | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-21.10_beta` | - | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/nginx, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/nginx, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`1.18-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx)  | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | _`1.18-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx)  | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`1.18-22.04_beta`**_ | - | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _`1.18-20.04_beta`_ | - | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md
index b200904..6312ba1 100644
--- a/docs/public.ecr.aws/ubuntu/postgres.md
+++ b/docs/public.ecr.aws/ubuntu/postgres.md
@@ -16,18 +16,18 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/postgres](https
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/postgres`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`14-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres)  | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `13-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/postgres)  | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`14-22.04_beta`**_ | - | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `13-21.10_beta` | - | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/postgres, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/postgres, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`14-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres)  | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | _`12-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres)  | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`14-22.04_beta`**_ | - | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _`12-20.04_beta`_ | - | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
index ba93f08..4dc57c8 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
@@ -15,9 +15,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/prometheus-alertmanager`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`0.23-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager)  | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`0.23-22.04_beta`** | - | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md
index 60cf2f2..9a4f3f9 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus.md
@@ -15,9 +15,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/prometheus`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`2.33-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/prometheus)  | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`2.33-22.04_beta`** | - | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md
index 4f3546b..9216a4d 100644
--- a/docs/public.ecr.aws/ubuntu/redis.md
+++ b/docs/public.ecr.aws/ubuntu/redis.md
@@ -15,10 +15,10 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/redis`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`6.2-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/redis)  | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `6.0-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/redis)  | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`6.2-22.04_beta`** | - | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.10_beta` | - | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md
index 85facfa..a0efd77 100644
--- a/docs/public.ecr.aws/ubuntu/squid.md
+++ b/docs/public.ecr.aws/ubuntu/squid.md
@@ -16,18 +16,18 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/squid](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/squid`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`5.2-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid)  | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.13-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/squid)  | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`5.2-22.04_beta`**_ | - | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.13-21.10_beta` | - | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-_The following tags might not be available in public.ecr.aws/ubuntu/squid, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
+_The following tags might not be available in public.ecr.aws/ubuntu/squid, but can be requested via Canonical's [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | _**`5.2-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid)  | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | _`4.10-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid)  | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid)  | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | _**`5.2-22.04_beta`**_ | - | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _`4.10-20.04_beta`_ | - | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md
index e266159..6c723a7 100644
--- a/docs/public.ecr.aws/ubuntu/telegraf.md
+++ b/docs/public.ecr.aws/ubuntu/telegraf.md
@@ -15,10 +15,10 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/telegraf`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`1.21-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/telegraf)  | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.19-21.10_beta` | -  | [-](https://gallery.ecr.aws/lts/telegraf)  | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`1.21-22.04_beta`** | - | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.19-21.10_beta` | - | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp;null | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/docs/public.ecr.aws/ubuntu/ubuntu.md b/docs/public.ecr.aws/ubuntu/ubuntu.md
deleted file mode 100644
index 336f7e6..0000000
--- a/docs/public.ecr.aws/ubuntu/ubuntu.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Ubuntu
-
-The Ubuntu container image maintained by Canonical. Receives security updates and rolls to a new version [every six months](https://ubuntu.com/about/release-cycle).
-For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/ubuntu](https://gallery.ecr.aws/lts/ubuntu).
-
-## About Ubuntu
-
-![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
-
-Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
-
-
-## Tags and Architectures
-![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance [from public.ecr.aws/lts/ubuntu](https://gallery.ecr.aws/lts/ubuntu).
-
-![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from canonical/ubuntu`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
-
-| Channel Tags | | | | Currently | Architectures |
-|---|---|---|---|---|---|
- | **`22.10_stable`** | **`22.10`, `22.10_beta`, `22.10_candidate`, `22.10_edge`, `22.10_stable`, `kinetic`, `kinetic-22.10_edge`, `latest`** | -  | [-](https://gallery.ecr.aws/lts/ubuntu)  | Ubuntu 22.10 "Kinetic Kudu"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | `22.04_stable` | `22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `jammy`, `jammy-22.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2027 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2025 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2023 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver"  | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
- | `23.04_edge` | `23.04`, `23.04_edge`, `edge`, `lunar`, `lunar-23.04_edge` | -  | [-](https://gallery.ecr.aws/lts/ubuntu)  | Ubuntu 23.04 "Lunar Lobster"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
-| _`track_risk`_ |
-
-_The following tags might not be available in public.ecr.aws/ubuntu/ubuntu, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
-
-| Channel Tags | | | | Currently | Architectures |
-|---|---|---|---|---|---|
- | _**`22.04_stable`**_ | **`22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `jammy`, `jammy-22.04_edge`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2027 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | _`20.04_stable`_ | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2025 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa"  | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
- | _`18.04_stable`_ | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2023 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver"  | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
-| _`16.04_stable`_ &nbsp;&nbsp;  | |  - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
-| _`14.04_stable`_ &nbsp;&nbsp;  | |  - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
-| _`track_risk`_ |
-
-
-Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
-
-
-### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
-
-## Deprecated channels & tags
-These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
-
-| Track | Version | EOL | Upgrade Path |
-|---|---|---|---|
- | ~~21.10-~~ | Ubuntu 21.10 "Impish Indri"  | 07/2022 | 22.04_stable |
- | ~~21.04-~~ | Ubuntu 21.04 "Hirsute Hippo"  | 01/2022 | ~~21.10~~ |
- | ~~20.10-~~ | Ubuntu 20.10 "Groovy Gorilla"  | 07/2021 | ~~21.04~~ |
-| _`track`_ |
-
diff --git a/docs/public.ecr.aws/ubuntu/usage/redis.md b/docs/public.ecr.aws/ubuntu/usage/redis.md
index fe20835..ad5094d 100644
--- a/docs/public.ecr.aws/ubuntu/usage/redis.md
+++ b/docs/public.ecr.aws/ubuntu/usage/redis.md
@@ -7,7 +7,7 @@
 Launch this image locally:
 
 ```sh
-docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.0-21.10_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.2-22.04_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -45,7 +45,7 @@ This image also includes the `redis-cli` client for interactive container use:
 ```sh
 $ docker network create redis-network
 $ docker network connect redis-network redis-container
-$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.2-22.04_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -63,7 +63,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.10_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/docs/public.ecr.aws/ubuntu/usage/telegraf.md b/docs/public.ecr.aws/ubuntu/usage/telegraf.md
index 618bd5c..a4a82fa 100644
--- a/docs/public.ecr.aws/ubuntu/usage/telegraf.md
+++ b/docs/public.ecr.aws/ubuntu/usage/telegraf.md
@@ -7,7 +7,7 @@
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.21-22.04_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -41,7 +41,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.21-22.04_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/docs/public.ecr.aws/ubuntu/usage/ubuntu.md b/docs/public.ecr.aws/ubuntu/usage/ubuntu.md
deleted file mode 100644
index a67dcae..0000000
--- a/docs/public.ecr.aws/ubuntu/usage/ubuntu.md
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-## Docker CLI
-
-Launch this image locally:
-
-```sh
-docker run -d --name ubuntu-container -e TZ=UTC  public.ecr.aws/ubuntu/ubuntu:22.04_stable
-```
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f ubuntu-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it ubuntu-container /bin/bash
-```
-
-
-
-## Bugs and feature requests
-
-If you find a bug in our image or want to request a specific feature, please file a bug here:
-
-[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
-
-Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from:
-
-```sh
-docker images --no-trunc --quiet public.ecr.aws/ubuntu/ubuntu:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/zookeeper.md b/docs/public.ecr.aws/ubuntu/zookeeper.md
index e33377c..5c7a464 100644
--- a/docs/public.ecr.aws/ubuntu/zookeeper.md
+++ b/docs/public.ecr.aws/ubuntu/zookeeper.md
@@ -15,9 +15,9 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/zookeeper`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tags | | | Currently | Architectures |
-|---|---|---|---|---|
- | **`3.1-22.04_beta`** | -  | [-](https://gallery.ecr.aws/lts/zookeeper)  | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| Channel Tags  |  Supported until | Currently | Architectures |
+|---|---|---|---|
+ | **`3.1-22.04_beta`** | - | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 
diff --git a/generate_ubuntu_yaml.py b/generate_ubuntu_yaml.py
index 40ec31a..f36aa05 100755
--- a/generate_ubuntu_yaml.py
+++ b/generate_ubuntu_yaml.py
@@ -244,7 +244,7 @@ class GenerateUbuntuYaml:
 
     def get_tags_aws(self, release: str, client: object, digest: str) -> List[str]:
         """
-        Permit to get the tags associated to the release
+        Permit to get the tags associated with the release
         """
         logging.info(f"Getting the tags from AWS for {release}")
 
@@ -260,7 +260,7 @@ class GenerateUbuntuYaml:
 
     def get_fullname(self, release: str) -> str:
         """
-        Permit to get the full name associated to the release
+        Permit to get the full name associated with the release
         """
         logging.info(f"Getting full name of {release} ")
 
@@ -335,7 +335,7 @@ class GenerateUbuntuYaml:
 
     def is_deprecated(self, series: str) -> bool:
         """Checks whether a series is completely deprecated (both LTS and ESM)"""
-        logging.info(f"Checking is {series} is deprecated")
+        logging.info(f"Checking if {series} is deprecated")
         supported_cmd = "ubuntu-distro-info --supported"
         supported_esm_cmd = supported_cmd + "-esm"
         all_supported = self.process_run(supported_cmd.split(" ")) + self.process_run(
@@ -345,7 +345,7 @@ class GenerateUbuntuYaml:
 
     def is_lts(self, series: str) -> bool:
         """Checks if a given series is LTS"""
-        logging.info(f"Checking is {series} is lts")
+        logging.info(f"Checking if {series} is LTS")
 
         cmd = ["ubuntu-distro-info", "--series", series, "-f"]
 
@@ -426,10 +426,6 @@ class GenerateUbuntuYaml:
 
             release_data["track"] = release.rstrip(" LTS")
 
-            manifest_list = self.run_skopeo_command(
-                "inspect", [f"docker://{self.url}:" + release.rstrip(" LTS"), "--raw"]
-            )
-
             if self.unpublished_suite and self.unpublished_suite == series:
                 release_data["architectures"] = self.unpublished_archs.split()
                 release_data["version"] = self.get_fullname(self.unpublished_suite)
@@ -438,6 +434,9 @@ class GenerateUbuntuYaml:
                 )
                 release_data["tags"] = self.unpublished_tags.split()
             else:
+                manifest_list = self.run_skopeo_command(
+                    "inspect", [f"docker://{self.url}:" + release.rstrip(" LTS"), "--raw"]
+                )
                 release_data["architectures"] = self.get_arches(
                     series, manifest_list["manifests"]
                 )
@@ -447,8 +446,11 @@ class GenerateUbuntuYaml:
                         series, registry_user, manifest_list["manifests"][-1]["digest"]
                     )
                 else:
+                    img_digest = self.run_skopeo_command(
+                        "inspect", [f"docker://{self.url}:" + release.rstrip(" LTS")]
+                    )["Digest"]
                     release_data["tags"] = self.get_tags_aws(
-                        series, registry_user, manifest_list["manifests"][-1]["digest"]
+                        series, registry_user, img_digest
                     )
                 release_data["risk"] = self.get_lowest_risk(release_data["tags"])
 
diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md
index 40f7744..3440cf6 100644
--- a/templates/README_DOCKERHUB.md
+++ b/templates/README_DOCKERHUB.md
@@ -10,8 +10,12 @@
     baserepo='ubuntu'
     tag='latest'
     has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases))
-    tags_column_header=' foo | | ' if any(has_tag_aliases) else ' | '
+    tags_column_header=' | | ' if any(has_tag_aliases) else ' | '
     tags_column_separator='|---|---' if any(has_tag_aliases) else '|---'
+    LTS_icon='![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)'
+    ESM_icon='![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)'
+    support_column_header='Supported until' if application != "Ubuntu" else 'Supported until | '+ESM_icon+' until'
+    support_column_separator='|---' if application != "Ubuntu" else '|---|---'
     risks=['stable', 'candidate', 'beta', 'edge']
     sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])))
     filterfn=lambda release : 'deprecated' not in release
@@ -20,7 +24,6 @@
     old_releases=[release for release in releases if release not in current_releases]
     LTS_BASES=['20.04', '22.04']
     ESM_BASES=['14.04', '16.04', '18.04']
-    first_lts_tag=''
 %>
 % if application=="Ubuntu":
 **The Ubuntu container image maintained by Canonical.** Receives fast security updates, and rolls to a new version every six months.
@@ -34,37 +37,39 @@ Current ${application} Docker Image [from Canonical](https://ubuntu.com/security
 
 <%include file="header.md" args="baserepo=baserepo, **locals()['pageargs']"/>
 
-| Channel Tags |${tags_column_header}| Currently | Architectures |
-${tags_column_separator}|---|---|---|---|
+| Channel Tags ${tags_column_header} ${support_column_header} | Currently | Architectures |
+${tags_column_separator}${support_column_separator}|---|---|
 % for i, release in enumerate(current_releases):
 <% 
     first=i==0
     track=str(release['track'])
+    swver=track
     risk=str(release['risk'])
     support=release.get('support', {})
-    base=str(release.get('base',''))
-    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
+    base=str(release.get('base','')) if application != "Ubuntu" else track
+    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else 'null'
     type=str(release['type']) if 'type' in release else ''
     version=str(release['version']) if 'version' in release else track
     architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
-    swver=track
-    basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk
+    basetag=swver+'-'+base+'_'+''+risk if application != "Ubuntu" else swver+'_'+risk
     all_tags=release.get('tags', [])
     all_tags.sort()
     all_tags = list(filter(lambda x: x != basetag, all_tags))
     tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", all_tags))
     channel_tag='**`'+basetag+'`**' if first else '`'+basetag+'`'
     oci_tags='`'+basetag+'`' if not tag_aliases else tag_aliases
-    usage_tag=basetag if not tag_aliases else str(release.get('tags', ['latest'])[0])
+    usage_tag=basetag if first else usage_tag
     tags='**'+oci_tags+'**' if first else oci_tags
-    first_lts_tag=basetag if type == 'LTS' and not first_lts_tag else first_lts_tag
     auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag
-%> | ${auto_tags_column} | ${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else '-'} ${'<br>until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | ${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'} ${'<br>until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
+    support_until_date=support['lts_until']+' (LTS)' if support.get('lts_until') else support.get('until', '-')
+    eoe=support.get('esm_until', '-')
+    support=support_until_date+' | '+eoe if application == "Ubuntu" else support_until_date
+%> | ${auto_tags_column} | ${support} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
 % endfor
 | _`track_risk`_ |
 
 % if application == "Ubuntu":
-_The following tags are not available in this repository but are shown here for completeness. [Contact Canonical for access](https://ubuntu.com/security/docker-images#get-in-touch)._
+_The following tags may not be available in this repository but are shown here for completeness. [Contact Canonical for access](https://ubuntu.com/security/docker-images#get-in-touch)._
 
 | Channel Tag | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
@@ -80,7 +85,7 @@ _The following tags are not available in this repository but are shown here for 
 If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
-<%include file="common_usage.md" args="usage_tag=usage_tag, first_lts_tag=first_lts_tag, baserepo=baserepo, **locals()['pageargs']"/>
+<%include file="common_usage.md" args="usage_tag=usage_tag, baserepo=baserepo, **locals()['pageargs']"/>
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
diff --git a/templates/README_ECR.md b/templates/README_ECR.md
index 4904054..941b0e9 100644
--- a/templates/README_ECR.md
+++ b/templates/README_ECR.md
@@ -12,6 +12,10 @@
     has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases))
     tags_column_header=' | | ' if any(has_tag_aliases) else ' | '
     tags_column_separator='|---|---' if any(has_tag_aliases) else '|---'
+    LTS_icon='![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)'
+    ESM_icon='![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)'
+    support_column_header='Supported until' if application != "Ubuntu" else 'Supported until | '+ESM_icon+' until'
+    support_column_separator='|---' if application != "Ubuntu" else '|---|---'
     risks=['stable', 'candidate', 'beta', 'edge']
     sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) )
     filtercurrentfn=lambda release : 'deprecated' not in release
@@ -21,6 +25,8 @@
     lts_releases=list(filter(filterltsfn, current_releases))
     old_releases=[release for release in releases if release not in current_releases]
     has_an_lts=len(lts_releases)>0
+    LTS_BASES=['20.04', '22.04']
+    ESM_BASES=['14.04', '16.04', '18.04']
 %>
 % if application=="Ubuntu":
 The Ubuntu container image maintained by Canonical. Receives security updates and rolls to a new version [every six months](https://ubuntu.com/about/release-cycle).
@@ -46,42 +52,42 @@ Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](ht
 Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 % for k, list_releases in enumerate([current_releases, lts_releases] if has_an_lts else [current_releases]):
 
-| Channel Tags |${tags_column_header}| Currently | Architectures |
-${tags_column_separator}|---|---|---|---|
+| Channel Tags ${tags_column_header} ${support_column_header} | Currently | Architectures |
+${tags_column_separator}${support_column_separator}|---|---|
 % for i, release in enumerate(list_releases):
 <% 
     first=i==0
     track=str(release['track'])
+    swver=track
     risk=str(release['risk'])
     support=release.get('support', {})
-    base=str(release.get('base', ''))
-    LTS_BASES=['20.04', '22.04']
-    ESM_BASES=['14.04', '16.04', 18.04]
-    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
+    base=str(release.get('base', '')) if application != "Ubuntu" else track
+    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else 'null'
     type=str(release['type']) if 'type' in release else ''
     version=str(release['version']) if 'version' in release else track
     architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
-    swver=track
-    basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk
+    basetag=swver+'-'+base+'_'+''+risk if application != "Ubuntu" else swver+'_'+risk
     all_tags=release.get('tags', [])
     all_tags.sort()
     all_tags = list(filter(lambda x: x != basetag, all_tags))
     tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', [])))
     oci_tags='`'+basetag+'`' if not tag_aliases else tag_aliases
     channel_tag='**`'+basetag+'`**' if first else '`'+basetag+'`'
-    channel_tag='_'+channel_tag+'_' if type == 'LTS' and k != 0 else channel_tag
+    channel_tag='_'+channel_tag+'_' if type == 'LTS' else channel_tag
     tags='**'+oci_tags+'**' if first else oci_tags
     auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag
-%> | ${auto_tags_column} | ${'[![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/'+repo+')' if type == 'LTS' else '-'} ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
+    support_until_date=support['lts_until']+' (LTS)' if support.get('lts_until') else support.get('until', '-')
+    eoe=support.get('esm_until', '-')
+    support=support_until_date+' | '+eoe if application == "Ubuntu" else support_until_date
+%> | ${auto_tags_column} | ${support} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
 % endfor
 % if application == "Ubuntu" and k == 1:
-| _`18.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2028 | Ubuntu Bionic Beaver 18.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le`, `i386` |
-| _`16.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
-| _`14.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
+| _`16.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
+| _`14.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
 % endif
 | _`track_risk`_ |
 
-${'_The following tags might not be available in '+baserepo+'/'+repo+', but are available in Canonical\'s LTS or ESM channels. They are shown here for completeness:_' if k==0 and has_an_lts else ''}
+${'_The following tags might not be available in '+baserepo+'/'+repo+', but can be requested via Canonical\'s [LTS](https://gallery.ecr.aws/lts/ubuntu) or [ESM](https://gallery.ecr.aws/lts/ubuntu) channels. They are shown here for completeness:_' if k==0 and has_an_lts else ''}
 % endfor
 <%include file="channels_message.md" />
 
diff --git a/templates/README_ECR_LTS.md b/templates/README_ECR_LTS.md
index 7dfb583..c8bdead 100644
--- a/templates/README_ECR_LTS.md
+++ b/templates/README_ECR_LTS.md
@@ -12,6 +12,10 @@
     has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases))
     tags_column_header=' | | ' if any(has_tag_aliases) else ' | '
     tags_column_separator='|---|---' if any(has_tag_aliases) else '|---'
+    LTS_icon='![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)'
+    ESM_icon='![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)'
+    support_column_header='Supported until' if application != "Ubuntu" else 'Supported until | '+ESM_icon+' until'
+    support_column_separator='|---' if application != "Ubuntu" else '|---|---'
     risks=['stable', 'candidate', 'beta', 'edge']
     sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) )
     filterltsfn=lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False
@@ -36,8 +40,8 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request 
 
 <!-- _Tags in italics are not available in ${baserepo}/${repo} but are shown here for completeness._ -->
 
-| Channel Tags ${tags_column_header} ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
-${tags_column_separator}|---|---|---|---|
+| Channel Tags ${tags_column_header} ${support_column_header} | Currently | Architectures |
+${tags_column_separator}${support_column_separator}|---|---|
 % for i, release in enumerate(lts_releases):
 <% 
     first=i==0
@@ -62,14 +66,10 @@ ${tags_column_separator}|---|---|---|---|
     tags='**'+oci_tags+'**' if first else oci_tags
     auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag
     has_an_lts=(has_an_lts or type == 'LTS' or type == 'ESM')
-    sos_year=2000+int(base.split(".")[0])
-    eol_year=sos_year+5 
-    eoe_year=sos_year+10 
-    eol_date=base.split(".")[1]+'/'+str(eol_year) if not support.get('lts_until') else support['lts_until']
-    eoe_date=base.split(".")[1]+'/'+str(eoe_year) if not support.get('esm_until') else support['esm_until']
-    eol=eol_date if basetype == 'LTS' else '-'
-    eoe=eoe_date if basetype == 'LTS' or basetype == 'ESM' else '-'
-%> | ${auto_tags_column} | ${eol} | ${eoe} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
+    support_until_date=support['lts_until']+' (LTS)' if support.get('lts_until') else support.get('until', '-')
+    eoe=support.get('esm_until', '-')
+    support=support_until_date+' | '+eoe if application == "Ubuntu" else support_until_date
+%> | ${auto_tags_column} | ${support} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
 % endfor
 | _`track_risk`_ |
 
diff --git a/templates/USAGE_ECR.md b/templates/USAGE_ECR.md
index f6b4b62..16526f7 100644
--- a/templates/USAGE_ECR.md
+++ b/templates/USAGE_ECR.md
@@ -9,7 +9,6 @@
     lts_releases=list(filter(filterltsfn, current_releases))
     current_releases=[current_releases.pop(0)]+[release for release in current_releases if release not in lts_releases]
     has_an_lts=len(lts_releases)>0
-    first_lts_tag=''
 %>
 % for k, list_releases in enumerate([current_releases, lts_releases] if has_an_lts else [current_releases]):
 % for i, release in enumerate(list_releases):
@@ -22,11 +21,10 @@
     swver='.'.join(track.split(".")[:2])
     auto_tags=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', [])))
     basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk
-    usage_tag=basetag if not auto_tags else str(release.get('tags', ['latest'])[0])
-    first_lts_tag=basetag if type == 'LTS' and not first_lts_tag else first_lts_tag
+    usage_tag=basetag if first else usage_tag
 %>
 % endfor 
 % endfor
 
 ## Docker CLI
-<%include file="common_usage.md" args="usage_tag=usage_tag, first_lts_tag=first_lts_tag, baserepo=baserepo, **locals()['pageargs']"/>
+<%include file="common_usage.md" args="usage_tag=usage_tag, baserepo=baserepo, **locals()['pageargs']"/>
diff --git a/templates/common_usage.md b/templates/common_usage.md
index 8e40dd4..81c9b7e 100644
--- a/templates/common_usage.md
+++ b/templates/common_usage.md
@@ -1,7 +1,7 @@
-<%page args="usage_tag, first_lts_tag, baserepo" />
+<%page args="usage_tag, baserepo" />
 Launch this image locally:
 <%
-    tag=first_lts_tag if first_lts_tag else usage_tag
+    tag=usage_tag
     containername=repo+'-container'
 %>
 ```sh
diff --git a/templates/header.md b/templates/header.md
index 407163c..d82a806 100644
--- a/templates/header.md
+++ b/templates/header.md
@@ -9,7 +9,7 @@ The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) is a
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance on LTS channels.
+Up to 5 years of free security maintenance on LTS channels.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years of customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).