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

[Valentin Viennot]

Update for 22.04 release

* Update 22.04 tracks, docs, and versions
* Allow to customise the configmap name
* Replace 'Deprecated' with 'EOL'
* Update devcontainer after github username change
* Document Redis TLS mode

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Valentin.

I noticed that the new track definitions (in the .yaml files) don't have versions yet. Is it because you're waiting for the final release before filling out this info?

Also, kudos for adding the "?h=MM.NN-XX.YY" prefix to the URLs. These changes seem to fix the following bugs:

https://bugs.launchpad.net/ubuntu-docker-images/+bug/1947865
https://bugs.launchpad.net/ubuntu-docker-images/+bug/1960283
https://bugs.launchpad.net/ubuntu-docker-images/+bug/1964171
https://bugs.launchpad.net/ubuntu-docker-images/+bug/1968411

which is great.

I see you've added documentation for loki and kafka too. Thanks!

Overall this LGTM. I will wait for your reply regarding the missing versions before going ahead.

Thanks again.

review: Needs Information

[Athos Ribeiro (athos-ribeiro)]

Thanks, Valentin! LGTM

The kafka docs will need updating to reflect the changes in https://code.launchpad.net/~athos-ribeiro/ubuntu-docker-images/+git/kafka/+merge/419704

[Sergio Durigan Junior (sergiodj)]

Hey Valentin,

Due to bug #1969756, I have expanded bind9's image and it now supports a new environment variable: BIND9_USER, which can be used to specify the user that will own the named process. I was going to create an MP to adjust the documentation and reflect the change, but since we haven't merged this MP yet I thought it'd be easier to let you know and ask if it's possible for you to update your branch and add this new variable before we do the merge. Let me know if this works for you.

Thanks!

[Valentin Viennot (valentinviennot)]

Took me some time to understand the process was named “named”… but done!

About missing versions, the template uses either “version” or the “track” when “version" is not defined. Because I did not know the specific versions shipped, I didn’t specify them. As this is subject to change, I think keeping only the track works well. Feel free to document the specific versions if you want to.

I also pushed a fix with templates (and rebased all the changes with a force push to remove an unnecessary ‘generate docs’ commit).

Valentin

> On 23 Apr 2022, at 01:57, Sergio Durigan Junior <email address hidden> wrote:
>
> Hey Valentin,
>
> Due to bug #1969756, I have expanded bind9's image and it now supports a new environment variable: BIND9_USER, which can be used to specify the user that will own the named process. I was going to create an MP to adjust the documentation and reflect the change, but since we haven't merged this MP yet I thought it'd be easier to let you know and ask if it's possible for you to update your branch and add this new variable before we do the merge. Let me know if this works for you.
>
> Thanks!
> --
> https://code.launchpad.net/~valentinviennot/ubuntu-docker-images/+git/ubuntu-server-oci/+merge/419703
> You are the owner of ~valentinviennot/ubuntu-docker-images:update-22.04.
>

[Sergio Durigan Junior (sergiodj)]

Thanks, Valentin.

Merged.

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 35db662..fa24741 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,7 +5,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends python3-mako python3-yaml
 
-RUN cd /usr/bin && git clone https://github.com/misterw97/RenderDown \
+RUN cd /usr/bin && git clone https://github.com/valentinviennot/RenderDown \
     && pip3 --disable-pip-version-check --no-cache-dir install -r /usr/bin/RenderDown/requirements.txt \ 
     && rm -rf /tmp/pip-tmp
 ENV RENDERDOWN /usr/bin/RenderDown/renderdown.py
diff --git a/.gitignore b/.gitignore
index 243201b..19cfae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.env
 *.swp
 RenderDown/
diff --git a/data/apache2.yaml b/data/apache2.yaml
index d0ddd7f..2f8133c 100644
--- a/data/apache2.yaml
+++ b/data/apache2.yaml
@@ -4,9 +4,18 @@ description: >
   The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet. Read more on the [apache2 website](https://httpd.apache.org/).
 releases:
   - track: '2.4'
+    base: '22.04'
+    risk: beta
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '2.4'
     risk: beta
     version: '2.4.48'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -15,7 +24,12 @@ releases:
   - track: '2.4'
     risk: beta
     version: '2.4.46'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '2.4'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -40,14 +54,14 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 8080:80
+    value: '8080:80'
     description: Expose Apache2 on `localhost:8080`.
   - type: -v
     value: /local/path/to/website:/var/www/html
     description: Mount and serve a local website.
   - type: -v
     value: /path/to/apache2.conf:/etc/apache2/apache2.conf
-    description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf)).
+    description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)).
 debug:
   - nothing
 microk8s:
@@ -55,10 +69,10 @@ microk8s:
     files:
       - key: apache2
         name: apache2.conf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04
       - key: apache2-site
         name: index.html
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04
     access: You will now be able to connect to the apache2 server on `http://localhost:30080`.
diff --git a/data/bind9.yaml b/data/bind9.yaml
index 2855434..4a52e08 100644
--- a/data/bind9.yaml
+++ b/data/bind9.yaml
@@ -5,6 +5,15 @@ description: >
   In addition to BIND 9's DNS server itself, `named`, this container also includes tools for performing DNS queries and dynamic updates.
   Read more on the [BIND 9 website](https://www.isc.org/bind/).
 releases:
+  - track: '9.18'
+    base: '22.04'
+    risk: beta
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
   - track: '9.16'
     risk: beta
     version: '9.16.15'
@@ -33,11 +42,14 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 30053:53
+    value: '30053:53'
     description: Expose bind9 on `localhost:30053`.
+  - type: -e
+    value: BIND9_USER=bind
+    description: The user which will start the `named` process.
   - type: -v
     value: /path/to/bind/configuration:/etc/bind/named.conf
-    description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)).
+    description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)).
   - type: -v
     value: /path/to/cached/data:/var/cache/bind
     description: Location where locally cached data can be dumped.
@@ -48,5 +60,5 @@ debug:
   - nothing
 microk8s:
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04
     access: You will now be able to connect to the Bind9 server on localhost:30053`.
diff --git a/data/cassandra.yaml b/data/cassandra.yaml
index bda4737..48d9da3 100644
--- a/data/cassandra.yaml
+++ b/data/cassandra.yaml
@@ -1,4 +1,4 @@
-application: Cassandra
+application: Apache Cassandra
 repo: cassandra
 description: >
   Apache Cassandra is an open source NoSQL distributed database trusted by
@@ -7,25 +7,48 @@ description: >
   commodity hardware or cloud infrastructure make it a good platform for
   mission-critical data.
 releases:
-  - track: "4.0"
+  - track: '4.0'
+    base: '22.04'
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '4.0'
     risk: beta
     base: '21.10'
+    deprecated:
+      date: '04/2022'
+      path:
+        track: '4.0'
+        base: '22.04'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "4.0"
+  - track: '4.0'
     risk: beta
     base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '4.0'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "4.0"
+  - track: '4.0'
     risk: beta
     base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '4.0'
+        base: '21.04'
     architectures:
       - amd64
       - arm64
@@ -44,19 +67,19 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 7000:7000
+    value: '7000:7000'
     description: Expose itra-node communication
   - type: -p
-    value: 7001:7001
+    value: '7001:7001'
     description: Expose TLS itra-node communication
   - type: -p
-    value: 7199:7199
+    value: '7199:7199'
     description: Expose JMX
   - type: -p
-    value: 9042:9042
+    value: '9042:9042'
     description: Expose CQL
   - type: -p
-    value: 9160:9160
+    value: '9160:9160'
     description: Expose thrift service
   - type: -v
     value: /local/path/to/data:/var/lib/cassandra
@@ -68,5 +91,5 @@ debug:
   - nothing
 microk8s:
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04
     access: You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042)
diff --git a/data/cortex.yaml b/data/cortex.yaml
index 74bbe0a..e6aa434 100644
--- a/data/cortex.yaml
+++ b/data/cortex.yaml
@@ -10,28 +10,51 @@ description: |
 
   Read more on the [Cortex website](https://cortexmetrics.io/).
 releases:
-  - track: "1.10"
+  - track: '1.11'
+    base: '22.04'
     risk: beta
-    version: "1.10.0"
-    base: 21.10
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "1.7"
+  - track: '1.10'
     risk: beta
-    version: "1.7.0"
-    base: 21.04
+    version: '1.10.0'
+    base: '21.10'
+    deprecated:
+      date: '04/2022'
+      path:
+        track: '1.11'
+        base: '22.04'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: 1.4
+  - track: '1.7'
+    risk: beta
+    version: '1.7.0'
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '1.10'
+        base: '21.10'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '1.4'
     risk: beta
     version: '1.4.0'
-    base: 20.04
+    base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '1.7'
+        base: '21.04'
     architectures:
       - amd64
       - arm64
@@ -46,11 +69,11 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 32709:9009
+    value: '32709:9009'
     description: Expose Cortex on `localhost:32709`.
   - type: -v
     value: /my/local/cortex.yaml:/etc/cortex/cortex.yaml
-    description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml)).
+    description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)).
 debug:
   - nothing
 microk8s:
@@ -58,7 +81,7 @@ microk8s:
     files:
       - key: main-config
         name: cortex.yaml
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04
     access: You will now be able to connect to the Cortex server on `localhost:32709`.
diff --git a/data/grafana.yaml b/data/grafana.yaml
index e01abc0..d000148 100644
--- a/data/grafana.yaml
+++ b/data/grafana.yaml
@@ -4,10 +4,23 @@ description: >
   Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics. 
   Read more on the [Grafana website](https://grafana.com/docs/).
 releases:
+  - track: '8.2'
+    base: '22.04'
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
   - track: '8.1'
     risk: beta
     version: '8.1.0'
-    base: 21.10
+    base: '21.10'
+    deprecated:
+      date: '04/2022'
+      path:
+        track: '8.2'
+        base: '22.04'
     architectures:
       - amd64
       - arm64
@@ -16,7 +29,12 @@ releases:
   - track: '7.4'
     risk: beta
     version: '7.4.0'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '8.1'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -25,7 +43,12 @@ releases:
   - track: '7.2'
     risk: beta
     version: '7.2.0'
-    base: 20.04
+    base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '7.4'
+        base: '21.04'
     architectures:
       - amd64
       - arm64
@@ -40,7 +63,7 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 30000:3000
+    value: '30000:3000'
     description: Expose Grafana on `localhost:30000`.
   - type: -v
     value: /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/
@@ -51,16 +74,16 @@ parameters:
 debug: None
 microk8s:
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04
     access: You will now be able to connect to the Grafana on `http://localhost:30000`.
   configmap:
     files:
     - key: grafana-datasource
       name: datasource.yml
-      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml
+      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04
     - key: grafana-dashboard-definition
       name: dashboard.yml
-      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml
+      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04
     - key: grafana-dashboard
       name: system-stats-dashboard.json
-      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json
+      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04
diff --git a/data/kafka.yaml b/data/kafka.yaml
new file mode 100644
index 0000000..c995b23
--- /dev/null
+++ b/data/kafka.yaml
@@ -0,0 +1,48 @@
+application: Apache Kafka
+repo: kafka
+description: >
+  Apache Kafka is an open-source distributed event streaming platform for high-performance data pipelines, streaming analytics... Read more on the [Apache Kafka website](https://kafka.apache.org/). This image requires the Zookeeper image to run properly.
+releases:
+  - track: '3.1'
+    base: '22.04'
+    risk: beta
+    version: '3.1.0'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 9092:9092
+    - -e ZOOKEEPER_HOST=host.docker.internal
+  access: >
+    Apache Kafka service is now exposed at `localhost:9092` (**You first need to run a Zookeeper instance**: `docker run -d -p 2181:2181 ubuntu/zookeeper:edge`).
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -e
+    value: ZOOKEEPER_HOST=172.17.0.1
+    description: Hostname for the related Zookeeper instance (default value is set to the default IP for the Docker host (host.docker.internal)).
+  - type: -e
+    value: ZOOKEEPER_PORT=2181
+    description: Port for the related Zookeeper instance.
+  - type: -p
+    value: '9092:9092'
+    description: Expose Apache Kafka service on `localhost:9092`.
+  - type: -p
+    value: '2181:2181'
+    description: Expose Apache Zookeeper service on `localhost:2181`.
+  - type: CMD
+    value: kafka-server-start.sh /etc/kafka/server.properties --override zookeeper.connect=host.docker.internal:2181
+    description: Start a Kafka instance, connecting to the Zookeeper instance accessible at `host.docker.internal:2181` from within the Kafka instance container.
+  - type: CMD
+    value: zookeeper-server-start.sh /etc/kafka/zookeeper.properties
+    description: Start a Zookeeper instance.
+debug:
+  - nothing
+microk8s:
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04
+    access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
diff --git a/data/loki.yaml b/data/loki.yaml
new file mode 100644
index 0000000..e81e6e8
--- /dev/null
+++ b/data/loki.yaml
@@ -0,0 +1,43 @@
+application: Grafana Loki™ software
+repo: loki
+description: >
+  Loki is a horizontally scalable, highly available, multi-tenant log aggregation system inspired by Prometheus. Read more on the [Grafana website](https://grafana.com/oss/loki/).
+releases:
+  - track: '2.4'
+    base: '22.04'
+    risk: beta
+    version: '2.4.2'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 3100:3100
+  access: You can now use your Loki instance exposed at `http://localhost:3100`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: '3100:3100'
+    description: Expose Grafana Loki on `localhost:3100`.
+  - type: -v
+    value: /local/path/to/config:/etc/loki/local-config.yaml
+    description: Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04).
+  - type: -v
+    value: lokidata:/loki
+    description: Persist data in a docker volume named `lokidata`.
+debug:
+  - nothing
+microk8s:
+  configmap:
+    name: promtail-config
+    files:
+      - key: promtail
+        name: promtail-local-config-k8s.yaml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04
+    access: You will now be able to connect to the Loki instance on `http://localhost:31000`.
diff --git a/data/memcached.yaml b/data/memcached.yaml
index 97dd683..257d74d 100644
--- a/data/memcached.yaml
+++ b/data/memcached.yaml
@@ -5,9 +5,17 @@ description: >
   Memcached allows to take memory from parts of a system where you have more than you need and make it accessible to areas where you have less than you need. Read more on the [memcached website](https://memcached.org/).
 releases:
   - track: '1.6'
+    base: '22.04'
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '1.6'
     risk: beta
     version: '1.6.9'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -16,7 +24,12 @@ releases:
   - track: '1.6'
     risk: beta
     version: '1.6.9'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '1.6'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -25,7 +38,7 @@ releases:
   - track: '1.5'
     risk: beta
     version: '1.5.22'
-    base: 20.04
+    base: '20.04'
     type: LTS
     architectures:
       - amd64
@@ -54,7 +67,7 @@ parameters:
     value: MEMCACHED_USERNAME
     description: Define a new user. If this option is passed a password is needed to authenticate the new user.
   - type: -p
-    value: 11211
+    value: '11211:11211'
     description: Memcached is exposed inside the container on port `11211`.
 debug:
   text: |
@@ -88,5 +101,5 @@ debug:
     In this case you can append the flags themselves or a shell script to the run command.
 microk8s:
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04
     access: Memcached will be listening on port `31211` in your host.
diff --git a/data/mysql.yaml b/data/mysql.yaml
index 93672a5..ad75ce0 100644
--- a/data/mysql.yaml
+++ b/data/mysql.yaml
@@ -1,4 +1,4 @@
-application: MySQL™
+application: MySQL™ software
 repo: mysql
 description: >
   MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -7,29 +7,46 @@ description: >
   of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
 releases:
   - track: '8.0'
+    base: '22.04'
+    risk: beta
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '8.0'
     risk: beta
     version: '8.0.27'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
+      - ppc64el
       - s390x
   - track: '8.0'
     risk: beta
     version: '8.0.27'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '8.0'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
+      - ppc64el
       - s390x
   - track: '8.0'
     risk: beta
     version: '8.0.22'
-    base: 20.04
+    base: '20.04'
     type: LTS
     architectures:
       - amd64
       - arm64
+      - ppc64el
       - s390x
 docker:
   parameters:
@@ -65,14 +82,14 @@ parameters:
     value: MYSQL_INITSB_SKIP_TZINFO=yes
     description: Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it.
   - type: -p
-    value: 30306:3306
+    value: '30306:3306'
     description: Expose MySQL server on `localhost:30306`.
   - type: -v
     value: /path/to/data:/var/lib/mysql
     description: Persist data instead of initializing a new database every time you launch a new container.
   - type: -v
     value: /path/to/config/files/:/etc/mysql/mysql.conf.d/
-    description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my.cnf)).
+    description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)).
 debug:
   extraparagraph: |
     #### Initialization Scripts
@@ -93,7 +110,7 @@ microk8s:
     files:
       - key: main-config
         name: my-custom.cnf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04
     access: You will now be able to connect to the MySQL server on `localhost:30306`.
diff --git a/data/nginx.yaml b/data/nginx.yaml
index 1bed121..73febd5 100644
--- a/data/nginx.yaml
+++ b/data/nginx.yaml
@@ -4,9 +4,18 @@ description: >
   Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server and as a proxy to reduce the load on back-end HTTP or mail servers. Read more on the [nginx website](https://www.nginx.com/).
 releases:
   - track: '1.18'
+    base: '22.04'
+    risk: beta
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '1.18'
     risk: beta
     version: '1.18.0'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -15,16 +24,21 @@ releases:
   - track: '1.18'
     risk: beta
     version: '1.18.0'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '1.18'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: 1.18
+  - track: '1.18'
     risk: beta
     version: '1.18.0'
-    base: 20.04
+    base: '20.04'
     type: LTS
     architectures:
       - amd64
@@ -40,7 +54,7 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 8080:80
+    value: '8080:80'
     description: Expose Nginx on `localhost:8080`.
   - type: -v
     value: /local/path/to/website:/var/www/html
@@ -50,7 +64,7 @@ parameters:
     description: Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`).
   - type: -v
     value: /path/to/nginx.conf:/etc/nginx/nginx.conf
-    description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf)).
+    description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)).
 debug:
   - nothing
 microk8s:
@@ -58,10 +72,10 @@ microk8s:
     files:
       - key: nginx
         name: nginx.conf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04
       - key: nginx-site
         name: index.html
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04
     access: You will now be able to connect to the nginx server on `http://localhost:31080`.
diff --git a/data/postgres.yaml b/data/postgres.yaml
index 916f4a7..375decc 100644
--- a/data/postgres.yaml
+++ b/data/postgres.yaml
@@ -3,28 +3,42 @@ repo: postgres
 description: >
   PostgreSQL is a powerful, open source object-relational database system. It is fully ACID compliant, has full support for foreign keys, joins, views, triggers, and stored procedures (in multiple languages). It includes most SQL:2008 data types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video. It has native programming interfaces for C/C++, Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation. Read more on the [PostgreSQL website](https://www.postgresql.org/docs/).
 releases:
-  - track: '13.1'
+  - track: '14'
+    base: '22.04'
+    risk: beta
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '13'
     risk: beta
     version: '13.1'
-    base: 21.10
+    base: '21.10'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: '13.1'
+  - track: '13'
     risk: beta
     version: '13.1'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '13.1'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: '12.4'
+  - track: '12'
     risk: beta
     version: '12.4'
-    base: 20.04
+    base: '20.04'
     type: LTS
     architectures:
       - amd64
@@ -62,11 +76,11 @@ parameters:
     value: PGDATA=/path/to/location
     description: Set the location of the database files. The default is `/var/lib/postgresql/data`.
   - type: -p
-    value: 30432:5432
+    value: '30432:5432'
     description: Expose Postgres on `localhost:30432`.
   - type: -v
     value: /path/to/postgresql.conf:/etc/postgresql/postgresql.conf
-    description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf)).
+    description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)).
   - type: -v
     value: /path/to/persisted/data:/var/lib/postgresql/data
     description: Persist data instead of initializing a new database every time you launch a new container.
@@ -90,7 +104,7 @@ microk8s:
     files:
       - key: main-config
         name: postgresql.conf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04
     access: You will now be able to connect to the Postgres server on `localhost:30306`.
diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml
index 62e38f7..234416d 100644
--- a/data/prometheus-alertmanager.yaml
+++ b/data/prometheus-alertmanager.yaml
@@ -3,10 +3,23 @@ repo: prometheus-alertmanager
 description: >
   The Alertmanager handles alerts sent by client applications such as the Prometheus server. It takes care of deduplicating, grouping, and routing them to the correct receiver integration such as email, PagerDuty, or OpsGenie. It also takes care of silencing and inhibition of alerts. Read more on the [Prometheus Alertmanager website](https://prometheus.io/docs/alerting/latest/alertmanager/).
 releases:
+  - track: '0.23'
+    base: '22.04'
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
   - track: '0.22'
     risk: beta
     version: '0.22.0'
-    base: 21.10
+    base: '21.10'
+    deprecated:
+      date: '04/2022'
+      path:
+        track: '0.23'
+        base: '22.04'
     architectures:
       - amd64
       - arm64
@@ -15,7 +28,12 @@ releases:
   - track: '0.21'
     risk: beta
     version: '0.21.0'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '0.22'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -24,7 +42,12 @@ releases:
   - track: '0.21'
     risk: beta
     version: '0.21.0'
-    base: 20.04
+    base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '0.21'
+        base: '21.04'
     architectures:
       - amd64
       - arm64
@@ -39,11 +62,11 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 30093:9093
+    value: '30093:9093'
     description: Expose Prometheus Alertmanager on `localhost:30093`.
   - type: -v
     value: /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml
-    description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml)).
+    description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)).
   - type: -v
     value: /path/to/persisted/data:/alertmanager
     description: "Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container."
@@ -51,10 +74,11 @@ debug:
   - nothing
 microk8s:
   configmap:
+    name: alertmanager-config
     files:
       - key: alertmanager
         name: alertmanager.yml
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04
     access: You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`.
diff --git a/data/prometheus.yaml b/data/prometheus.yaml
index 7b0e61e..2ce4e1e 100644
--- a/data/prometheus.yaml
+++ b/data/prometheus.yaml
@@ -3,10 +3,37 @@ repo: prometheus
 description: >
   Prometheus is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true. Read more on the [Prometheus website](https://prometheus.io/).
 releases:
+  - track: '2.33'
+    base: '22.04'
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '2.32'
+    risk: beta
+    version: '2.32.1'
+    base: '20.04'
+    deprecated:
+      date: '04/2022'
+      path:
+        track: '2.33'
+        base: '22.04'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
   - track: '2.28'
     risk: beta
     version: '2.28.1'
-    base: 21.10
+    base: '21.10'
+    deprecated:
+      date: '02/2022'
+      path:
+        track: '2.32'
+        base: '20.04'
     architectures:
       - amd64
       - arm64
@@ -15,7 +42,12 @@ releases:
   - track: '2.25'
     risk: beta
     version: '2.25.1'
-    base: 21.04
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '2.28'
+        base: '21.10'
     architectures:
       - amd64
       - arm64
@@ -24,7 +56,12 @@ releases:
   - track: '2.20'
     risk: beta
     version: '2.20.1'
-    base: 20.04
+    base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '2.25'
+        base: '21.04'
     architectures:
       - amd64
       - arm64
@@ -39,14 +76,14 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 30090:9090
+    value: '30090:9090'
     description: Expose Prometheus server on `localhost:30090`.
   - type: -v
     value: /path/to/prometheus.yml:/etc/prometheus/prometheus.yml
-    description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml)).
+    description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)).
   - type: -v
     value: /path/to/alerts.yml:/etc/prometheus/alerts.yml
-    description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml)).
+    description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)).
 debug:
   - nothing
 microk8s:
@@ -54,10 +91,10 @@ microk8s:
     files:
       - key: prometheus
         name: prometheus.yml
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04
       - key: prometheus-alerts
         name: alerts.yml
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04
     access: You will now be able to connect to the Prometheus on `http://localhost:30090`.
diff --git a/data/redis.yaml b/data/redis.yaml
index 212336d..7b6089c 100644
--- a/data/redis.yaml
+++ b/data/redis.yaml
@@ -6,27 +6,45 @@ description: >
   Redis has built-in replication, Lua scripting, LRU eviction, transactions and different levels of on-disk persistence, and provides high availability via Redis Sentinel and automatic partitioning with Redis Cluster. 
   Read more on the [Redis website](https://redis.io/topics/introduction).
 releases:
-  - track: "6.0"
-    base: 21.10
-    version: "6.0.15"
+  - track: '6.2'
+    base: '22.04'
     risk: beta
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "6.0"
-    base: 21.04
-    version: "6.0.11"
+  - track: '6.0'
+    base: '21.10'
+    version: '6.0.15'
     risk: beta
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "5.0"
-    version: "5.0.7"
-    base: 20.04
+  - track: '6.0'
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '6.0'
+        base: '21.10'
+    version: '6.0.11'
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '5.0'
+    version: '5.0.7'
+    base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '6.0'
+        base: '21.04'
     risk: beta
     architectures:
       - amd64
@@ -58,11 +76,13 @@ parameters:
     value: REDIS_EXTRA_FLAGS
     description: Specify extra flags to be passed to `redis-server` when initializing it.
   - type: -p
-    value: 30073:6379
+    value: '30073:6379'
     description: Expose redis on `localhost:30073`.
   - type: -v
     value: /path/to/redis.conf:/etc/redis/redis.conf
-    description: Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)).
+    description: >
+      Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)).
+      **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines.
 debug:
   network:
     client: redis-cli
@@ -82,7 +102,7 @@ microk8s:
     files:
       - key: redis
         name: redis.conf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04
     access: You will now be able to connect to the Redis server on `localhost:30073`.
diff --git a/data/squid.yaml b/data/squid.yaml
index d4983ea..fb52624 100644
--- a/data/squid.yaml
+++ b/data/squid.yaml
@@ -7,8 +7,17 @@ description: >
   a great server accelerator. It runs on most available operating systems,
   including Windows and is licensed under the GNU GPL.
 releases:
+  - track: '5.2'
+    base: '22.04'
+    risk: beta
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
   - track: '4.13'
-    risk: edge
+    risk: beta
     version: '4.13'
     base: '21.10'
     architectures:
@@ -35,7 +44,7 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 3128:3128
+    value: '3128:3128'
     description: Expose the proxy service
   - type: -v
     value: /path/to/logs:/var/log/squid
@@ -51,7 +60,7 @@ microk8s:
     files:
       - key: squid
         name: squid.conf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04
     access: You can now access the squid proxy on port 3128
diff --git a/data/telegraf.yaml b/data/telegraf.yaml
index 75225ea..aacae43 100644
--- a/data/telegraf.yaml
+++ b/data/telegraf.yaml
@@ -3,28 +3,46 @@ repo: telegraf
 description: >
   Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics. Read more on the [Telegraf website](https://www.influxdata.com/time-series-platform/telegraf/).
 releases:
-  - track: "1.19"
+  - track: '1.21'
+    base: '22.04'
     risk: beta
-    version: "1.19.2"
-    base: 21.10
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "1.17"
+  - track: '1.19'
     risk: beta
-    version: "1.17.2"
-    base: 21.04
+    version: '1.19.2'
+    base: '21.10'
     architectures:
       - amd64
       - arm64
       - ppc64el
       - s390x
-  - track: "1.15"
+  - track: '1.17'
     risk: beta
-    version: "1.15.2"
-    base: 20.04
+    version: '1.17.2'
+    base: '21.04'
+    deprecated:
+      date: '01/2022'
+      path:
+        track: '1.19'
+        base: '21.10'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '1.15'
+    risk: beta
+    version: '1.15.2'
+    base: '20.04'
+    deprecated:
+      date: '01/2021'
+      path:
+        track: '1.17'
+        base: '21.04'
     architectures:
       - amd64
       - arm64
@@ -39,11 +57,11 @@ parameters:
     value: TZ=UTC
     description: Timezone.
   - type: -p
-    value: 30273:9273
+    value: '30273:9273'
     description: Expose Telegraf on `localhost:30273`.
   - type: -v
     value: /path/to/telegraf.conf:/etc/telegraf/telegraf.conf
-    description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf)).
+    description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)).
 debug:
     - nothing
 microk8s:
@@ -51,7 +69,7 @@ microk8s:
     files:
       - key: main-config
         name: telegraf.conf
-        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04
   deploy:
-    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04
     access: You will now be able to connect to the Telegraf server on `localhost:30073`.
diff --git a/data/zookeeper.yaml b/data/zookeeper.yaml
new file mode 100644
index 0000000..213225a
--- /dev/null
+++ b/data/zookeeper.yaml
@@ -0,0 +1,36 @@
+application: Apache ZooKeeper
+repo: zookeeper
+description: >
+  ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications.
+  Read more on [the Apache website](https://zookeeper.apache.org/).
+  This image is shipped in support of the Apache Kafka image.
+releases:
+  - track: '3.1'
+    base: '22.04'
+    risk: beta
+    version: '3.1.0'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 2181:2181
+  access: Zookeeper instance available at `localhost:2181`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: '2181:2181'
+    description: Expose Apache Zookeeper service on `localhost:2181`.
+  - type: -v
+    value: /etc/kafka/zookeeper.properties
+    description: Zookeeper config (file path within the container can also be set by overriding the CMD).
+debug:
+  - nothing
+microk8s:
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04
+    access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md
index cc18fdf..b77a473 100644
--- a/docs/docker.io/ubuntu/apache2.md
+++ b/docs/docker.io/ubuntu/apache2.md
@@ -1,7 +1,6 @@
 # Apache2 | Ubuntu
 
 Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/apache2`.  -->
 
 
 ## About Apache2
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,7 +19,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`** &nbsp;&nbsp; |  | | Apache2 2.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-21.10_beta` &nbsp;&nbsp; |  | | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `2.4-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +34,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-22.04_beta
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -46,7 +45,7 @@ Access your Apache2 server at `http://localhost:8080`.
 | `-e TZ=UTC` | Timezone. |
 | `-p 8080:80` | Expose Apache2 on `localhost:8080`. |
 | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
-| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf)). |
+| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)). |
 
 
 #### Testing/Debugging
@@ -69,8 +68,8 @@ docker exec -it apache2-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
-[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.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-22.04_beta`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
@@ -92,3 +91,11 @@ docker images --no-trunc --quiet ubuntu/apache2:<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 |
+|---|---|---|---|
+ | ~~2.4-21.04~~ | Apache2 2.4.46 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 2.4-21.10_beta |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md
index f2e3258..327f7c7 100644
--- a/docs/docker.io/ubuntu/bind9.md
+++ b/docs/docker.io/ubuntu/bind9.md
@@ -1,7 +1,6 @@
 # Bind9 | Ubuntu
 
 Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Bind9 or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/bind9`.  -->
 
 
 ## About Bind9
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,7 +19,9 @@ _Tags in italics are not available in ubuntu/bind9 but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`9.16-20.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`9.18-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-21.10_beta` &nbsp;&nbsp; |  | | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;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 +34,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.18-22.04_beta
 ```
 Access your Bind9 server at `localhost:30053`
 
@@ -43,8 +43,9 @@ Access your Bind9 server at `localhost:30053`
 | Parameter | Description |
 |---|---|
 | `-e TZ=UTC` | Timezone. |
-| `-p 1803233` | Expose bind9 on `localhost:30053`. |
-| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)). |
+| `-p 30053:53` | Expose bind9 on `localhost:30053`. |
+| `-e BIND9_USER=bind` | The user which will start the `named` process. |
+| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)). |
 | `-v /path/to/cached/data:/var/cache/bind` | Location where locally cached data can be dumped. |
 | `-v /path/to/resource/records:/var/lib/bind` | Location of Resource Records defining various domain information. |
 
@@ -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?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.18-22.04_beta`), then:
 
 ```sh
 kubectl apply -f bind9-deployment.yml
@@ -90,3 +91,10 @@ docker images --no-trunc --quiet ubuntu/bind9:<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 |
+|---|---|---|---|
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md
index 400f771..eb04d92 100644
--- a/docs/docker.io/ubuntu/cassandra.md
+++ b/docs/docker.io/ubuntu/cassandra.md
@@ -1,10 +1,9 @@
-# Cassandra | Ubuntu
+# Apache Cassandra | Ubuntu
 
-Current Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cassandra or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/cassandra`.  -->
+Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Cassandra or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
 
 
-## About Cassandra
+## About Apache Cassandra
 
 Apache Cassandra is an open source NoSQL distributed database trusted by thousands of companies for scalability and high availability without compromising performance. Linear scalability and proven fault-tolerance on commodity hardware or cloud infrastructure make it a good platform for mission-critical data.
 
@@ -12,7 +11,6 @@ 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.
-<!-- `from lts/cassandra`. -->
 
 ![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).
@@ -21,8 +19,7 @@ _Tags in italics are not available in ubuntu/cassandra but are shown here for co
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.0-21.04_beta`** &nbsp;&nbsp; |  | | Cassandra 4.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.0-20.04_beta` &nbsp;&nbsp; |  | | Cassandra 4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.0-22.04_beta`** &nbsp;&nbsp; |  | | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;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 +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 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-22.04_beta
 ```
 Access your Cassandra server with `cqlsh localhost 9042`.
 
@@ -73,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. `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?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-22.04_beta`), then:
 
 ```sh
 kubectl apply -f cassandra-deployment.yml
@@ -94,3 +91,13 @@ docker images --no-trunc --quiet ubuntu/cassandra:<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 |
+|---|---|---|---|
+ | ~~4.0-21.10~~ | Apache Cassandra 4.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 4.0-22.04_beta |
+ | ~~4.0-21.04~~ | Apache Cassandra 4.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~4.0-21.10~~ |
+ | ~~4.0-20.04~~ | Apache Cassandra 4.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~4.0-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md
index a2d0b20..5e618f0 100644
--- a/docs/docker.io/ubuntu/cortex.md
+++ b/docs/docker.io/ubuntu/cortex.md
@@ -1,7 +1,6 @@
 # Cortex | Ubuntu
 
 Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/cortex`.  -->
 
 
 ## About Cortex
@@ -19,7 +18,6 @@ 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.
-<!-- `from lts/cortex`. -->
 
 ![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).
@@ -28,8 +26,7 @@ _Tags in italics are not available in ubuntu/cortex but are shown here for compl
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.7-21.04_beta`** &nbsp;&nbsp; |  | | Cortex 1.7 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.4-20.04_beta` &nbsp;&nbsp; |  | | Cortex 1.4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.11-22.04_beta`** &nbsp;&nbsp; |  | | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;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`.
@@ -42,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 ubuntu/cortex:1.7-21.04_beta
+docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.11-22.04_beta
 ```
 Access your Cortex server at `http://localhost:32709`.
 
@@ -52,7 +49,7 @@ Access your Cortex server at `http://localhost:32709`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 32709:9009` | Expose Cortex on `localhost:32709`. |
-| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml)). |
+| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)). |
 
 
 #### Testing/Debugging
@@ -75,8 +72,8 @@ docker exec -it cortex-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
-[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.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.11-22.04_beta`), then:
 
 ```sh
 kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
@@ -98,3 +95,13 @@ docker images --no-trunc --quiet ubuntu/cortex:<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 |
+|---|---|---|---|
+ | ~~1.10-21.10~~ | Cortex 1.10.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 1.11-22.04_beta |
+ | ~~1.7-21.04~~ | Cortex 1.7.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~1.10-21.10~~ |
+ | ~~1.4-20.04~~ | Cortex 1.4.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~1.7-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md
index c1aef62..e92143e 100644
--- a/docs/docker.io/ubuntu/grafana.md
+++ b/docs/docker.io/ubuntu/grafana.md
@@ -1,7 +1,6 @@
 # Grafana™ software | Ubuntu
 
 Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/grafana`.  -->
 
 
 ## About Grafana™ software
@@ -12,7 +11,6 @@ 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.
-<!-- `from lts/grafana`. -->
 
 ![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).
@@ -21,8 +19,7 @@ _Tags in italics are not available in ubuntu/grafana but are shown here for comp
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`7.4-21.04_beta`** &nbsp;&nbsp; |  | | Grafana™ software 7.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `7.2-20.04_beta` &nbsp;&nbsp; |  | | Grafana™ software 7.2.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`8.2-22.04_beta`** &nbsp;&nbsp; |  | | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;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 +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 ubuntu/grafana:7.4-21.04_beta
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:8.2-22.04_beta
 ```
 Access your Grafana server at `localhost:30000`.
 
@@ -69,8 +66,8 @@ docker exec -it grafana-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
-[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:
+[datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:8.2-22.04_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
@@ -92,3 +89,13 @@ docker images --no-trunc --quiet ubuntu/grafana:<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 |
+|---|---|---|---|
+ | ~~8.1-21.10~~ | Grafana™ software 8.1.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 8.2-22.04_beta |
+ | ~~7.4-21.04~~ | Grafana™ software 7.4.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~8.1-21.10~~ |
+ | ~~7.2-20.04~~ | Grafana™ software 7.2.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~7.4-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/kafka.md b/docs/docker.io/ubuntu/kafka.md
new file mode 100644
index 0000000..2e6880d
--- /dev/null
+++ b/docs/docker.io/ubuntu/kafka.md
@@ -0,0 +1,100 @@
+# Apache Kafka | Ubuntu
+
+Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Kafka or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+
+
+## About Apache Kafka
+
+Apache Kafka is an open-source distributed event streaming platform for high-performance data pipelines, streaming analytics... Read more on the [Apache Kafka website](https://kafka.apache.org/). This image requires the Zookeeper image to run properly.
+
+
+## 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/kafka`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+_Tags in italics are not available in ubuntu/kafka but are shown here for completeness._
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; |  | | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;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`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires 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 kafka-container -e TZ=UTC -p 9092:9092 -e ZOOKEEPER_HOST=host.docker.internal ubuntu/kafka:3.1-22.04_beta
+```
+Apache Kafka service is now exposed at `localhost:9092` (**You first need to run a Zookeeper instance**: `docker run -d -p 2181:2181 ubuntu/zookeeper:edge`).
+
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e ZOOKEEPER_HOST=172.17.0.1` | Hostname for the related Zookeeper instance (default value is set to the default IP for the Docker host (host.docker.internal)). |
+| `-e ZOOKEEPER_PORT=2181` | Port for the related Zookeeper instance. |
+| `-p 9092:9092` | Expose Apache Kafka service on `localhost:9092`. |
+| `-p 2181:2181` | Expose Apache Zookeeper service on `localhost:2181`. |
+| `CMD kafka-server-start.sh /etc/kafka/server.properties --override zookeeper.connect=host.docker.internal:2181` | Start a Kafka instance, connecting to the Zookeeper instance accessible at `host.docker.internal:2181` from within the Kafka instance container. |
+| `CMD zookeeper-server-start.sh /etc/kafka/zookeeper.properties` | Start a Zookeeper instance. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f kafka-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it kafka-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[kafka-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `ubuntu/kafka:3.1-22.04_beta`), then:
+
+```sh
+kubectl apply -f kafka-deployment.yml
+```
+
+Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
+
+## 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 "`kafka: <issue summary>`". Make sure to include the digest of the image you are using, from:
+
+```sh
+docker images --no-trunc --quiet ubuntu/kafka:<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 |
+|---|---|---|---|
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/loki.md b/docs/docker.io/ubuntu/loki.md
new file mode 100644
index 0000000..bfc31b2
--- /dev/null
+++ b/docs/docker.io/ubuntu/loki.md
@@ -0,0 +1,98 @@
+# Grafana Loki™ software | Ubuntu
+
+Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana Loki™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+
+
+## About Grafana Loki™ software
+
+Loki is a horizontally scalable, highly available, multi-tenant log aggregation system inspired by Prometheus. Read more on the [Grafana website](https://grafana.com/oss/loki/).
+
+
+## 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/loki`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+_Tags in italics are not available in ubuntu/loki but are shown here for completeness._
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; |  | | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;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`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires 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 loki-container -e TZ=UTC -p 3100:3100 ubuntu/loki:2.4-22.04_beta
+```
+You can now use your Loki instance exposed at `http://localhost:3100`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 3100:3100` | Expose Grafana Loki on `localhost:3100`. |
+| `-v /local/path/to/config:/etc/loki/local-config.yaml` | Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04). |
+| `-v lokidata:/loki` | Persist data in a docker volume named `lokidata`. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f loki-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it loki-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[promtail-local-config-k8s.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04) and
+[loki-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `ubuntu/loki:2.4-22.04_beta`), then:
+
+```sh
+kubectl create configmap promtail-config --from-file=promtail=promtail-local-config-k8s.yaml
+kubectl apply -f loki-deployment.yml
+```
+
+You will now be able to connect to the Loki instance on `http://localhost:31000`.
+
+## 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 "`loki: <issue summary>`". Make sure to include the digest of the image you are using, from:
+
+```sh
+docker images --no-trunc --quiet ubuntu/loki:<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 |
+|---|---|---|---|
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md
index b03808f..29d33e1 100644
--- a/docs/docker.io/ubuntu/memcached.md
+++ b/docs/docker.io/ubuntu/memcached.md
@@ -1,7 +1,6 @@
 # Memcached | Ubuntu
 
 Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/memcached`.  -->
 
 
 ## About Memcached
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,7 +19,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`** &nbsp;&nbsp; |  | | Memcached 1.6 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.6-22.04_beta`** &nbsp;&nbsp; |  | | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.6-21.10_beta` &nbsp;&nbsp; |  | | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.5-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +34,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-22.04_beta
 ```
 
 #### Parameters
@@ -48,7 +47,7 @@ docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.6-21.04_b
 | `-e MEMCACHED_THREADS=4` | Determines the number of threads to process requests. |
 | `-e MEMCACHED_PASSWORD` | Define the password for the `root` user if another username is provided. By default the authentication is disabled but if this option is passed it becomes enabled. |
 | `-e MEMCACHED_USERNAME` | Define a new user. If this option is passed a password is needed to authenticate the new user. |
-| `-p 11211` | Memcached is exposed inside the container on port `11211`. |
+| `-p 11211:11211` | Memcached is exposed inside the container on port `11211`. |
 
 
 #### Testing/Debugging
@@ -100,7 +99,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?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
@@ -121,3 +120,11 @@ docker images --no-trunc --quiet ubuntu/memcached:<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 |
+|---|---|---|---|
+ | ~~1.6-21.04~~ | Memcached 1.6.9 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 1.6-21.10_beta |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md
index 5129a97..e1b2916 100644
--- a/docs/docker.io/ubuntu/mysql.md
+++ b/docs/docker.io/ubuntu/mysql.md
@@ -1,10 +1,9 @@
-# MySQL™ | Ubuntu
+# MySQL™ software | Ubuntu
 
-Current MySQL™ Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/mysql`.  -->
+Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
 
 
-## About MySQL™
+## About MySQL™ software
 
 MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and ease of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
 
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,8 +19,9 @@ _Tags in italics are not available in ubuntu/mysql but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`8.0-21.04_beta`** &nbsp;&nbsp; |  | | MySQL™ 8.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
- | `8.0-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+ | **`8.0-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-21.10_beta` &nbsp;&nbsp; |  | | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;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 +34,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-22.04_beta
 ```
 Access your MySQL server at `localhost:30306`.
 
@@ -54,7 +53,7 @@ Access your MySQL server at `localhost:30306`.
 | `-e MYSQL_INITSB_SKIP_TZINFO=yes` | Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it. |
 | `-p 30306:3306` | Expose MySQL server on `localhost:30306`. |
 | `-v /path/to/data:/var/lib/mysql` | Persist data instead of initializing a new database every time you launch a new container. |
-| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my.cnf)). |
+| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)). |
 
 #### Initialization Scripts
 
@@ -86,7 +85,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-22.04_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.
 
@@ -95,8 +94,8 @@ The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged i
 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
-[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:
+[my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-22.04_beta`), then:
 
 ```sh
 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
@@ -118,3 +117,11 @@ docker images --no-trunc --quiet ubuntu/mysql:<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 |
+|---|---|---|---|
+ | ~~8.0-21.04~~ | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 8.0-21.10_beta |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md
index 710e302..e83354c 100644
--- a/docs/docker.io/ubuntu/nginx.md
+++ b/docs/docker.io/ubuntu/nginx.md
@@ -1,7 +1,6 @@
 # Nginx | Ubuntu
 
 Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/nginx`.  -->
 
 
 ## About Nginx
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,7 +19,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`** &nbsp;&nbsp; |  | | Nginx 1.18 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.18-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-21.10_beta` &nbsp;&nbsp; |  | | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
  | `1.18-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
@@ -35,7 +34,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-22.04_beta
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -47,7 +46,7 @@ Access your Nginx server at `http://localhost:8080`.
 | `-p 8080:80` | Expose Nginx on `localhost:8080`. |
 | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
 | `-v /path/to/conf.template:/etc/nginx/templates/conf.template` | Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`). |
-| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf)). |
+| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)). |
 
 
 #### Testing/Debugging
@@ -70,8 +69,8 @@ docker exec -it nginx-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
-[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.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-22.04_beta`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
@@ -93,3 +92,11 @@ docker images --no-trunc --quiet ubuntu/nginx:<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 |
+|---|---|---|---|
+ | ~~1.18-21.04~~ | Nginx 1.18.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 1.18-21.10_beta |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md
index 2ca4ef0..7cb092c 100644
--- a/docs/docker.io/ubuntu/postgres.md
+++ b/docs/docker.io/ubuntu/postgres.md
@@ -1,7 +1,6 @@
 # Postgres | Ubuntu
 
 Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/postgres`.  -->
 
 
 ## About Postgres
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,8 +19,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`** &nbsp;&nbsp; |  | | Postgres 13.1 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
- | `12.4-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+ | **`14-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `13-21.10_beta` &nbsp;&nbsp; |  | | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `12-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;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 +34,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:14-22.04_beta
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -52,7 +51,7 @@ Access your PostgreSQL server at `localhost:30432`.
 | `-e POSTGRES_HOST_AUTH_METHOD=trust` | Set the `auth-method` for `host` connections for `all` databases, `all` users, and `all` addresses. The following will be added to the `pg_hba.conf` if this option is passed: `host all all all $POSTGRES_HOST_AUTH_METHOD`. |
 | `-e PGDATA=/path/to/location` | Set the location of the database files. The default is `/var/lib/postgresql/data`. |
 | `-p 30432:5432` | Expose Postgres on `localhost:30432`. |
-| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf)). |
+| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)). |
 | `-v /path/to/persisted/data:/var/lib/postgresql/data` | Persist data instead of initializing a new database every time you launch a new container. |
 
 #### Initialization Scripts
@@ -85,7 +84,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:14-22.04_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.
 
@@ -94,8 +93,8 @@ The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged i
 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
-[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:
+[postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:14-22.04_beta`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
@@ -117,3 +116,11 @@ docker images --no-trunc --quiet ubuntu/postgres:<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 |
+|---|---|---|---|
+ | ~~13-21.04~~ | Postgres 13.1 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~13.1-21.10~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md
index 89fa94c..a06fffe 100644
--- a/docs/docker.io/ubuntu/prometheus-alertmanager.md
+++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md
@@ -1,7 +1,6 @@
 # Prometheus Alertmanager | Ubuntu
 
 Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/prometheus-alertmanager`.  -->
 
 
 ## About Prometheus Alertmanager
@@ -12,7 +11,6 @@ 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.
-<!-- `from lts/prometheus-alertmanager`. -->
 
 ![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).
@@ -21,8 +19,7 @@ _Tags in italics are not available in ubuntu/prometheus-alertmanager but are sho
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`0.21-21.04_beta`** &nbsp;&nbsp; |  | | Prometheus Alertmanager 0.21 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `0.21-20.04_beta` &nbsp;&nbsp; |  | | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`0.23-22.04_beta`** &nbsp;&nbsp; |  | | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;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 +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 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.23-22.04_beta
 ```
 Access your Prometheus Alertmanager server at `localhost:30093`.
 
@@ -45,7 +42,7 @@ Access your Prometheus Alertmanager server at `localhost:30093`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30093:9093` | Expose Prometheus Alertmanager on `localhost:30093`. |
-| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml)). |
+| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)). |
 | `-v /path/to/persisted/data:/alertmanager` | Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container. |
 
 
@@ -69,11 +66,11 @@ docker exec -it prometheus-alertmanager-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
-[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:
+[alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.23-22.04_beta`), then:
 
 ```sh
-kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
+kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml
 kubectl apply -f prometheus-alertmanager-deployment.yml
 ```
 
@@ -92,3 +89,13 @@ docker images --no-trunc --quiet ubuntu/prometheus-alertmanager:<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 |
+|---|---|---|---|
+ | ~~0.22-21.10~~ | Prometheus Alertmanager 0.22.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 0.23-22.04_beta |
+ | ~~0.21-21.04~~ | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~0.22-21.10~~ |
+ | ~~0.21-20.04~~ | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~0.21-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md
index 9bbeb86..52e94f1 100644
--- a/docs/docker.io/ubuntu/prometheus.md
+++ b/docs/docker.io/ubuntu/prometheus.md
@@ -1,7 +1,6 @@
 # Prometheus | Ubuntu
 
 Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/prometheus`.  -->
 
 
 ## About Prometheus
@@ -12,7 +11,6 @@ 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.
-<!-- `from lts/prometheus`. -->
 
 ![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).
@@ -21,8 +19,7 @@ _Tags in italics are not available in ubuntu/prometheus but are shown here for c
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.25-21.04_beta`** &nbsp;&nbsp; |  | | Prometheus 2.25 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.20-20.04_beta` &nbsp;&nbsp; |  | | Prometheus 2.20.1 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.33-22.04_beta`** &nbsp;&nbsp; |  | | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;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 +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 ubuntu/prometheus:2.25-21.04_beta
+docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.33-22.04_beta
 ```
 Access your Prometheus server at `localhost:30090`.
 
@@ -45,8 +42,8 @@ Access your Prometheus server at `localhost:30090`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30090:9090` | Expose Prometheus server on `localhost:30090`. |
-| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml)). |
-| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml)). |
+| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)). |
+| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)). |
 
 
 #### Testing/Debugging
@@ -69,8 +66,8 @@ docker exec -it prometheus-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
-[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.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.33-22.04_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml
@@ -92,3 +89,14 @@ docker images --no-trunc --quiet ubuntu/prometheus:<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 |
+|---|---|---|---|
+ | ~~2.28-21.10~~ | Prometheus 2.28.1 on Ubuntu&nbsp;21.10&nbsp; | 02/2022 | ~~2.32-20.04~~ |
+ | ~~2.25-21.04~~ | Prometheus 2.25.1 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~2.28-21.10~~ |
+ | ~~2.32-20.04~~ | Prometheus 2.32.1 on Ubuntu&nbsp;20.04&nbsp;LTS | 04/2022 | 2.33-22.04_beta |
+ | ~~2.20-20.04~~ | Prometheus 2.20.1 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~2.25-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md
index 052a0c1..34330ab 100644
--- a/docs/docker.io/ubuntu/redis.md
+++ b/docs/docker.io/ubuntu/redis.md
@@ -1,7 +1,6 @@
 # Redis™ software | Ubuntu
 
 Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Redis™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/redis`.  -->
 
 
 ## About Redis™ software
@@ -12,7 +11,6 @@ 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.
-<!-- `from lts/redis`. -->
 
 ![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).
@@ -21,8 +19,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`** &nbsp;&nbsp; |  | | Redis™ software 6.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `5.0-20.04_beta` &nbsp;&nbsp; |  | | Redis™ software 5.0.7 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`6.2-22.04_beta`** &nbsp;&nbsp; |  | | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.10_beta` &nbsp;&nbsp; |  | | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp;| `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 +33,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.2-22.04_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -50,7 +48,8 @@ Access your Redis server at `localhost:30073`.
 | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). |
 | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. |
 | `-p 30073:6379` | Expose redis on `localhost:30073`. |
-| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)). |
+| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines.
+ |
 
 
 #### Testing/Debugging
@@ -72,7 +71,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.2-22.04_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -89,8 +88,8 @@ redis:6379>
 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
-[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.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.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
@@ -112,3 +111,12 @@ docker images --no-trunc --quiet ubuntu/redis:<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 |
+|---|---|---|---|
+ | ~~6.0-21.04~~ | Redis™ software 6.0.11 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 6.0-21.10_beta |
+ | ~~5.0-20.04~~ | Redis™ software 5.0.7 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~6.0-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md
index 0e26afa..7dc7ebd 100644
--- a/docs/docker.io/ubuntu/squid.md
+++ b/docs/docker.io/ubuntu/squid.md
@@ -1,7 +1,6 @@
 # Squid | Ubuntu
 
 Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Squid or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/squid`.  -->
 
 
 ## About Squid
@@ -12,7 +11,6 @@ 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.
-<!-- `from 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).
@@ -21,8 +19,9 @@ _Tags in italics are not available in ubuntu/squid but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.10-20.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.13-21.10_edge` &nbsp;&nbsp; |  | | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`5.2-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.13-21.10_beta` &nbsp;&nbsp; |  | | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.10-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;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 +34,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:5.2-22.04_beta
 ```
 Access your Squid proxy at `localhost:3128`.
 
@@ -69,8 +68,8 @@ docker exec -it squid-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
-[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.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:5.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap squid-config --from-file=squid=squid.conf
@@ -92,3 +91,10 @@ docker images --no-trunc --quiet ubuntu/squid:<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 |
+|---|---|---|---|
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md
index 614b5b6..cfb8f51 100644
--- a/docs/docker.io/ubuntu/telegraf.md
+++ b/docs/docker.io/ubuntu/telegraf.md
@@ -1,7 +1,6 @@
 # Telegraf™ software | Ubuntu
 
 Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Telegraf™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/telegraf`.  -->
 
 
 ## About Telegraf™ software
@@ -12,7 +11,6 @@ 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.
-<!-- `from lts/telegraf`. -->
 
 ![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).
@@ -21,8 +19,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`** &nbsp;&nbsp; |  | | Telegraf™ software 1.17 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.15-20.04_beta` &nbsp;&nbsp; |  | | Telegraf™ software 1.15.2 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.21-22.04_beta`** &nbsp;&nbsp; |  | | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.19-21.10_beta` &nbsp;&nbsp; |  | | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp;| `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 +33,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.21-22.04_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -45,7 +43,7 @@ Access your Telegraf server at `localhost:30273`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30273:9273` | Expose Telegraf on `localhost:30273`. |
-| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf)). |
+| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)). |
 
 
 #### Testing/Debugging
@@ -68,8 +66,8 @@ docker exec -it telegraf-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
-[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.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.21-22.04_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
@@ -91,3 +89,12 @@ docker images --no-trunc --quiet ubuntu/telegraf:<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 |
+|---|---|---|---|
+ | ~~1.17-21.04~~ | Telegraf™ software 1.17.2 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 1.19-21.10_beta |
+ | ~~1.15-20.04~~ | Telegraf™ software 1.15.2 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~1.17-21.04~~ |
+| _`track`_ |
+
diff --git a/docs/docker.io/ubuntu/zookeeper.md b/docs/docker.io/ubuntu/zookeeper.md
new file mode 100644
index 0000000..98180d0
--- /dev/null
+++ b/docs/docker.io/ubuntu/zookeeper.md
@@ -0,0 +1,95 @@
+# Apache ZooKeeper | Ubuntu
+
+Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache ZooKeeper or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+
+
+## About Apache ZooKeeper
+
+ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Read more on [the Apache website](https://zookeeper.apache.org/). This image is shipped in support of the Apache Kafka image.
+
+
+## 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/zookeeper`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+_Tags in italics are not available in ubuntu/zookeeper but are shown here for completeness._
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; |  | | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;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`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires 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 zookeeper-container -e TZ=UTC -p 2181:2181 ubuntu/zookeeper:3.1-22.04_beta
+```
+Zookeeper instance available at `localhost:2181`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 2181:2181` | Expose Apache Zookeeper service on `localhost:2181`. |
+| `-v /etc/kafka/zookeeper.properties` | Zookeeper config (file path within the container can also be set by overriding the CMD). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f zookeeper-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it zookeeper-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[zookeeper-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `ubuntu/zookeeper:3.1-22.04_beta`), then:
+
+```sh
+kubectl apply -f zookeeper-deployment.yml
+```
+
+Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
+
+## 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 "`zookeeper: <issue summary>`". Make sure to include the digest of the image you are using, from:
+
+```sh
+docker images --no-trunc --quiet ubuntu/zookeeper:<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 |
+|---|---|---|---|
+| _`track`_ |
+
diff --git a/docs/public.ecr.aws/lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md
index 8dcac7e..93dc477 100644
--- a/docs/public.ecr.aws/lts/apache2.md
+++ b/docs/public.ecr.aws/lts/apache2.md
@@ -20,7 +20,8 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [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 |
 |---|---|---|---|---|
- | **`2.4-20.04_beta`** &nbsp;&nbsp; | - | - | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -36,7 +37,7 @@ If your usage includes redistribution, please [contact Canonical](https://ubuntu
 Launch this image locally:
 
 ```sh
-docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/lts/apache2:2.4-20.04_beta
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/lts/apache2:2.4-22.04_beta
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -47,7 +48,7 @@ Access your Apache2 server at `http://localhost:8080`.
 | `-e TZ=UTC` | Timezone. |
 | `-p 8080:80` | Expose Apache2 on `localhost:8080`. |
 | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
-| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf)). |
+| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)). |
 
 
 #### Testing/Debugging
@@ -70,8 +71,8 @@ docker exec -it apache2-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
-[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. `public.ecr.aws/lts/apache2:2.4-20.04_beta`), then:
+[apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/apache2:2.4-22.04_beta`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md
index b53c2a8..f30b9e1 100644
--- a/docs/public.ecr.aws/lts/bind9.md
+++ b/docs/public.ecr.aws/lts/bind9.md
@@ -20,7 +20,8 @@ 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`** &nbsp;&nbsp; | - | - | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`9.18-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -36,7 +37,7 @@ If your usage includes redistribution, please [contact Canonical](https://ubuntu
 Launch this image locally:
 
 ```sh
-docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/lts/bind9:9.16-20.04_beta
+docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/lts/bind9:9.18-22.04_beta
 ```
 Access your Bind9 server at `localhost:30053`
 
@@ -45,8 +46,9 @@ Access your Bind9 server at `localhost:30053`
 | Parameter | Description |
 |---|---|
 | `-e TZ=UTC` | Timezone. |
-| `-p 1803233` | Expose bind9 on `localhost:30053`. |
-| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)). |
+| `-p 30053:53` | Expose bind9 on `localhost:30053`. |
+| `-e BIND9_USER=bind` | The user which will start the `named` process. |
+| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)). |
 | `-v /path/to/cached/data:/var/cache/bind` | Location where locally cached data can be dumped. |
 | `-v /path/to/resource/records:/var/lib/bind` | Location of Resource Records defining various domain information. |
 
@@ -71,7 +73,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. `public.ecr.aws/lts/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?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/bind9:9.18-22.04_beta`), then:
 
 ```sh
 kubectl apply -f bind9-deployment.yml
diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md
index 0b9303e..f342728 100644
--- a/docs/public.ecr.aws/lts/cassandra.md
+++ b/docs/public.ecr.aws/lts/cassandra.md
@@ -1,10 +1,10 @@
-# Cassandra LTS Docker Image
+# Apache Cassandra LTS Docker Image
  **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## 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 Cassandra
+## About Apache Cassandra
 
 Apache Cassandra is an open source NoSQL distributed database trusted by thousands of companies for scalability and high availability without compromising performance. Linear scalability and proven fault-tolerance on commodity hardware or cloud infrastructure make it a good platform for mission-critical data.
 
@@ -73,7 +73,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/lts/cassandra:latest`), then:
+[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cassandra:latest`), then:
 
 ```sh
 kubectl apply -f cassandra-deployment.yml
diff --git a/docs/public.ecr.aws/lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md
index b321fda..22ff38a 100644
--- a/docs/public.ecr.aws/lts/cortex.md
+++ b/docs/public.ecr.aws/lts/cortex.md
@@ -52,7 +52,7 @@ Access your Cortex server at `http://localhost:32709`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 32709:9009` | Expose Cortex on `localhost:32709`. |
-| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml)). |
+| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)). |
 
 
 #### Testing/Debugging
@@ -75,8 +75,8 @@ docker exec -it cortex-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
-[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/lts/cortex:latest`), then:
+[cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cortex:latest`), then:
 
 ```sh
 kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
diff --git a/docs/public.ecr.aws/lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md
index 3e003fa..eee018e 100644
--- a/docs/public.ecr.aws/lts/grafana.md
+++ b/docs/public.ecr.aws/lts/grafana.md
@@ -69,8 +69,8 @@ docker exec -it grafana-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
-[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/lts/grafana:latest`), then:
+[datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/grafana:latest`), 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/lts/kafka.md b/docs/public.ecr.aws/lts/kafka.md
new file mode 100644
index 0000000..b5a607c
--- /dev/null
+++ b/docs/public.ecr.aws/lts/kafka.md
@@ -0,0 +1,95 @@
+# Apache Kafka LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
+
+## 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 Apache Kafka
+
+Apache Kafka is an open-source distributed event streaming platform for high-performance data pipelines, streaming analytics... Read more on the [Apache Kafka website](https://kafka.apache.org/). This image requires the Zookeeper image to run properly.
+
+
+## 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/kafka`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _Tags in italics are not available in public.ecr.aws/lts/kafka but are shown here for completeness._ -->
+
+| 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 |
+|---|---|---|---|---|
+| _`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`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+
+If your usage includes redistribution, please [contact Canonical](https://ubuntu.com/security/docker-images#get-in-touch).
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name kafka-container -e TZ=UTC -p 9092:9092 -e ZOOKEEPER_HOST=host.docker.internal public.ecr.aws/lts/kafka:latest
+```
+Apache Kafka service is now exposed at `localhost:9092` (**You first need to run a Zookeeper instance**: `docker run -d -p 2181:2181 ubuntu/zookeeper:edge`).
+
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e ZOOKEEPER_HOST=172.17.0.1` | Hostname for the related Zookeeper instance (default value is set to the default IP for the Docker host (host.docker.internal)). |
+| `-e ZOOKEEPER_PORT=2181` | Port for the related Zookeeper instance. |
+| `-p 9092:9092` | Expose Apache Kafka service on `localhost:9092`. |
+| `-p 2181:2181` | Expose Apache Zookeeper service on `localhost:2181`. |
+| `CMD kafka-server-start.sh /etc/kafka/server.properties --override zookeeper.connect=host.docker.internal:2181` | Start a Kafka instance, connecting to the Zookeeper instance accessible at `host.docker.internal:2181` from within the Kafka instance container. |
+| `CMD zookeeper-server-start.sh /etc/kafka/zookeeper.properties` | Start a Zookeeper instance. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f kafka-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it kafka-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[kafka-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/kafka:latest`), then:
+
+```sh
+kubectl apply -f kafka-deployment.yml
+```
+
+Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
+
+## 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 "`kafka: <issue summary>`". Make sure to include the digest of the image you are using, from:
+
+```sh
+docker images --no-trunc --quiet public.ecr.aws/lts/kafka:<tag>
+```
+
diff --git a/docs/public.ecr.aws/lts/loki.md b/docs/public.ecr.aws/lts/loki.md
new file mode 100644
index 0000000..ecf492d
--- /dev/null
+++ b/docs/public.ecr.aws/lts/loki.md
@@ -0,0 +1,93 @@
+# Grafana Loki™ software LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
+
+## 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 Grafana Loki™ software
+
+Loki is a horizontally scalable, highly available, multi-tenant log aggregation system inspired by Prometheus. Read more on the [Grafana website](https://grafana.com/oss/loki/).
+
+
+## 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/loki`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _Tags in italics are not available in public.ecr.aws/lts/loki but are shown here for completeness._ -->
+
+| 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 |
+|---|---|---|---|---|
+| _`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`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+
+If your usage includes redistribution, please [contact Canonical](https://ubuntu.com/security/docker-images#get-in-touch).
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name loki-container -e TZ=UTC -p 3100:3100 public.ecr.aws/lts/loki:latest
+```
+You can now use your Loki instance exposed at `http://localhost:3100`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 3100:3100` | Expose Grafana Loki on `localhost:3100`. |
+| `-v /local/path/to/config:/etc/loki/local-config.yaml` | Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04). |
+| `-v lokidata:/loki` | Persist data in a docker volume named `lokidata`. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f loki-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it loki-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[promtail-local-config-k8s.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04) and
+[loki-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/loki:latest`), then:
+
+```sh
+kubectl create configmap promtail-config --from-file=promtail=promtail-local-config-k8s.yaml
+kubectl apply -f loki-deployment.yml
+```
+
+You will now be able to connect to the Loki instance on `http://localhost:31000`.
+
+## 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 "`loki: <issue summary>`". Make sure to include the digest of the image you are using, from:
+
+```sh
+docker images --no-trunc --quiet public.ecr.aws/lts/loki:<tag>
+```
+
diff --git a/docs/public.ecr.aws/lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md
index 2403521..f1682e8 100644
--- a/docs/public.ecr.aws/lts/memcached.md
+++ b/docs/public.ecr.aws/lts/memcached.md
@@ -20,7 +20,7 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques
 
 | 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 |
 |---|---|---|---|---|
- | **`1.5-20.04_beta`** &nbsp;&nbsp; | - | - | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.5-20.04_beta`** &nbsp;&nbsp; | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -49,7 +49,7 @@ docker run -d --name memcached-container -e TZ=UTC  public.ecr.aws/lts/memcached
 | `-e MEMCACHED_THREADS=4` | Determines the number of threads to process requests. |
 | `-e MEMCACHED_PASSWORD` | Define the password for the `root` user if another username is provided. By default the authentication is disabled but if this option is passed it becomes enabled. |
 | `-e MEMCACHED_USERNAME` | Define a new user. If this option is passed a password is needed to authenticate the new user. |
-| `-p 11211` | Memcached is exposed inside the container on port `11211`. |
+| `-p 11211:11211` | Memcached is exposed inside the container on port `11211`. |
 
 
 #### Testing/Debugging
@@ -101,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. `public.ecr.aws/lts/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. `public.ecr.aws/lts/memcached:1.5-20.04_beta`), then:
 
 ```sh
 kubectl apply -f memcached-deployment.yml
diff --git a/docs/public.ecr.aws/lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md
index d3cf571..86d8d62 100644
--- a/docs/public.ecr.aws/lts/mysql.md
+++ b/docs/public.ecr.aws/lts/mysql.md
@@ -1,10 +1,10 @@
-# MySQL™ LTS Docker Image
+# MySQL™ software LTS Docker Image
  
 
 ## 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 MySQL™
+## About MySQL™ software
 
 MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and ease of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
 
@@ -20,7 +20,8 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [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 |
 |---|---|---|---|---|
- | **`8.0-20.04_beta`** &nbsp;&nbsp; | - | - | MySQL™ 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+ | **`8.0-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -36,7 +37,7 @@ If your usage includes redistribution, please [contact Canonical](https://ubuntu
 Launch this image locally:
 
 ```sh
-docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/lts/mysql:8.0-20.04_beta
+docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/lts/mysql:8.0-22.04_beta
 ```
 Access your MySQL server at `localhost:30306`.
 
@@ -55,7 +56,7 @@ Access your MySQL server at `localhost:30306`.
 | `-e MYSQL_INITSB_SKIP_TZINFO=yes` | Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it. |
 | `-p 30306:3306` | Expose MySQL server on `localhost:30306`. |
 | `-v /path/to/data:/var/lib/mysql` | Persist data instead of initializing a new database every time you launch a new container. |
-| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my.cnf)). |
+| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)). |
 
 #### Initialization Scripts
 
@@ -87,7 +88,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 public.ecr.aws/lts/mysql:8.0-20.04_beta mysql -hmysql-container -uroot -p
+$ docker run -it --rm --network mysql-network public.ecr.aws/lts/mysql:8.0-22.04_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,8 +97,8 @@ The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged i
 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
-[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. `public.ecr.aws/lts/mysql:8.0-20.04_beta`), then:
+[my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/mysql:8.0-22.04_beta`), then:
 
 ```sh
 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
diff --git a/docs/public.ecr.aws/lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md
index 2ba7470..d9a2b7e 100644
--- a/docs/public.ecr.aws/lts/nginx.md
+++ b/docs/public.ecr.aws/lts/nginx.md
@@ -20,7 +20,8 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [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 |
 |---|---|---|---|---|
- | **`1.18-20.04_beta`** &nbsp;&nbsp; | - | - | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.18-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -36,7 +37,7 @@ If your usage includes redistribution, please [contact Canonical](https://ubuntu
 Launch this image locally:
 
 ```sh
-docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/lts/nginx:1.18-20.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/lts/nginx:1.18-22.04_beta
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -48,7 +49,7 @@ Access your Nginx server at `http://localhost:8080`.
 | `-p 8080:80` | Expose Nginx on `localhost:8080`. |
 | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
 | `-v /path/to/conf.template:/etc/nginx/templates/conf.template` | Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`). |
-| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf)). |
+| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)). |
 
 
 #### Testing/Debugging
@@ -71,8 +72,8 @@ docker exec -it nginx-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
-[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. `public.ecr.aws/lts/nginx:1.18-20.04_beta`), then:
+[nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/nginx:1.18-22.04_beta`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md
index d39a9db..fe2a004 100644
--- a/docs/public.ecr.aws/lts/postgres.md
+++ b/docs/public.ecr.aws/lts/postgres.md
@@ -20,7 +20,8 @@ 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`** &nbsp;&nbsp; | - | - | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+ | **`14-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `12-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -36,7 +37,7 @@ If your usage includes redistribution, please [contact Canonical](https://ubuntu
 Launch this image locally:
 
 ```sh
-docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/lts/postgres:12.4-20.04_beta
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/lts/postgres:14-22.04_beta
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -53,7 +54,7 @@ Access your PostgreSQL server at `localhost:30432`.
 | `-e POSTGRES_HOST_AUTH_METHOD=trust` | Set the `auth-method` for `host` connections for `all` databases, `all` users, and `all` addresses. The following will be added to the `pg_hba.conf` if this option is passed: `host all all all $POSTGRES_HOST_AUTH_METHOD`. |
 | `-e PGDATA=/path/to/location` | Set the location of the database files. The default is `/var/lib/postgresql/data`. |
 | `-p 30432:5432` | Expose Postgres on `localhost:30432`. |
-| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf)). |
+| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)). |
 | `-v /path/to/persisted/data:/var/lib/postgresql/data` | Persist data instead of initializing a new database every time you launch a new container. |
 
 #### Initialization Scripts
@@ -86,7 +87,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 public.ecr.aws/lts/postgres:12.4-20.04_beta psql -h postgres-container -U postgres
+$ docker run -it --rm --network postgres-network public.ecr.aws/lts/postgres:14-22.04_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,8 +96,8 @@ The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged i
 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
-[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. `public.ecr.aws/lts/postgres:12.4-20.04_beta`), then:
+[postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/postgres:14-22.04_beta`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
diff --git a/docs/public.ecr.aws/lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
index c204b27..abaebf4 100644
--- a/docs/public.ecr.aws/lts/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
@@ -45,7 +45,7 @@ Access your Prometheus Alertmanager server at `localhost:30093`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30093:9093` | Expose Prometheus Alertmanager on `localhost:30093`. |
-| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml)). |
+| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)). |
 | `-v /path/to/persisted/data:/alertmanager` | Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container. |
 
 
@@ -69,11 +69,11 @@ docker exec -it prometheus-alertmanager-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
-[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/lts/prometheus-alertmanager:latest`), then:
+[alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus-alertmanager:latest`), then:
 
 ```sh
-kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
+kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml
 kubectl apply -f prometheus-alertmanager-deployment.yml
 ```
 
diff --git a/docs/public.ecr.aws/lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md
index 5b8bfc3..d33d6d3 100644
--- a/docs/public.ecr.aws/lts/prometheus.md
+++ b/docs/public.ecr.aws/lts/prometheus.md
@@ -45,8 +45,8 @@ Access your Prometheus server at `localhost:30090`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30090:9090` | Expose Prometheus server on `localhost:30090`. |
-| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml)). |
-| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml)). |
+| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)). |
+| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)). |
 
 
 #### Testing/Debugging
@@ -69,8 +69,8 @@ docker exec -it prometheus-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
-[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/lts/prometheus:latest`), then:
+[prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus:latest`), 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/lts/redis.md b/docs/public.ecr.aws/lts/redis.md
index 4bc2973..67893e5 100644
--- a/docs/public.ecr.aws/lts/redis.md
+++ b/docs/public.ecr.aws/lts/redis.md
@@ -50,7 +50,8 @@ Access your Redis server at `localhost:30073`.
 | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). |
 | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. |
 | `-p 30073:6379` | Expose redis on `localhost:30073`. |
-| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)). |
+| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines.
+ |
 
 
 #### Testing/Debugging
@@ -89,8 +90,8 @@ redis:6379>
 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
-[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/lts/redis:latest`), then:
+[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/lts/redis:latest`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md
index e4c9308..d96244a 100644
--- a/docs/public.ecr.aws/lts/squid.md
+++ b/docs/public.ecr.aws/lts/squid.md
@@ -20,7 +20,8 @@ Up to 10 years customer security maintenance `from canonical/squid`. [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 |
 |---|---|---|---|---|
- | **`4.10-20.04_beta`** &nbsp;&nbsp; | - | - | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`5.2-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.10-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;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`.
@@ -36,7 +37,7 @@ If your usage includes redistribution, please [contact Canonical](https://ubuntu
 Launch this image locally:
 
 ```sh
-docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/lts/squid:4.10-20.04_beta
+docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/lts/squid:5.2-22.04_beta
 ```
 Access your Squid proxy at `localhost:3128`.
 
@@ -70,8 +71,8 @@ docker exec -it squid-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
-[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. `public.ecr.aws/lts/squid:4.10-20.04_beta`), then:
+[squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/squid:5.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap squid-config --from-file=squid=squid.conf
diff --git a/docs/public.ecr.aws/lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md
index 69b85ea..a3bb9d5 100644
--- a/docs/public.ecr.aws/lts/telegraf.md
+++ b/docs/public.ecr.aws/lts/telegraf.md
@@ -45,7 +45,7 @@ Access your Telegraf server at `localhost:30273`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30273:9273` | Expose Telegraf on `localhost:30273`. |
-| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf)). |
+| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)). |
 
 
 #### Testing/Debugging
@@ -68,8 +68,8 @@ docker exec -it telegraf-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
-[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/lts/telegraf:latest`), then:
+[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/lts/telegraf:latest`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/docs/public.ecr.aws/lts/zookeeper.md b/docs/public.ecr.aws/lts/zookeeper.md
new file mode 100644
index 0000000..9a6c415
--- /dev/null
+++ b/docs/public.ecr.aws/lts/zookeeper.md
@@ -0,0 +1,90 @@
+# Apache ZooKeeper LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
+
+## 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 Apache ZooKeeper
+
+ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Read more on [the Apache website](https://zookeeper.apache.org/). This image is shipped in support of the Apache Kafka image.
+
+
+## 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/zookeeper`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _Tags in italics are not available in public.ecr.aws/lts/zookeeper but are shown here for completeness._ -->
+
+| 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 |
+|---|---|---|---|---|
+| _`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`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+
+If your usage includes redistribution, please [contact Canonical](https://ubuntu.com/security/docker-images#get-in-touch).
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name zookeeper-container -e TZ=UTC -p 2181:2181 public.ecr.aws/lts/zookeeper:latest
+```
+Zookeeper instance available at `localhost:2181`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 2181:2181` | Expose Apache Zookeeper service on `localhost:2181`. |
+| `-v /etc/kafka/zookeeper.properties` | Zookeeper config (file path within the container can also be set by overriding the CMD). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f zookeeper-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it zookeeper-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[zookeeper-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/zookeeper:latest`), then:
+
+```sh
+kubectl apply -f zookeeper-deployment.yml
+```
+
+Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
+
+## 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 "`zookeeper: <issue summary>`". Make sure to include the digest of the image you are using, from:
+
+```sh
+docker images --no-trunc --quiet public.ecr.aws/lts/zookeeper:<tag>
+```
+
diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md
index d433638..f247eb4 100644
--- a/docs/public.ecr.aws/ubuntu/apache2.md
+++ b/docs/public.ecr.aws/ubuntu/apache2.md
@@ -10,35 +10,47 @@ 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`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _**`2.4-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`2.4-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%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` |
+ | _**`2.4-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+ | ~~2.4-21.04~~ | Apache2 2.4.46 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 2.4-21.10_beta |
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/apache2:2.4-20.04_beta
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/apache2:2.4-21.04
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -49,7 +61,7 @@ Access your Apache2 server at `http://localhost:8080`.
 | `-e TZ=UTC` | Timezone. |
 | `-p 8080:80` | Expose Apache2 on `localhost:8080`. |
 | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
-| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf)). |
+| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)). |
 
 
 #### Testing/Debugging
@@ -72,8 +84,8 @@ docker exec -it apache2-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
-[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. `public.ecr.aws/ubuntu/apache2:2.4-20.04_beta`), then:
+[apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/apache2:2.4-21.04`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md
index bc6ea86..3533670 100644
--- a/docs/public.ecr.aws/ubuntu/bind9.md
+++ b/docs/public.ecr.aws/ubuntu/bind9.md
@@ -10,35 +10,46 @@ 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`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _**`9.18-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp;| `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`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _**`9.18-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/ubuntu/bind9:9.16-20.04_beta
+docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/ubuntu/bind9:9.18-22.04_beta
 ```
 Access your Bind9 server at `localhost:30053`
 
@@ -47,8 +58,9 @@ Access your Bind9 server at `localhost:30053`
 | Parameter | Description |
 |---|---|
 | `-e TZ=UTC` | Timezone. |
-| `-p 1803233` | Expose bind9 on `localhost:30053`. |
-| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)). |
+| `-p 30053:53` | Expose bind9 on `localhost:30053`. |
+| `-e BIND9_USER=bind` | The user which will start the `named` process. |
+| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)). |
 | `-v /path/to/cached/data:/var/cache/bind` | Location where locally cached data can be dumped. |
 | `-v /path/to/resource/records:/var/lib/bind` | Location of Resource Records defining various domain information. |
 
@@ -73,7 +85,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. `public.ecr.aws/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?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/bind9:9.18-22.04_beta`), then:
 
 ```sh
 kubectl apply -f bind9-deployment.yml
diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md
index f0eb9ad..748f0fe 100644
--- a/docs/public.ecr.aws/ubuntu/cassandra.md
+++ b/docs/public.ecr.aws/ubuntu/cassandra.md
@@ -1,8 +1,8 @@
-# Cassandra | Ubuntu
+# Apache Cassandra | Ubuntu
 
-Current Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cassandra or Ubuntu release.
+Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Cassandra or Ubuntu release.
 
-## About Cassandra
+## About Apache Cassandra
 
 Apache Cassandra is an open source NoSQL distributed database trusted by thousands of companies for scalability and high availability without compromising performance. Linear scalability and proven fault-tolerance on commodity hardware or cloud infrastructure make it a good platform for mission-critical data.
 
@@ -16,22 +16,33 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.0-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.0-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.0-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/cassandra) | [](https://gallery.ecr.aws/lts/cassandra) | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~4.0-21.10~~ | Apache Cassandra 4.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 4.0-22.04_beta |
+ | ~~4.0-21.04~~ | Apache Cassandra 4.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~4.0-21.10~~ |
+ | ~~4.0-20.04~~ | Apache Cassandra 4.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~4.0-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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
 ```
 Access your Cassandra server with `cqlsh localhost 9042`.
 
@@ -69,7 +80,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?h=4.0-22.04) 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`), 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..2fac18a 100644
--- a/docs/public.ecr.aws/ubuntu/cortex.md
+++ b/docs/public.ecr.aws/ubuntu/cortex.md
@@ -23,22 +23,33 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.7-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.7 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.4-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.11-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/cortex) | [](https://gallery.ecr.aws/lts/cortex) | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~1.10-21.10~~ | Cortex 1.10.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 1.11-22.04_beta |
+ | ~~1.7-21.04~~ | Cortex 1.7.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~1.10-21.10~~ |
+ | ~~1.4-20.04~~ | Cortex 1.4.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~1.7-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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
 ```
 Access your Cortex server at `http://localhost:32709`.
 
@@ -48,7 +59,7 @@ Access your Cortex server at `http://localhost:32709`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 32709:9009` | Expose Cortex on `localhost:32709`. |
-| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml)). |
+| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)). |
 
 
 #### Testing/Debugging
@@ -71,8 +82,8 @@ docker exec -it cortex-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
-[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.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) 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`), 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..1108fcb 100644
--- a/docs/public.ecr.aws/ubuntu/grafana.md
+++ b/docs/public.ecr.aws/ubuntu/grafana.md
@@ -16,22 +16,33 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request 
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`7.4-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `7.2-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.2.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`8.2-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/grafana) | [](https://gallery.ecr.aws/lts/grafana) | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~8.1-21.10~~ | Grafana™ software 8.1.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 8.2-22.04_beta |
+ | ~~7.4-21.04~~ | Grafana™ software 7.4.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~8.1-21.10~~ |
+ | ~~7.2-20.04~~ | Grafana™ software 7.2.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~7.4-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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
 ```
 Access your Grafana server at `localhost:30000`.
 
@@ -65,8 +76,8 @@ docker exec -it grafana-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
-[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:
+[datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) 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`), 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/kafka.md b/docs/public.ecr.aws/ubuntu/kafka.md
new file mode 100644
index 0000000..59a4554
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/kafka.md
@@ -0,0 +1,100 @@
+# Apache Kafka | Ubuntu
+
+Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Kafka or Ubuntu release.
+
+## About Apache Kafka
+
+Apache Kafka is an open-source distributed event streaming platform for high-performance data pipelines, streaming analytics... Read more on the [Apache Kafka website](https://kafka.apache.org/). This image requires the Zookeeper image to run properly.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [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/kafka`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/kafka) | [](https://gallery.ecr.aws/lts/kafka) | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;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`.
+
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## 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 |
+|---|---|---|---|
+| _`track`_ |
+
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name kafka-container -e TZ=UTC -p 9092:9092 -e ZOOKEEPER_HOST=host.docker.internal public.ecr.aws/ubuntu/kafka:3.1-22.04_beta
+```
+Apache Kafka service is now exposed at `localhost:9092` (**You first need to run a Zookeeper instance**: `docker run -d -p 2181:2181 ubuntu/zookeeper:edge`).
+
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e ZOOKEEPER_HOST=172.17.0.1` | Hostname for the related Zookeeper instance (default value is set to the default IP for the Docker host (host.docker.internal)). |
+| `-e ZOOKEEPER_PORT=2181` | Port for the related Zookeeper instance. |
+| `-p 9092:9092` | Expose Apache Kafka service on `localhost:9092`. |
+| `-p 2181:2181` | Expose Apache Zookeeper service on `localhost:2181`. |
+| `CMD kafka-server-start.sh /etc/kafka/server.properties --override zookeeper.connect=host.docker.internal:2181` | Start a Kafka instance, connecting to the Zookeeper instance accessible at `host.docker.internal:2181` from within the Kafka instance container. |
+| `CMD zookeeper-server-start.sh /etc/kafka/zookeeper.properties` | Start a Zookeeper instance. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f kafka-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it kafka-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[kafka-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/kafka:3.1-22.04_beta`), then:
+
+```sh
+kubectl apply -f kafka-deployment.yml
+```
+
+Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
+
+## 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 "`kafka: <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/kafka:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/ubuntu/loki.md b/docs/public.ecr.aws/ubuntu/loki.md
new file mode 100644
index 0000000..4346232
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/loki.md
@@ -0,0 +1,98 @@
+# Grafana Loki™ software | Ubuntu
+
+Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana Loki™ software or Ubuntu release.
+
+## About Grafana Loki™ software
+
+Loki is a horizontally scalable, highly available, multi-tenant log aggregation system inspired by Prometheus. Read more on the [Grafana website](https://grafana.com/oss/loki/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [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/loki`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/loki) | [](https://gallery.ecr.aws/lts/loki) | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;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`.
+
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## 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 |
+|---|---|---|---|
+| _`track`_ |
+
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name loki-container -e TZ=UTC -p 3100:3100 public.ecr.aws/ubuntu/loki:2.4-22.04_beta
+```
+You can now use your Loki instance exposed at `http://localhost:3100`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 3100:3100` | Expose Grafana Loki on `localhost:3100`. |
+| `-v /local/path/to/config:/etc/loki/local-config.yaml` | Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04). |
+| `-v lokidata:/loki` | Persist data in a docker volume named `lokidata`. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f loki-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it loki-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[promtail-local-config-k8s.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04) and
+[loki-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/loki:2.4-22.04_beta`), then:
+
+```sh
+kubectl create configmap promtail-config --from-file=promtail=promtail-local-config-k8s.yaml
+kubectl apply -f loki-deployment.yml
+```
+
+You will now be able to connect to the Loki instance on `http://localhost:31000`.
+
+## 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 "`loki: <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/loki:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md
index f0b6dad..213ef3c 100644
--- a/docs/public.ecr.aws/ubuntu/memcached.md
+++ b/docs/public.ecr.aws/ubuntu/memcached.md
@@ -10,35 +10,46 @@ 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`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.6-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | [](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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/memcached) | [](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`1.5-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%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` |
+ | _**`1.5-20.04_beta`** &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+ | ~~1.6-21.04~~ | Memcached 1.6.9 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 1.6-21.10_beta |
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name memcached-container -e TZ=UTC  public.ecr.aws/ubuntu/memcached:1.5-20.04_beta
+docker run -d --name memcached-container -e TZ=UTC  public.ecr.aws/ubuntu/memcached:1.6-21.04
 ```
 
 #### Parameters
@@ -51,7 +62,7 @@ docker run -d --name memcached-container -e TZ=UTC  public.ecr.aws/ubuntu/memcac
 | `-e MEMCACHED_THREADS=4` | Determines the number of threads to process requests. |
 | `-e MEMCACHED_PASSWORD` | Define the password for the `root` user if another username is provided. By default the authentication is disabled but if this option is passed it becomes enabled. |
 | `-e MEMCACHED_USERNAME` | Define a new user. If this option is passed a password is needed to authenticate the new user. |
-| `-p 11211` | Memcached is exposed inside the container on port `11211`. |
+| `-p 11211:11211` | Memcached is exposed inside the container on port `11211`. |
 
 
 #### Testing/Debugging
@@ -103,7 +114,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. `public.ecr.aws/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. `public.ecr.aws/ubuntu/memcached:1.6-21.04`), then:
 
 ```sh
 kubectl apply -f memcached-deployment.yml
diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md
index af55f37..42fe55e 100644
--- a/docs/public.ecr.aws/ubuntu/mysql.md
+++ b/docs/public.ecr.aws/ubuntu/mysql.md
@@ -1,44 +1,56 @@
-# MySQL™ | Ubuntu
+# MySQL™ software | Ubuntu
 
-Current MySQL™ Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ or Ubuntu release.
+Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ software or Ubuntu release.
 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/mysql).
 
-## About MySQL™
+## About MySQL™ software
 
 MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and ease of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
 
 
 ## 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`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
+ | _**`8.0-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`8.0-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+ | _**`8.0-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+ | ~~8.0-21.04~~ | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 8.0-21.10_beta |
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/ubuntu/mysql:8.0-20.04_beta
+docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/ubuntu/mysql:8.0-21.04
 ```
 Access your MySQL server at `localhost:30306`.
 
@@ -57,7 +69,7 @@ Access your MySQL server at `localhost:30306`.
 | `-e MYSQL_INITSB_SKIP_TZINFO=yes` | Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it. |
 | `-p 30306:3306` | Expose MySQL server on `localhost:30306`. |
 | `-v /path/to/data:/var/lib/mysql` | Persist data instead of initializing a new database every time you launch a new container. |
-| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my.cnf)). |
+| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)). |
 
 #### Initialization Scripts
 
@@ -89,7 +101,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 public.ecr.aws/ubuntu/mysql:8.0-20.04_beta mysql -hmysql-container -uroot -p
+$ docker run -it --rm --network mysql-network public.ecr.aws/ubuntu/mysql:8.0-21.04 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.
 
@@ -98,8 +110,8 @@ The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged i
 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
-[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. `public.ecr.aws/ubuntu/mysql:8.0-20.04_beta`), then:
+[my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/mysql:8.0-21.04`), then:
 
 ```sh
 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md
index 16682e1..e34f14b 100644
--- a/docs/public.ecr.aws/ubuntu/nginx.md
+++ b/docs/public.ecr.aws/ubuntu/nginx.md
@@ -10,35 +10,47 @@ 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`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _**`1.18-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`1.18-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%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` |
+ | _**`1.18-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+ | ~~1.18-21.04~~ | Nginx 1.18.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 1.18-21.10_beta |
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/nginx:1.18-20.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/nginx:1.18-21.04
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -50,7 +62,7 @@ Access your Nginx server at `http://localhost:8080`.
 | `-p 8080:80` | Expose Nginx on `localhost:8080`. |
 | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
 | `-v /path/to/conf.template:/etc/nginx/templates/conf.template` | Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`). |
-| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf)). |
+| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)). |
 
 
 #### Testing/Debugging
@@ -73,8 +85,8 @@ docker exec -it nginx-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
-[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. `public.ecr.aws/ubuntu/nginx:1.18-20.04_beta`), then:
+[nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/nginx:1.18-21.04`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md
index bea237a..9981a38 100644
--- a/docs/public.ecr.aws/ubuntu/postgres.md
+++ b/docs/public.ecr.aws/ubuntu/postgres.md
@@ -10,35 +10,47 @@ 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`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
+ | _**`14-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp;| `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`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+ | _**`14-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+ | ~~13-21.04~~ | Postgres 13.1 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~13.1-21.10~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/ubuntu/postgres:12.4-20.04_beta
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/ubuntu/postgres:13-21.04
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -55,7 +67,7 @@ Access your PostgreSQL server at `localhost:30432`.
 | `-e POSTGRES_HOST_AUTH_METHOD=trust` | Set the `auth-method` for `host` connections for `all` databases, `all` users, and `all` addresses. The following will be added to the `pg_hba.conf` if this option is passed: `host all all all $POSTGRES_HOST_AUTH_METHOD`. |
 | `-e PGDATA=/path/to/location` | Set the location of the database files. The default is `/var/lib/postgresql/data`. |
 | `-p 30432:5432` | Expose Postgres on `localhost:30432`. |
-| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf)). |
+| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)). |
 | `-v /path/to/persisted/data:/var/lib/postgresql/data` | Persist data instead of initializing a new database every time you launch a new container. |
 
 #### Initialization Scripts
@@ -88,7 +100,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 public.ecr.aws/ubuntu/postgres:12.4-20.04_beta psql -h postgres-container -U postgres
+$ docker run -it --rm --network postgres-network public.ecr.aws/ubuntu/postgres:13-21.04 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.
 
@@ -97,8 +109,8 @@ The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged i
 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
-[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. `public.ecr.aws/ubuntu/postgres:12.4-20.04_beta`), then:
+[postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/postgres:13-21.04`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
index 676d417..a5b1127 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
@@ -16,22 +16,33 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`0.21-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `0.21-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`0.23-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/prometheus-alertmanager) | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~0.22-21.10~~ | Prometheus Alertmanager 0.22.0 on Ubuntu&nbsp;21.10&nbsp; | 04/2022 | 0.23-22.04_beta |
+ | ~~0.21-21.04~~ | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~0.22-21.10~~ |
+ | ~~0.21-20.04~~ | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~0.21-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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
 ```
 Access your Prometheus Alertmanager server at `localhost:30093`.
 
@@ -41,7 +52,7 @@ Access your Prometheus Alertmanager server at `localhost:30093`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30093:9093` | Expose Prometheus Alertmanager on `localhost:30093`. |
-| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml)). |
+| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)). |
 | `-v /path/to/persisted/data:/alertmanager` | Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container. |
 
 
@@ -65,11 +76,11 @@ docker exec -it prometheus-alertmanager-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
-[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:
+[alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) 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`), then:
 
 ```sh
-kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
+kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml
 kubectl apply -f prometheus-alertmanager-deployment.yml
 ```
 
diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md
index 1ce4776..278d4d4 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus.md
@@ -16,22 +16,34 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.25-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.25 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.20-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.20.1 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.33-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/prometheus) | [](https://gallery.ecr.aws/lts/prometheus) | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~2.28-21.10~~ | Prometheus 2.28.1 on Ubuntu&nbsp;21.10&nbsp; | 02/2022 | ~~2.32-20.04~~ |
+ | ~~2.25-21.04~~ | Prometheus 2.25.1 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | ~~2.28-21.10~~ |
+ | ~~2.32-20.04~~ | Prometheus 2.32.1 on Ubuntu&nbsp;20.04&nbsp;LTS | 04/2022 | 2.33-22.04_beta |
+ | ~~2.20-20.04~~ | Prometheus 2.20.1 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~2.25-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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
 ```
 Access your Prometheus server at `localhost:30090`.
 
@@ -41,8 +53,8 @@ Access your Prometheus server at `localhost:30090`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30090:9090` | Expose Prometheus server on `localhost:30090`. |
-| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml)). |
-| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml)). |
+| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)). |
+| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)). |
 
 
 #### Testing/Debugging
@@ -65,8 +77,8 @@ docker exec -it prometheus-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
-[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.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) 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`), 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..3d92bd8 100644
--- a/docs/public.ecr.aws/ubuntu/redis.md
+++ b/docs/public.ecr.aws/ubuntu/redis.md
@@ -16,22 +16,33 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`6.0-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `5.0-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 5.0.7 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`6.2-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/redis) | [](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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/redis) | [](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp;| `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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~6.0-21.04~~ | Redis™ software 6.0.11 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 6.0-21.10_beta |
+ | ~~5.0-20.04~~ | Redis™ software 5.0.7 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~6.0-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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.04
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -46,7 +57,8 @@ Access your Redis server at `localhost:30073`.
 | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). |
 | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. |
 | `-p 30073:6379` | Expose redis on `localhost:30073`. |
-| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)). |
+| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines.
+ |
 
 
 #### Testing/Debugging
@@ -68,7 +80,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.04 redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -85,8 +97,8 @@ redis:6379>
 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
-[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.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.04`), 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..eb36a24 100644
--- a/docs/public.ecr.aws/ubuntu/squid.md
+++ b/docs/public.ecr.aws/ubuntu/squid.md
@@ -10,36 +10,46 @@ 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`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `4.13-21.10_edge` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/squid) | | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _**`5.2-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 _The following tags are not available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`4.10-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | _**`5.2-22.04_beta`** &nbsp;&nbsp;_ | [![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` &nbsp;&nbsp;_ | [![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` |
 | _`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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires 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 |
+|---|---|---|---|
+| _`track`_ |
+
+
 ## Docker CLI
 
 Launch this image locally:
 
 ```sh
-docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/ubuntu/squid:4.10-20.04_beta
+docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/ubuntu/squid:5.2-22.04_beta
 ```
 Access your Squid proxy at `localhost:3128`.
 
@@ -73,8 +83,8 @@ docker exec -it squid-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
-[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. `public.ecr.aws/ubuntu/squid:4.10-20.04_beta`), then:
+[squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/squid:5.2-22.04_beta`), then:
 
 ```sh
 kubectl create configmap squid-config --from-file=squid=squid.conf
diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md
index 508925d..533a1a6 100644
--- a/docs/public.ecr.aws/ubuntu/telegraf.md
+++ b/docs/public.ecr.aws/ubuntu/telegraf.md
@@ -16,22 +16,33 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.17-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.17 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `1.15-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.15.2 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.21-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/telegraf) | [](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` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/telegraf) | [](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp;| `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`.
 
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
 
+## 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 |
+|---|---|---|---|
+ | ~~1.17-21.04~~ | Telegraf™ software 1.17.2 on Ubuntu&nbsp;21.04&nbsp; | 01/2022 | 1.19-21.10_beta |
+ | ~~1.15-20.04~~ | Telegraf™ software 1.15.2 on Ubuntu&nbsp;20.04&nbsp;LTS | 01/2021 | ~~1.17-21.04~~ |
+| _`track`_ |
+
+
 ## Docker CLI
 
 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.17-21.04
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -41,7 +52,7 @@ Access your Telegraf server at `localhost:30273`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 30273:9273` | Expose Telegraf on `localhost:30273`. |
-| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf)). |
+| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)). |
 
 
 #### Testing/Debugging
@@ -64,8 +75,8 @@ docker exec -it telegraf-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
-[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.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.17-21.04`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
diff --git a/docs/public.ecr.aws/ubuntu/zookeeper.md b/docs/public.ecr.aws/ubuntu/zookeeper.md
new file mode 100644
index 0000000..36065d1
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/zookeeper.md
@@ -0,0 +1,95 @@
+# Apache ZooKeeper | Ubuntu
+
+Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache ZooKeeper or Ubuntu release.
+
+## About Apache ZooKeeper
+
+ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Read more on [the Apache website](https://zookeeper.apache.org/). This image is shipped in support of the Apache Kafka image.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [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/zookeeper`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/zookeeper) | [](https://gallery.ecr.aws/lts/zookeeper) | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;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`.
+
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## 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 |
+|---|---|---|---|
+| _`track`_ |
+
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name zookeeper-container -e TZ=UTC -p 2181:2181 public.ecr.aws/ubuntu/zookeeper:3.1-22.04_beta
+```
+Zookeeper instance available at `localhost:2181`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 2181:2181` | Expose Apache Zookeeper service on `localhost:2181`. |
+| `-v /etc/kafka/zookeeper.properties` | Zookeeper config (file path within the container can also be set by overriding the CMD). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f zookeeper-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it zookeeper-container /bin/bash
+```
+
+
+## Deploy with Kubernetes
+
+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
+[zookeeper-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/zookeeper:3.1-22.04_beta`), then:
+
+```sh
+kubectl apply -f zookeeper-deployment.yml
+```
+
+Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
+
+## 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 "`zookeeper: <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/zookeeper:<tag>
+```
+
+
diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md
index 107b42e..5456979 100644
--- a/templates/README_DOCKERHUB.md
+++ b/templates/README_DOCKERHUB.md
@@ -1,23 +1,28 @@
 # ${application} | Ubuntu
 
 Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
-<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/${repo}`.  -->
 <%
     baserepo='ubuntu'
     tag='latest'
+    risks=['stable', 'candidate', 'beta', 'edge']
+    sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release['base']))
+    filterfn=lambda release : 'deprecated' not in release
+    releases.sort(key=sortfn)
+    current_releases=list(filter(filterfn, releases))
+    old_releases=[release for release in releases if release not in current_releases]
+    LTS_BASES=['18.04', '20.04', '22.04']
+    ESM_BASES=['16.04']
 %>
 <%include file="header.md" args="baserepo=baserepo, **locals()['pageargs']"/>
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-% for i, release in enumerate(releases):
+% for i, release in enumerate(current_releases):
 <% 
     first=i==0
     track=str(release['track'])
     risk=str(release['risk'])
     base=str(release['base'])
-    LTS_BASES=['18.04', '20.04', '22.04']
-    ESM_BASES=['16.04']
     basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
     type=str(release['type']) if 'type' in release else ''
     version=str(release['version']) if 'version' in release else track
@@ -35,3 +40,34 @@ If your usage includes commercial redistribution or requires unavailable channel
 
 ## Usage
 <%include file="common_usage.md" args="tag=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.
+
+| Track | Version | EOL | Upgrade Path |
+|---|---|---|---|
+% for i, release in enumerate(old_releases):
+<% 
+    first=i==0
+    track=str(release['track'])
+    risk=str(release['risk'])
+    base=str(release['base'])
+    deprecated_date=str(release['deprecated']['date'])
+    if 'path' in release['deprecated']:
+        path=release['deprecated']['path']
+        ptrack=str(path['track'])
+        pbase=str(path['base'])
+        searchfn=lambda release : str(release['track'])==ptrack and release['base']==pbase
+        results=list(filter(searchfn, current_releases))
+        is_current=len(results)>0
+        upgrade_path=ptrack+'-'+pbase+'_'+results[0]['risk'] if is_current else '~~'+ptrack+'-'+pbase+'~~'
+    else:
+        upgrade_path='-'
+    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
+    version=str(release['version']) if 'version' in release else track
+    swver='.'.join(track.split(".")[:2])
+    thistag=swver+'-'+base
+    tag=thistag if first else tag
+%> | ~~${thistag}~~ | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype} | ${deprecated_date} | ${upgrade_path} |
+% endfor
+| _`track`_ |
diff --git a/templates/README_DOCKERHUB_LTS.md b/templates/README_DOCKERHUB_LTS.md
deleted file mode 100644
index fadeee9..0000000
--- a/templates/README_DOCKERHUB_LTS.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# ${application} LTS Docker Image
-
-## 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. This repository is exempted from per-user rate limits.
-<%
-    baserepo='lts'
-    distroversion=base.strip('Ubuntu').strip('LTS').lstrip().rstrip()
-    swver='.'.join(version.split(".")[:2])
-    pretag=swver+'-'+distroversion+'_'
-    tag=pretag+'beta'
-%>
-<%include file="header.md" args="tag=tag, pretag=pretag, baserepo=baserepo, **locals()['pageargs']"/>
-
-| 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 |
-|---|---|---|---|---|
-% if main is True:
-| **`${tag}`** &nbsp;&nbsp; | - | - | ${application} ${version} | ${", ".join(map(lambda x: "`"+x+"`", architectures))} |
-% endif
-| _`track_risk`_ |
-
-<%include file="channels_message.md" />
-
-## Usage
-
-If your usage includes redistribution, please [contact Canonical](https://ubuntu.com/security/docker-images#get-in-touch).
-<%include file="common_usage.md" args="tag=tag, pretag=pretag, baserepo=baserepo, **locals()['pageargs']"/>
diff --git a/templates/README_ECR.md b/templates/README_ECR.md
index 47ae031..5a9b435 100644
--- a/templates/README_ECR.md
+++ b/templates/README_ECR.md
@@ -2,8 +2,15 @@
 <%
     baserepo='public.ecr.aws/ubuntu'
     tag='latest'
-    lts_releases=list(filter(lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False, releases))
-    current_releases=[releases.pop(0)]+[release for release in releases if release not in lts_releases]
+    risks=['stable', 'candidate', 'beta', 'edge']
+    sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release['base']) )
+    filtercurrentfn=lambda release : 'deprecated' not in release
+    filterltsfn=lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False
+    releases.sort(key=sortfn)
+    current_releases=list(filter(filtercurrentfn, releases))
+    lts_releases=list(filter(filterltsfn, current_releases))
+    old_releases=[release for release in releases if release not in 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
 %>
 Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release.
@@ -17,7 +24,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).
@@ -40,15 +47,48 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request 
     swver='.'.join(track.split(".")[:2])
     thistag=swver+'-'+base+'_'+''+risk
     tag=thistag if first else tag
-%> | ${'_' if type == 'LTS' else ''}${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp;${'_' if type == 'LTS' else ''} | [${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else ''}](https://gallery.ecr.aws/lts/${repo}) | | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype}| ${architectures} |
+%> | ${'_' if type == 'LTS' else ''}${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp;${'_' if type == 'LTS' else ''} | [${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if basetype == 'LTS' else ''}](https://gallery.ecr.aws/lts/${repo}) | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else ''}](https://gallery.ecr.aws/lts/${repo}) | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype}| ${architectures} |
 % endfor
 | _`track_risk`_ |
 
 ${'_The following tags are not available in '+baserepo+'/'+repo+' but are shown here for completeness:_' if k==0 and has_an_lts else ''}
 % endfor
 <%include file="channels_message.md" />
+
 ### Commercial use and Extended Security Maintenance channels
 If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). ${'' if has_an_lts else '**This repository has no LTS channel yet, please get in touch if you need one.**'}
 
+## 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 |
+|---|---|---|---|
+% for i, release in enumerate(old_releases):
+<% 
+    first=i==0
+    track=str(release['track'])
+    risk=str(release['risk'])
+    base=str(release['base'])
+    deprecated_date=str(release['deprecated']['date'])
+    if 'path' in release['deprecated']:
+        path=release['deprecated']['path']
+        ptrack=str(path['track'])
+        pbase=str(path['base'])
+        searchfn=lambda release : str(release['track'])==ptrack and release['base']==pbase
+        results=list(filter(searchfn, current_releases))
+        is_current=len(results)>0
+        upgrade_path=ptrack+'-'+pbase+'_'+results[0]['risk'] if is_current else '~~'+ptrack+'-'+pbase+'~~'
+    else:
+        upgrade_path='-'
+    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
+    version=str(release['version']) if 'version' in release else track
+    swver='.'.join(track.split(".")[:2])
+    thistag=swver+'-'+base
+    tag=thistag if first else tag
+%> | ~~${thistag}~~ | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype} | ${deprecated_date} | ${upgrade_path} |
+% endfor
+| _`track`_ |
+
+
 ## Docker CLI
 <%include file="common_usage.md" args="tag=tag, baserepo=baserepo, **locals()['pageargs']"/>
diff --git a/templates/README_ECR_LTS.md b/templates/README_ECR_LTS.md
index c060f1a..981c69f 100644
--- a/templates/README_ECR_LTS.md
+++ b/templates/README_ECR_LTS.md
@@ -2,7 +2,11 @@
 <%
     baserepo='public.ecr.aws/lts'
     tag='latest'
-    lts_releases=list(filter(lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False, releases))
+    risks=['stable', 'candidate', 'beta', 'edge']
+    sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release['base']) )
+    filterltsfn=lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False
+    releases.sort(key=sortfn)
+    lts_releases=list(filter(filterltsfn, releases))
     has_an_lts=len(lts_releases)>0
 %> ${'' if has_an_lts else '**This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**'}
 
@@ -40,7 +44,12 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request 
     thistag=swver+'-'+base+'_'+''+risk
     tag=thistag if first else tag
     has_an_lts=(has_an_lts or type == 'LTS' or type == 'ESM')
-%> | ${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp; | - | - | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype}| ${architectures} |
+    sos_year=2000+int(base.split(".")[0])
+    eol_year=sos_year+5
+    eoe_year=sos_year+10
+    eol=base.split(".")[1]+'/'+str(eol_year) if basetype == 'LTS' else '-'
+    eoe=base.split(".")[1]+'/'+str(eoe_year) if basetype == 'LTS' or basetype == 'ESM' else '-'
+%> | ${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp; | ${eol} | ${eoe} | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype}| ${architectures} |
 % endfor
 | _`track_risk`_ |
 
diff --git a/templates/common_usage.md b/templates/common_usage.md
index d7c6bc9..d7dbfe7 100644
--- a/templates/common_usage.md
+++ b/templates/common_usage.md
@@ -57,8 +57,9 @@ ${debug['text']}
 
 ## Deploy with Kubernetes
 <%
-    configmapname = repo + '-config'
     deployfilename = repo + '-deployment.yml'
+    if 'configmap' in microk8s:
+        configmapname = microk8s['configmap']['name'] if 'name' in microk8s['configmap'] else repo + '-config'
 %>
 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`.
 
diff --git a/templates/header.md b/templates/header.md
index 5ed6a67..bba77b4 100644
--- a/templates/header.md
+++ b/templates/header.md
@@ -6,7 +6,6 @@ ${description}
 ## 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.
-<!-- `from lts/${repo}`. -->
 
 ![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).