Merge ~valentinviennot/ubuntu-docker-images:update-21.10 into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

[Valentin Viennot]

Update 21.10 docs

- fix escape number in data
- fix link in template
- update docs file with latest template and data

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Valentin :-).

LGTM, +1.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

+1

Thanks, Valentin!

review: Approve

diff --git a/data/apache2.yaml b/data/apache2.yaml
index d0ddd7f..67a2cee 100644
--- a/data/apache2.yaml
+++ b/data/apache2.yaml
@@ -6,7 +6,7 @@ releases:
   - track: '2.4'
     risk: beta
     version: '2.4.48'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/cortex.yaml b/data/cortex.yaml
index 74bbe0a..670a870 100644
--- a/data/cortex.yaml
+++ b/data/cortex.yaml
@@ -13,7 +13,7 @@ releases:
   - track: "1.10"
     risk: beta
     version: "1.10.0"
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/grafana.yaml b/data/grafana.yaml
index e01abc0..e0b70ef 100644
--- a/data/grafana.yaml
+++ b/data/grafana.yaml
@@ -7,7 +7,7 @@ releases:
   - track: '8.1'
     risk: beta
     version: '8.1.0'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/memcached.yaml b/data/memcached.yaml
index 97dd683..92878c0 100644
--- a/data/memcached.yaml
+++ b/data/memcached.yaml
@@ -7,7 +7,7 @@ releases:
   - track: '1.6'
     risk: beta
     version: '1.6.9'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/mysql.yaml b/data/mysql.yaml
index 93672a5..e27cbe9 100644
--- a/data/mysql.yaml
+++ b/data/mysql.yaml
@@ -9,7 +9,7 @@ releases:
   - track: '8.0'
     risk: beta
     version: '8.0.27'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/nginx.yaml b/data/nginx.yaml
index 1bed121..52ff9dd 100644
--- a/data/nginx.yaml
+++ b/data/nginx.yaml
@@ -6,7 +6,7 @@ releases:
   - track: '1.18'
     risk: beta
     version: '1.18.0'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/postgres.yaml b/data/postgres.yaml
index 916f4a7..2d294bc 100644
--- a/data/postgres.yaml
+++ b/data/postgres.yaml
@@ -6,7 +6,7 @@ releases:
   - track: '13.1'
     risk: beta
     version: '13.1'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml
index 62e38f7..fea2458 100644
--- a/data/prometheus-alertmanager.yaml
+++ b/data/prometheus-alertmanager.yaml
@@ -6,7 +6,7 @@ releases:
   - track: '0.22'
     risk: beta
     version: '0.22.0'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/prometheus.yaml b/data/prometheus.yaml
index 7b0e61e..666e936 100644
--- a/data/prometheus.yaml
+++ b/data/prometheus.yaml
@@ -6,7 +6,7 @@ releases:
   - track: '2.28'
     risk: beta
     version: '2.28.1'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/data/redis.yaml b/data/redis.yaml
index 212336d..17a94d7 100644
--- a/data/redis.yaml
+++ b/data/redis.yaml
@@ -7,7 +7,7 @@ description: >
   Read more on the [Redis website](https://redis.io/topics/introduction).
 releases:
   - track: "6.0"
-    base: 21.10
+    base: '21.10'
     version: "6.0.15"
     risk: beta
     architectures:
diff --git a/data/telegraf.yaml b/data/telegraf.yaml
index 75225ea..dd8304a 100644
--- a/data/telegraf.yaml
+++ b/data/telegraf.yaml
@@ -6,7 +6,7 @@ releases:
   - track: "1.19"
     risk: beta
     version: "1.19.2"
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md
index cc18fdf..d182c60 100644
--- a/docs/docker.io/ubuntu/apache2.md
+++ b/docs/docker.io/ubuntu/apache2.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/apache2 but are shown here for comp
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.4-21.04_beta`**    |  | | Apache2 2.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-21.10_beta`**    |  | | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-21.04_beta`    |  | | Apache2 2.4.46 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `2.4-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4.41 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.04_beta
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.10_beta
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html) and
-[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-21.04_beta`), then:
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-21.10_beta`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md
index f2e3258..5da6754 100644
--- a/docs/docker.io/ubuntu/bind9.md
+++ b/docs/docker.io/ubuntu/bind9.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/bind9 but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`9.16-20.04_beta`**    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.16.15 on Ubuntu 20.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) | | Bind9 9.16.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tag 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`.
@@ -34,7 +35,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name bind9-container -e TZ=UTC -p 30053:53 ubuntu/bind9:9.16-20.04_beta
+docker run -d --name bind9-container -e TZ=UTC -p 30053:53 ubuntu/bind9:9.16-21.10_beta
 ```
 Access your Bind9 server at `localhost:30053`
 
@@ -69,7 +70,7 @@ docker exec -it bind9-container /bin/bash
 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
-[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.16-20.04_beta`), then:
+[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.16-21.10_beta`), then:
 
 ```sh
 kubectl apply -f bind9-deployment.yml
diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md
index 400f771..926e5ba 100644
--- a/docs/docker.io/ubuntu/cassandra.md
+++ b/docs/docker.io/ubuntu/cassandra.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/cassandra but are shown here for co
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.0-21.04_beta`**    |  | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.0-21.10_beta`**    |  | | Cassandra 4.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.0-21.04_beta`    |  | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `4.0-20.04_beta`    |  | | Cassandra 4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 ubuntu/cassandra:4.0-21.04_beta
+docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 ubuntu/cassandra:4.0-21.10_beta
 ```
 Access your Cassandra server with `cqlsh localhost 9042`.
 
@@ -73,7 +74,7 @@ docker exec -it cassandra-container /bin/bash
 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
-[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-21.04_beta`), then:
+[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-21.10_beta`), then:
 
 ```sh
 kubectl apply -f cassandra-deployment.yml
diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md
index a2d0b20..083243c 100644
--- a/docs/docker.io/ubuntu/cortex.md
+++ b/docs/docker.io/ubuntu/cortex.md
@@ -28,7 +28,8 @@ _Tags in italics are not available in ubuntu/cortex but are shown here for compl
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.7-21.04_beta`**    |  | | Cortex 1.7 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.10-21.10_beta`**    |  | | Cortex 1.10.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.7-21.04_beta`    |  | | Cortex 1.7.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.4-20.04_beta`    |  | | Cortex 1.4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -42,7 +43,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.7-21.04_beta
+docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.10-21.10_beta
 ```
 Access your Cortex server at `http://localhost:32709`.
 
@@ -76,7 +77,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml) and
-[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.7-21.04_beta`), then:
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.10-21.10_beta`), then:
 
 ```sh
 kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md
index c1aef62..0bc7613 100644
--- a/docs/docker.io/ubuntu/grafana.md
+++ b/docs/docker.io/ubuntu/grafana.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/grafana but are shown here for comp
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`7.4-21.04_beta`**    |  | | Grafana™ software 7.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`8.1-21.10_beta`**    |  | | Grafana™ software 8.1.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.4-21.04_beta`    |  | | Grafana™ software 7.4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `7.2-20.04_beta`    |  | | Grafana™ software 7.2.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:7.4-21.04_beta
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:8.1-21.10_beta
 ```
 Access your Grafana server at `localhost:30000`.
 
@@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and
-[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:7.4-21.04_beta`), then:
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:8.1-21.10_beta`), then:
 
 ```sh
 kubectl create configmap grafana-config --from-file=grafana-datasource=datasource.yml --from-file=grafana-dashboard-definition=dashboard.yml --from-file=grafana-dashboard=system-stats-dashboard.json
diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md
index b03808f..68067f8 100644
--- a/docs/docker.io/ubuntu/memcached.md
+++ b/docs/docker.io/ubuntu/memcached.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/memcached but are shown here for co
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.6-21.04_beta`**    |  | | Memcached 1.6 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.6-21.10_beta`**    |  | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.6-21.04_beta`    |  | | Memcached 1.6.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.5-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Memcached 1.5.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.6-21.04_beta
+docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.6-21.10_beta
 ```
 
 #### Parameters
@@ -100,7 +101,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) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-21.04_beta`), then:
+[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-21.10_beta`), then:
 
 ```sh
 kubectl apply -f memcached-deployment.yml
diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md
index 5129a97..198db0d 100644
--- a/docs/docker.io/ubuntu/mysql.md
+++ b/docs/docker.io/ubuntu/mysql.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/mysql but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`8.0-21.04_beta`**    |  | | MySQL™ 8.0 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
+ | **`8.0-21.10_beta`**    |  | | MySQL™ 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `s390x` |
+ | `8.0-21.04_beta`    |  | | MySQL™ 8.0.27 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
  | `8.0-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ 8.0.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-21.04_beta
+docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-21.10_beta
 ```
 Access your MySQL server at `localhost:30306`.
 
@@ -86,7 +87,7 @@ This image also includes the `mysql` client for interactive container use:
 ```sh
 $ docker network create mysql-network
 $ docker network connect mysql-network mysql-container
-$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.04_beta mysql -hmysql-container -uroot -p
+$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.10_beta mysql -hmysql-container -uroot -p
 ```
 The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged in and can enjoy your new instance.
 
@@ -96,7 +97,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf) and
-[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-21.04_beta`), then:
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-21.10_beta`), then:
 
 ```sh
 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md
index 710e302..52744ba 100644
--- a/docs/docker.io/ubuntu/nginx.md
+++ b/docs/docker.io/ubuntu/nginx.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/nginx but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.18-21.04_beta`**    |  | | Nginx 1.18 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.18-21.10_beta`**    |  | | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-21.04_beta`    |  | | Nginx 1.18.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.18-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Nginx 1.18.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.10_beta
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -71,7 +72,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html) and
-[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.04_beta`), then:
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.10_beta`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md
index 2ca4ef0..3700600 100644
--- a/docs/docker.io/ubuntu/postgres.md
+++ b/docs/docker.io/ubuntu/postgres.md
@@ -21,8 +21,9 @@ _Tags in italics are not available in ubuntu/postgres but are shown here for com
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`13.1-21.04_beta`**    |  | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
- | `12.4-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` |
+ | **`13.1-21.10_beta`**    |  | | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `13.1-21.04_beta`    |  | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `12.4-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tag 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`.
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:13.1-21.04_beta
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:13.1-21.10_beta
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -85,7 +86,7 @@ This image also includes the `psql` client for interactive container use:
 ```sh
 $ docker network create postgres-network
 $ docker network connect postgres-network postgres-container
-$ docker run -it --rm --network postgres-network ubuntu/postgres:13.1-21.04_beta psql -h postgres-container -U postgres
+$ docker run -it --rm --network postgres-network ubuntu/postgres:13.1-21.10_beta psql -h postgres-container -U postgres
 ```
 The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged in and can enjoy your new instance.
 
@@ -95,7 +96,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf) and
-[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:13.1-21.04_beta`), then:
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:13.1-21.10_beta`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md
index 89fa94c..2da7cbc 100644
--- a/docs/docker.io/ubuntu/prometheus-alertmanager.md
+++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/prometheus-alertmanager but are sho
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`0.21-21.04_beta`**    |  | | Prometheus Alertmanager 0.21 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`0.22-21.10_beta`**    |  | | Prometheus Alertmanager 0.22.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `0.21-21.04_beta`    |  | | Prometheus Alertmanager 0.21.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `0.21-20.04_beta`    |  | | Prometheus Alertmanager 0.21.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 ubuntu/prometheus-alertmanager:0.21-21.04_beta
+docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 ubuntu/prometheus-alertmanager:0.22-21.10_beta
 ```
 Access your Prometheus Alertmanager server at `localhost:30093`.
 
@@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml) and
-[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.21-21.04_beta`), then:
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.22-21.10_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md
index 9bbeb86..d82513b 100644
--- a/docs/docker.io/ubuntu/prometheus.md
+++ b/docs/docker.io/ubuntu/prometheus.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/prometheus but are shown here for c
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.25-21.04_beta`**    |  | | Prometheus 2.25 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.28-21.10_beta`**    |  | | Prometheus 2.28.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.25-21.04_beta`    |  | | Prometheus 2.25.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `2.20-20.04_beta`    |  | | Prometheus 2.20.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.25-21.04_beta
+docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.28-21.10_beta
 ```
 Access your Prometheus server at `localhost:30090`.
 
@@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and
-[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.25-21.04_beta`), then:
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.28-21.10_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml
diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md
index 052a0c1..17414c1 100644
--- a/docs/docker.io/ubuntu/redis.md
+++ b/docs/docker.io/ubuntu/redis.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/redis but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`6.0-21.04_beta`**    |  | | Redis™ software 6.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`6.0-21.10_beta`**    |  | | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.04_beta`    |  | | Redis™ software 6.0.11 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `5.0-20.04_beta`    |  | | Redis™ software 5.0.7 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 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.04_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.10_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -72,7 +73,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.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -90,7 +91,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) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.04_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.10_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 0e26afa..45b7930 100644
--- a/docs/docker.io/ubuntu/squid.md
+++ b/docs/docker.io/ubuntu/squid.md
@@ -21,8 +21,8 @@ _Tags in italics are not available in ubuntu/squid but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.10-20.04_beta`**    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 4.10 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.13-21.10_edge`    |  | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.13-21.10_edge`**    |  | | 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) | | Squid 4.10 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tag 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`.
@@ -35,7 +35,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.10-20.04_beta
+docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.13-21.10_edge
 ```
 Access your Squid proxy at `localhost:3128`.
 
@@ -70,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf) and
-[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.10-20.04_beta`), then:
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.13-21.10_edge`), then:
 
 ```sh
 kubectl create configmap squid-config --from-file=squid=squid.conf
diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md
index 614b5b6..e29f9d0 100644
--- a/docs/docker.io/ubuntu/telegraf.md
+++ b/docs/docker.io/ubuntu/telegraf.md
@@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/telegraf but are shown here for com
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.17-21.04_beta`**    |  | | Telegraf™ software 1.17 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.19-21.10_beta`**    |  | | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.17-21.04_beta`    |  | | Telegraf™ software 1.17.2 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.15-20.04_beta`    |  | | Telegraf™ software 1.15.2 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.17-21.04_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.19-21.10_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -69,7 +70,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) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.17-21.04_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.19-21.10_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md
index b53c2a8..eafda43 100644
--- a/docs/public.ecr.aws/lts/bind9.md
+++ b/docs/public.ecr.aws/lts/bind9.md
@@ -20,7 +20,7 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac
 
 | 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 |
 |---|---|---|---|---|
- | **`9.16-20.04_beta`**    | - | - | Bind9 9.16.15 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`9.16-20.04_beta`**    | - | - | Bind9 9.16.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tag 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 d39a9db..1b84c2b 100644
--- a/docs/public.ecr.aws/lts/postgres.md
+++ b/docs/public.ecr.aws/lts/postgres.md
@@ -20,7 +20,7 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request
 
 | 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 |
 |---|---|---|---|---|
- | **`12.4-20.04_beta`**    | - | - | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` |
+ | **`12.4-20.04_beta`**    | - | - | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel Tag 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 d433638..777828e 100644
--- a/docs/public.ecr.aws/ubuntu/apache2.md
+++ b/docs/public.ecr.aws/ubuntu/apache2.md
@@ -10,14 +10,15 @@ 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 [from public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/apache2).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.4-21.04_beta`**    | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-21.10_beta`**    | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-21.04_beta`    | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4.46 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_
diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md
index bc6ea86..ff71a62 100644
--- a/docs/public.ecr.aws/ubuntu/bind9.md
+++ b/docs/public.ecr.aws/ubuntu/bind9.md
@@ -10,21 +10,21 @@ 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 [from public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/bind9).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`9.16-20.04_beta`**   _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`9.16-21.10_beta`**    | [](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`9.16-20.04_beta`**   _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu 20.04 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) | | Bind9 9.16.1 on Ubuntu 20.04 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 f0eb9ad..39c2aa4 100644
--- a/docs/public.ecr.aws/ubuntu/cassandra.md
+++ b/docs/public.ecr.aws/ubuntu/cassandra.md
@@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.0-21.04_beta`**    | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.0-21.10_beta`**    | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.0-21.04_beta`    | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `4.0-20.04_beta`    | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 public.ecr.aws/ubuntu/cassandra:4.0-21.04_beta
+docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 public.ecr.aws/ubuntu/cassandra:4.0-21.10_beta
 ```
 Access your Cassandra server with `cqlsh localhost 9042`.
 
@@ -69,7 +70,7 @@ docker exec -it cassandra-container /bin/bash
 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
-[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cassandra:4.0-21.04_beta`), then:
+[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cassandra:4.0-21.10_beta`), then:
 
 ```sh
 kubectl apply -f cassandra-deployment.yml
diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md
index 7896844..dce0227 100644
--- a/docs/public.ecr.aws/ubuntu/cortex.md
+++ b/docs/public.ecr.aws/ubuntu/cortex.md
@@ -23,7 +23,8 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.7-21.04_beta`**    | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.7 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.10-21.10_beta`**    | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.10.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.7-21.04_beta`    | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.7.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.4-20.04_beta`    | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -38,7 +39,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 public.ecr.aws/ubuntu/cortex:1.7-21.04_beta
+docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 public.ecr.aws/ubuntu/cortex:1.10-21.10_beta
 ```
 Access your Cortex server at `http://localhost:32709`.
 
@@ -72,7 +73,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml) and
-[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cortex:1.7-21.04_beta`), then:
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cortex:1.10-21.10_beta`), then:
 
 ```sh
 kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md
index 87b4e80..df47862 100644
--- a/docs/public.ecr.aws/ubuntu/grafana.md
+++ b/docs/public.ecr.aws/ubuntu/grafana.md
@@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request 
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`7.4-21.04_beta`**    | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`8.1-21.10_beta`**    | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 8.1.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.4-21.04_beta`    | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `7.2-20.04_beta`    | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.2.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/ubuntu/grafana:7.4-21.04_beta
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/ubuntu/grafana:8.1-21.10_beta
 ```
 Access your Grafana server at `localhost:30000`.
 
@@ -66,7 +67,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and
-[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/grafana:7.4-21.04_beta`), then:
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/grafana:8.1-21.10_beta`), then:
 
 ```sh
 kubectl create configmap grafana-config --from-file=grafana-datasource=datasource.yml --from-file=grafana-dashboard-definition=dashboard.yml --from-file=grafana-dashboard=system-stats-dashboard.json
diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md
index f0b6dad..2b072ae 100644
--- a/docs/public.ecr.aws/ubuntu/memcached.md
+++ b/docs/public.ecr.aws/ubuntu/memcached.md
@@ -10,14 +10,15 @@ 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 [from public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/memcached).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.6-21.04_beta`**    | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.6-21.10_beta`**    | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.6-21.04_beta`    | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_
diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md
index af55f37..7f5a7ab 100644
--- a/docs/public.ecr.aws/ubuntu/mysql.md
+++ b/docs/public.ecr.aws/ubuntu/mysql.md
@@ -10,14 +10,15 @@ 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 [from public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/mysql).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`8.0-21.04_beta`**    | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
+ | **`8.0-21.10_beta`**    | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `s390x` |
+ | `8.0-21.04_beta`    | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0.27 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_
diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md
index 16682e1..0991efa 100644
--- a/docs/public.ecr.aws/ubuntu/nginx.md
+++ b/docs/public.ecr.aws/ubuntu/nginx.md
@@ -10,14 +10,15 @@ 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 [from public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/nginx).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.18-21.04_beta`**    | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.18-21.10_beta`**    | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-21.04_beta`    | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_
diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md
index bea237a..ad316df 100644
--- a/docs/public.ecr.aws/ubuntu/postgres.md
+++ b/docs/public.ecr.aws/ubuntu/postgres.md
@@ -10,21 +10,22 @@ 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 [from public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/postgres).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`13.1-21.04_beta`**    | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
+ | **`13.1-21.10_beta`**    | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `13.1-21.04_beta`    | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`12.4-20.04_beta`**   _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` |
+ | _**`12.4-20.04_beta`**   _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | | Postgres 12.4 on Ubuntu 20.04 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 676d417..c0937a3 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
@@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`0.21-21.04_beta`**    | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`0.22-21.10_beta`**    | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.22.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `0.21-21.04_beta`    | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `0.21-20.04_beta`    | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 public.ecr.aws/ubuntu/prometheus-alertmanager:0.21-21.04_beta
+docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 public.ecr.aws/ubuntu/prometheus-alertmanager:0.22-21.10_beta
 ```
 Access your Prometheus Alertmanager server at `localhost:30093`.
 
@@ -66,7 +67,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml) and
-[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus-alertmanager:0.21-21.04_beta`), then:
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus-alertmanager:0.22-21.10_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md
index 1ce4776..047fd10 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus.md
@@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.25-21.04_beta`**    | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.25 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.28-21.10_beta`**    | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.28.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.25-21.04_beta`    | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.25.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `2.20-20.04_beta`    | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.20.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 public.ecr.aws/ubuntu/prometheus:2.25-21.04_beta
+docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 public.ecr.aws/ubuntu/prometheus:2.28-21.10_beta
 ```
 Access your Prometheus server at `localhost:30090`.
 
@@ -66,7 +67,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and
-[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus:2.25-21.04_beta`), then:
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus:2.28-21.10_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml
diff --git a/docs/public.ecr.aws/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md
index 9f0e902..28ee2c6 100644
--- a/docs/public.ecr.aws/ubuntu/redis.md
+++ b/docs/public.ecr.aws/ubuntu/redis.md
@@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`6.0-21.04_beta`**    | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`6.0-21.10_beta`**    | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.04_beta`    | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0.11 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `5.0-20.04_beta`    | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 5.0.7 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 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.04_beta
+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
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -68,7 +69,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.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -86,7 +87,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) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.04_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) 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:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md
index 6add789..1064083 100644
--- a/docs/public.ecr.aws/ubuntu/squid.md
+++ b/docs/public.ecr.aws/ubuntu/squid.md
@@ -10,15 +10,14 @@ 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 [from public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/${repo}).
+Up to 5 years free security maintenance [from public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/squid).
 
 ![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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`4.10-20.04_beta`**   _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | | Squid 4.10 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.13-21.10_edge`    | [](https://gallery.ecr.aws/lts/squid) | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.13-21.10_edge`**    | [](https://gallery.ecr.aws/lts/squid) | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_
diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md
index 508925d..aac090f 100644
--- a/docs/public.ecr.aws/ubuntu/telegraf.md
+++ b/docs/public.ecr.aws/ubuntu/telegraf.md
@@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.17-21.04_beta`**    | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.17 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.19-21.10_beta`**    | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.17-21.04_beta`    | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.17.2 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.15-20.04_beta`    | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.15.2 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.17-21.04_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -65,7 +66,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) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.17-21.04_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) 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:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/templates/README_ECR.md b/templates/README_ECR.md
index 47ae031..645f7fa 100644
--- a/templates/README_ECR.md
+++ b/templates/README_ECR.md
@@ -17,7 +17,7 @@ ${description}
 
 ## 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/'+repo+'](https://gallery.ecr.aws/lts/${repo})' if has_an_lts else '. [Request access](https://ubuntu.com/security/docker-images#get-in-touch)'}.
+Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](https://gallery.ecr.aws/lts/'+repo+')' if has_an_lts else '. [Request access](https://ubuntu.com/security/docker-images#get-in-touch)'}.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).