Merge ~cjdc/ubuntu-docker-images/+git/templates:add-ubuntu-base into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

[Cristovao Cordeiro]

feat: adjust templates to also support Ubuntu base container image

 - Add ubuntu.yaml template for dynamically generating docs for Ubuntu
   base image
 - add support for "support" YAML properties, to help with EOL info
 - split the ECR docs to have USAGE in separate
 - adjust all templates to have consistent content and support Ubuntu

[Cristovao Cordeiro (cjdc)]

Simon, Paulo, Athos, Sergio, Valentin and Samir:

please have a look at this MP if possible.
The goal is to use these templates to automate the creation and injection of the ubuntu base image docs into the registries.

For this to be possible, some changes were required, both in terms of content alignment and design.

I believe none of the app-specific docs were disrupted, apart from some minor changes.

[Samir Akarioh (samiraka)]

review: Approve

[Valentin Viennot (valentinviennot)]

LGTM

review: Approve

[Paulo Machado (paulomachado)]

LGTM

review: Approve

diff --git a/Makefile b/Makefile
index a179a07..214aac1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,13 @@ DATADIR ?= data
 
 NS_DOCKERHUB = docker.io/ubuntu
 NS_ECR = public.ecr.aws/ubuntu
+NS_ECR_USAGE = public.ecr.aws/ubuntu/usage
 NS_ECR_LTS = public.ecr.aws/lts
+NS_ECR_LTS_USAGE = public.ecr.aws/lts/usage
 
 README_TEMPLATE_DOCKERHUB = templates/README_DOCKERHUB.md
 README_TEMPLATE_ECR = templates/README_ECR.md
+USAGE_TEMPLATE_ECR = templates/USAGE_ECR.md
 README_TEMPLATE_ECR_LTS = templates/README_ECR_LTS.md
 
 all: all-doc
@@ -22,10 +25,14 @@ dockerhub-docs:
 ecr-docs:
 	mkdir -p $(BUILDDIR)/$(NS_ECR)
 	$(PYTHON) $(RENDERDOWN) $(README_TEMPLATE_ECR) --outdir $(BUILDDIR)/$(NS_ECR) --data $(DATADIR)
+	mkdir -p $(BUILDDIR)/$(NS_ECR_USAGE)
+	$(PYTHON) $(RENDERDOWN) $(USAGE_TEMPLATE_ECR) --outdir $(BUILDDIR)/$(NS_ECR_USAGE) --data $(DATADIR)
 
 ecr-lts-docs:
 	mkdir -p $(BUILDDIR)/$(NS_ECR_LTS)
 	$(PYTHON) $(RENDERDOWN) $(README_TEMPLATE_ECR_LTS) --outdir $(BUILDDIR)/$(NS_ECR_LTS) --data $(DATADIR)
+	mkdir -p $(BUILDDIR)/$(NS_ECR_LTS_USAGE)
+	$(PYTHON) $(RENDERDOWN) $(USAGE_TEMPLATE_ECR) --outdir $(BUILDDIR)/$(NS_ECR_LTS_USAGE) --data $(DATADIR)
 
 clean: clean-doc
 
diff --git a/data/grafana.yaml b/data/grafana.yaml
index d000148..b1b5c1b 100644
--- a/data/grafana.yaml
+++ b/data/grafana.yaml
@@ -70,7 +70,7 @@ parameters:
     description: Pass a directory with files to provision a Grafana `datasource` and `dashboard` (see [documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/)).
   - type: -v
     value: /path/to/persisted/data:/var/lib/grafana
-    description: Persist data with a voulme instead of initializing a new database for each newly launched container.
+    description: Persist data with a volume instead of initializing a new database for each newly launched container.
 debug: None
 microk8s:
   deploy:
diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md
index b77a473..c99ce70 100644
--- a/docs/docker.io/ubuntu/apache2.md
+++ b/docs/docker.io/ubuntu/apache2.md
@@ -13,21 +13,22 @@ The Apache HTTP Server Project's goal is to build a secure, efficient and extens
 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/apache2`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/apache2 but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.4-22.04_beta`**    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.4-21.10_beta`    |  | | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
- | `2.4-20.04_beta`    | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4.41 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -99,3 +100,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 327f7c7..08d3f7e 100644
--- a/docs/docker.io/ubuntu/bind9.md
+++ b/docs/docker.io/ubuntu/bind9.md
@@ -13,21 +13,22 @@ BIND 9 provides software for Domain Name System (DNS) management including both 
 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/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/bind9 but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`9.18-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `9.16-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -98,3 +99,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`track`_ |
 
+
diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md
index 4316f4a..706d084 100644
--- a/docs/docker.io/ubuntu/cassandra.md
+++ b/docs/docker.io/ubuntu/cassandra.md
@@ -24,19 +24,20 @@ Apache Cassandra is an open source NoSQL distributed database trusted by thousan
 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/cassandra`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/cassandra but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`4.0-22.04_beta`** &nbsp;&nbsp; |  | | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`4.0-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -112,3 +113,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 5e618f0..98bacbe 100644
--- a/docs/docker.io/ubuntu/cortex.md
+++ b/docs/docker.io/ubuntu/cortex.md
@@ -20,19 +20,20 @@ Read more on the [Cortex website](https://cortexmetrics.io/).
 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/cortex`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/cortex but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.11-22.04_beta`** &nbsp;&nbsp; |  | | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.11-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -105,3 +106,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 e92143e..2388afa 100644
--- a/docs/docker.io/ubuntu/grafana.md
+++ b/docs/docker.io/ubuntu/grafana.md
@@ -13,19 +13,20 @@ Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Ela
 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/grafana`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/grafana but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`8.2-22.04_beta`** &nbsp;&nbsp; |  | | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`8.2-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -43,7 +44,7 @@ Access your Grafana server at `localhost:30000`.
 | `-e TZ=UTC` | Timezone. |
 | `-p 30000:3000` | Expose Grafana on `localhost:30000`. |
 | `-v /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/` | Pass a directory with files to provision a Grafana `datasource` and `dashboard` (see [documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/)). |
-| `-v /path/to/persisted/data:/var/lib/grafana` | Persist data with a voulme instead of initializing a new database for each newly launched container. |
+| `-v /path/to/persisted/data:/var/lib/grafana` | Persist data with a volume instead of initializing a new database for each newly launched container. |
 
 
 #### Testing/Debugging
@@ -99,3 +100,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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
index 2e6880d..0e37aec 100644
--- a/docs/docker.io/ubuntu/kafka.md
+++ b/docs/docker.io/ubuntu/kafka.md
@@ -13,19 +13,20 @@ Apache Kafka is an open-source distributed event streaming platform for high-per
 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).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](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 |
+| Channel Tags | | | 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` |
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -98,3 +99,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`track`_ |
 
+
diff --git a/docs/docker.io/ubuntu/loki.md b/docs/docker.io/ubuntu/loki.md
index bfc31b2..01fde14 100644
--- a/docs/docker.io/ubuntu/loki.md
+++ b/docs/docker.io/ubuntu/loki.md
@@ -13,19 +13,20 @@ Loki is a horizontally scalable, highly available, multi-tenant log aggregation 
 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).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](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 |
+| Channel Tags | | | 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` |
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -96,3 +97,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`track`_ |
 
+
diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md
index 29d33e1..5009145 100644
--- a/docs/docker.io/ubuntu/memcached.md
+++ b/docs/docker.io/ubuntu/memcached.md
@@ -13,28 +13,29 @@ Memcached is an in-memory key-value store for small chunks of arbitrary data (st
 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/memcached`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/memcached but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`1.6-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.6-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.6-22.04_beta
+docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.5-20.04_beta
 ```
 
 #### Parameters
@@ -99,7 +100,7 @@ In this case you can append the flags themselves or a shell script to the run co
 Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`.
 
 Download
-[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-22.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.5-20.04_beta`), then:
 
 ```sh
 kubectl apply -f memcached-deployment.yml
@@ -128,3 +129,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 e1b2916..9ae2525 100644
--- a/docs/docker.io/ubuntu/mysql.md
+++ b/docs/docker.io/ubuntu/mysql.md
@@ -13,21 +13,22 @@ MySQL is a fast, stable and true multi-user, multi-threaded SQL database server.
 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/mysql`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/mysql but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`8.0-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `8.0-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -125,3 +126,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 e83354c..d0b65bb 100644
--- a/docs/docker.io/ubuntu/nginx.md
+++ b/docs/docker.io/ubuntu/nginx.md
@@ -13,21 +13,22 @@ Nginx ("engine X") is a high-performance web and reverse proxy server created by
 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/nginx`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/nginx but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`1.18-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -100,3 +101,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 7cb092c..416dcc0 100644
--- a/docs/docker.io/ubuntu/postgres.md
+++ b/docs/docker.io/ubuntu/postgres.md
@@ -13,21 +13,22 @@ PostgreSQL is a powerful, open source object-relational database system. It is f
 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/postgres`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/postgres but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`14-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `13-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -124,3 +125,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 a06fffe..a777714 100644
--- a/docs/docker.io/ubuntu/prometheus-alertmanager.md
+++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md
@@ -13,19 +13,20 @@ The Alertmanager handles alerts sent by client applications such as the Promethe
 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/prometheus-alertmanager`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/prometheus-alertmanager but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`0.23-22.04_beta`** &nbsp;&nbsp; |  | | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`0.23-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -99,3 +100,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 52e94f1..30fc9b7 100644
--- a/docs/docker.io/ubuntu/prometheus.md
+++ b/docs/docker.io/ubuntu/prometheus.md
@@ -13,19 +13,20 @@ Prometheus is a systems and service monitoring system. It collects metrics from 
 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/prometheus`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/prometheus but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.33-22.04_beta`** &nbsp;&nbsp; |  | | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.33-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -100,3 +101,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 34330ab..2c75035 100644
--- a/docs/docker.io/ubuntu/redis.md
+++ b/docs/docker.io/ubuntu/redis.md
@@ -13,27 +13,28 @@ Redis is an open source (BSD licensed), in-memory data structure store, used as 
 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/redis`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/redis but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`6.2-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `6.0-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.2-22.04_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.10_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -71,7 +72,7 @@ This image also includes the `redis-cli` client for interactive container use:
 ```sh
 $ docker network create redis-network
 $ docker network connect redis-network redis-container
-$ docker run -it --rm --network redis-network ubuntu/redis:6.2-22.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -89,7 +90,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.2-22.04_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.10_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
@@ -120,3 +121,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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 15c055f..e581c7a 100644
--- a/docs/docker.io/ubuntu/squid.md
+++ b/docs/docker.io/ubuntu/squid.md
@@ -13,21 +13,22 @@ Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It r
 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/squid`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/squid but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`5.2-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.13-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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)  | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -100,3 +101,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`track`_ |
 
+
diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md
index cfb8f51..ff4bf7b 100644
--- a/docs/docker.io/ubuntu/telegraf.md
+++ b/docs/docker.io/ubuntu/telegraf.md
@@ -13,27 +13,28 @@ Telegraf is an agent for collecting, processing, aggregating, and writing metric
 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/telegraf`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in ubuntu/telegraf but are shown here for completeness._
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`1.21-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.19-21.10_beta` &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.21-22.04_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.19-21.10_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -67,7 +68,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.21-22.04_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.19-21.10_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
@@ -98,3 +99,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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
index 98180d0..1b10c78 100644
--- a/docs/docker.io/ubuntu/zookeeper.md
+++ b/docs/docker.io/ubuntu/zookeeper.md
@@ -13,19 +13,20 @@ ZooKeeper is a centralized service for maintaining configuration information, na
 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).
+Up to 10 years customer security maintenance [from Canonical's restricted repositories](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 |
+| Channel Tags | | | 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` |
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; | -  | - <br>  | 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`.
+
+
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
@@ -93,3 +94,4 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`track`_ |
 
+
diff --git a/docs/public.ecr.aws/lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md
index 93dc477..673b55f 100644
--- a/docs/public.ecr.aws/lts/apache2.md
+++ b/docs/public.ecr.aws/lts/apache2.md
@@ -1,4 +1,4 @@
-# Apache2 LTS Docker Image
+# Apache2 | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,78 +18,14 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request 
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/apache2 but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`2.4-22.04_beta`** &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` |
+ | **`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 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`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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?h=2.4-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f apache2-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it apache2-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
-[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
-kubectl apply -f apache2-deployment.yml
-```
-
-You will now be able to connect to the apache2 server on `http://localhost:30080`.
-
-## 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 "`apache2: <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/apache2:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md
index f30b9e1..e5448d5 100644
--- a/docs/public.ecr.aws/lts/bind9.md
+++ b/docs/public.ecr.aws/lts/bind9.md
@@ -1,4 +1,4 @@
-# Bind9 LTS Docker Image
+# Bind9 | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,78 +18,14 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/bind9 but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`9.18-22.04_beta`** &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` |
+ | **`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 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`
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-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. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f bind9-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it bind9-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
-[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
-```
-
-You will now be able to connect to the Bind9 server on localhost:30053`.
-
-## 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 "`bind9: <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/bind9:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md
index affee36..7284240 100644
--- a/docs/public.ecr.aws/lts/cassandra.md
+++ b/docs/public.ecr.aws/lts/cassandra.md
@@ -9,7 +9,7 @@ tags listed below will still receive security updates when needed.
 Once the most recent tag listed below is deprecated, this repository will no
 longer receive security updates.
 
-# Apache Cassandra LTS Docker Image
+# Apache Cassandra | Ubuntu
  **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
@@ -29,78 +29,12 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/cassandra but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 public.ecr.aws/lts/cassandra:latest
-```
-Access your Cassandra server with `cqlsh localhost 9042`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-p 7000:7000` | Expose itra-node communication |
-| `-p 7001:7001` | Expose TLS itra-node communication |
-| `-p 7199:7199` | Expose JMX |
-| `-p 9042:9042` | Expose CQL |
-| `-p 9160:9160` | Expose thrift service |
-| `-v /local/path/to/data:/var/lib/cassandra` | Volume to store Cassandra data |
-| `-v /path/to/logs:/var/log/cassandra` | Volume to store cassandra logs |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f cassandra-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it cassandra-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
-[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
-```
-
-You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042)
-
-## 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 "`cassandra: <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/cassandra:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md
index 22ff38a..4ea818d 100644
--- a/docs/public.ecr.aws/lts/cortex.md
+++ b/docs/public.ecr.aws/lts/cortex.md
@@ -1,4 +1,4 @@
-# Cortex LTS Docker Image
+# Cortex | Ubuntu
  **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
@@ -25,75 +25,12 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/cortex but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 cortex-container -e TZ=UTC -p 32709:9009 public.ecr.aws/lts/cortex:latest
-```
-Access your Cortex server at `http://localhost:32709`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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?h=1.11-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f cortex-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it cortex-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
-[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
-kubectl apply -f cortex-deployment.yml
-```
-
-You will now be able to connect to the Cortex server on `localhost:32709`.
-
-## 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 "`cortex: <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/cortex:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md
index eee018e..c9ac009 100644
--- a/docs/public.ecr.aws/lts/grafana.md
+++ b/docs/public.ecr.aws/lts/grafana.md
@@ -1,4 +1,4 @@
-# Grafana™ software LTS Docker Image
+# Grafana™ software | Ubuntu
  **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
@@ -18,76 +18,12 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request 
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/grafana but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/lts/grafana:latest
-```
-Access your Grafana server at `localhost:30000`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-p 30000:3000` | Expose Grafana on `localhost:30000`. |
-| `-v /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/` | Pass a directory with files to provision a Grafana `datasource` and `dashboard` (see [documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/)). |
-| `-v /path/to/persisted/data:/var/lib/grafana` | Persist data with a voulme instead of initializing a new database for each newly launched container. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f grafana-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it grafana-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
-[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
-kubectl apply -f grafana-deployment.yml
-```
-
-You will now be able to connect to the Grafana on `http://localhost:30000`.
-
-## 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 "`grafana: <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/grafana:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/kafka.md b/docs/public.ecr.aws/lts/kafka.md
index b5a607c..77bfa22 100644
--- a/docs/public.ecr.aws/lts/kafka.md
+++ b/docs/public.ecr.aws/lts/kafka.md
@@ -1,4 +1,4 @@
-# Apache Kafka LTS Docker Image
+# Apache Kafka | Ubuntu
  **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
@@ -18,78 +18,12 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/kafka but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/loki.md b/docs/public.ecr.aws/lts/loki.md
index ecf492d..089eb82 100644
--- a/docs/public.ecr.aws/lts/loki.md
+++ b/docs/public.ecr.aws/lts/loki.md
@@ -1,4 +1,4 @@
-# Grafana Loki™ software LTS Docker Image
+# Grafana Loki™ software | Ubuntu
  **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
@@ -18,76 +18,12 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/loki but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md
index f1682e8..43073a7 100644
--- a/docs/public.ecr.aws/lts/memcached.md
+++ b/docs/public.ecr.aws/lts/memcached.md
@@ -1,4 +1,4 @@
-# Memcached LTS Docker Image
+# Memcached | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,106 +18,13 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/memcached but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.5-20.04_beta`** &nbsp;&nbsp; | 04/2025 | 04/2030 | 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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 memcached-container -e TZ=UTC  public.ecr.aws/lts/memcached:1.5-20.04_beta
-```
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e MEMCACHED_CACHE_SIZE=64MB` | Determines the size of the cache. |
-| `-e MEMCACHED_MAX_CONNECTIONS=1024` | Determines the maximum number of concurrent connections. |
-| `-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:11211` | Memcached is exposed inside the container on port `11211`. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f memcached-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it memcached-container /bin/bash
-```
-
-<details>
-<summary>You can access the Memcached instance with telnet from another container (click to expand).</summary>
-
-```sh
-# Create a dedicated network
-$ docker network create memcached-network
-# Connect the main container to it
-$ docker network connect memcached-network memcached-container
-# Run an interactive container with the latest Ubuntu
-$ docker run -it --rm --name telnet --network memcached-network ubuntu bash
-# Install the telnet cli from within the container
-> apt update && apt install telnet -y
-# Connect to the memcached instance using telnet
-> telnet memcached-container 11211
-Trying 172.30.0.2...
-Connected to memcached.
-Escape character is '^]'.
-```
-From there you can run `memcached` commands, as documented in [their wiki](https://github.com/memcached/memcached/wiki/Commands).
-
-</details>
-
-```sh
-$ telnet memcached-container 11211
-```
-
-There are cases where one might want to pass some memcached command line flags that are not configurable via environment variables.
-In this case you can append the flags themselves or a shell script to the run command.
-
-
-## 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
-[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
-```
-
-Memcached will be listening on port `31211` in your host.
-
-## 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 "`memcached: <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/memcached:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md
index 86d8d62..3f3f9e1 100644
--- a/docs/public.ecr.aws/lts/mysql.md
+++ b/docs/public.ecr.aws/lts/mysql.md
@@ -1,4 +1,4 @@
-# MySQL™ software LTS Docker Image
+# MySQL™ software | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,104 +18,14 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/mysql but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`8.0-22.04_beta`** &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` |
+ | **`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 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`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e MYSQL_ROOT_PASSWORD=secret_for_root` | Set the password for the `root` user. This option is **mandatory** and **must not be empty**. |
-| `-e MYSQL_PASSWORD=secret` | Set the password for the `MYSQL_USER` user. |
-| `-e MYSQL_USER=john` | Create a new user with superuser privileges. This is used in conjunction with `MYSQL_PASSWORD`. |
-| `-e MYSQL_DATABASE=db_test` | Set the name of the default database. |
-| `-e MYSQL_ALLOW_EMPTY_PASSWORD=yes` | Set up a blank password for the `root` user. **This is not recommended to be used in production, make sure you know what you are doing**. |
-| `-e MYSQL_RANDOM_ROOT_PASSWORD=yes` | Generate a random initial password for the `root` user using `pwgen`. It will be printed in the logs, search for `GENERATED ROOT PASSWORD`. |
-| `-e MYSQL_ONETIME_PASSWORD=yes` | Set `root` user as experide once initialization is complete, forcing a password change on first login. |
-| `-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-custom.cnf?h=8.0-22.04)). |
-
-#### Initialization Scripts
-
-One can also add initialization scripts to their containers. This includes `*.sql`, `.sql.gz`, and `*.sh` scripts, and you just need to put them inside the  `/docker-entrypoint-initdb.d` directory inside the container. After MySQL initialization is done and the default database and user are created, the scripts are executed in the following order:
-
-* Run any `*.sql` files in alphabetically order. By default the target database is specified via `MYSQL_DATABASE`.
-* Run any executable `*.sh` scripts in alphabetically order.
-* Source any non-executable `*.sh` scripts in alphabetically order.
-
-All of this is done before the MySQL service is started. Keep in mind if your database directory is not empty (contains pre-existing database) they will be left untouched.
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f mysql-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it mysql-container /bin/bash
-```
-
-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-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.
-
-## 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
-[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
-kubectl apply -f mysql-deployment.yml
-```
-
-You will now be able to connect to the MySQL server on `localhost:30306`.
-
-## 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 "`mysql: <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/mysql:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md
index d9a2b7e..b9be55f 100644
--- a/docs/public.ecr.aws/lts/nginx.md
+++ b/docs/public.ecr.aws/lts/nginx.md
@@ -1,4 +1,4 @@
-# Nginx LTS Docker Image
+# Nginx | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,79 +18,14 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/nginx but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`1.18-22.04_beta`** &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` |
+ | **`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 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`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-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?h=1.18-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f nginx-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it nginx-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
-[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
-kubectl apply -f nginx-deployment.yml
-```
-
-You will now be able to connect to the nginx server on `http://localhost:31080`.
-
-## 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 "`nginx: <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/nginx:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md
index fe2a004..3b02358 100644
--- a/docs/public.ecr.aws/lts/postgres.md
+++ b/docs/public.ecr.aws/lts/postgres.md
@@ -1,4 +1,4 @@
-# Postgres LTS Docker Image
+# Postgres | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,103 +18,14 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/postgres but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`14-22.04_beta`** &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` |
+ | **`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 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`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e POSTGRES_PASSWORD=secret` | Set the password for the superuser which is `postgres` by default. Bear in mind that to connect to the database in the same host the password is not needed but to access it via an external host (for instance another container) the password is needed. This option is **mandatory** and **must not be empty**. |
-| `-e POSTGRES_USER=john` | Create a new user with superuser privileges. This is used in conjunction with `POSTGRES_PASSWORD`. |
-| `-e POSTGRES_DB=db_test` | Set the name of the default database. |
-| `-e POSTGRES_INITDB_ARGS="--data-checksums"` | Pass arguments to the `postgres initdb` call. |
-| `-e POSTGRES_INITDB_WALDIR=/path/to/location` | Set the location of the Postgres transaction log. By default it is stored in a subdirectory of the main Postgres data folder (`PGDATA`). |
-| `-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?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
-
-One can also add initialization scripts to their containers. This includes `*.sql`, `.sql.gz`, and `*.sh` scripts, and you just need to put them inside the  `/docker-entrypoint-initdb.d` directory inside the container. After Postgres initialization is done and the default database and user are created, the scripts are executed in the following order:
-
-* Run any `*.sql` files in alphabetically order. It will be executed with `POSTGRES_USER`.
-* Run any executable `*.sh` scripts in alphabetically order.
-* Source any non-executable `*.sh` scripts in alphabetically order.
-
-All of this is done before the Postgres service is started. Keep in mind if your `PGDATA` directory is not empty (contains pre-existing database) they will be left untouched.
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f postgres-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it postgres-container /bin/bash
-```
-
-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: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.
-
-## 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
-[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
-kubectl apply -f postgres-deployment.yml
-```
-
-You will now be able to connect to the Postgres server on `localhost:30306`.
-
-## 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 "`postgres: <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/postgres:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
index abaebf4..55cd77f 100644
--- a/docs/public.ecr.aws/lts/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
@@ -1,4 +1,4 @@
-# Prometheus Alertmanager LTS Docker Image
+# Prometheus Alertmanager | Ubuntu
  **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
@@ -18,76 +18,12 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus-alertmanager but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 public.ecr.aws/lts/prometheus-alertmanager:latest
-```
-Access your Prometheus Alertmanager server at `localhost:30093`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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/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. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f prometheus-alertmanager-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it prometheus-alertmanager-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
-[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 alertmanager-config --from-file=alertmanager=alertmanager.yml
-kubectl apply -f prometheus-alertmanager-deployment.yml
-```
-
-You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`.
-
-## 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 "`prometheus-alertmanager: <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/prometheus-alertmanager:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md
index d33d6d3..3321c8f 100644
--- a/docs/public.ecr.aws/lts/prometheus.md
+++ b/docs/public.ecr.aws/lts/prometheus.md
@@ -1,4 +1,4 @@
-# Prometheus LTS Docker Image
+# Prometheus | Ubuntu
  **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
@@ -18,76 +18,12 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 prometheus-container -e TZ=UTC -p 30090:9090 public.ecr.aws/lts/prometheus:latest
-```
-Access your Prometheus server at `localhost:30090`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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/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
-
-To debug the container:
-
-```sh
-docker logs -f prometheus-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it prometheus-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
-[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
-kubectl apply -f prometheus-deployment.yml
-```
-
-You will now be able to connect to the Prometheus on `http://localhost:30090`.
-
-## 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 "`prometheus: <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/prometheus:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/redis.md b/docs/public.ecr.aws/lts/redis.md
index 67893e5..e4180e3 100644
--- a/docs/public.ecr.aws/lts/redis.md
+++ b/docs/public.ecr.aws/lts/redis.md
@@ -1,4 +1,4 @@
-# Redis™ software LTS Docker Image
+# Redis™ software | Ubuntu
  **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
@@ -18,97 +18,12 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/redis but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/lts/redis:latest
-```
-Access your Redis server at `localhost:30073`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e ALLOW_EMPTY_PASSWORD` | Set to `yes` to allow connections to `redis-server` without a password.  **This setting is not recommended in production environments**. |
-| `-e REDIS_PASSWORD` | Set the desired password to be used. |
-| `-e REDIS_RANDOM_PASSWORD` | Set this variable to `1` if you would like the entrypoint script to generate a random password for you.  You will be able to see the generated password in the logs (`docker logs`). |
-| `-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?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
-
-To debug the container:
-
-```sh
-docker logs -f redis-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it redis-container /bin/bash
-```
-
-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/lts/redis:latest redis-cli -h redis-container
-```
-Now you can:
-```
-redis:6379> AUTH mypassword
-OK
-redis:6379> PING
-PONG
-redis:6379>
-
-```
-
-## 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
-[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
-kubectl apply -f redis-deployment.yml
-```
-
-You will now be able to connect to the Redis server on `localhost:30073`.
-
-## 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 "`redis: <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/redis:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md
index 5ab66a1..7cab70f 100644
--- a/docs/public.ecr.aws/lts/squid.md
+++ b/docs/public.ecr.aws/lts/squid.md
@@ -1,4 +1,4 @@
-# Squid LTS Docker Image
+# Squid | Ubuntu
  
 
 ## LTS Docker Image Portfolio
@@ -18,80 +18,14 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/squid but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
- | **`5.2-22.04_beta`** &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` |
+ | **`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 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`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-p 3128:3128` | Expose the proxy service |
-| `-v /path/to/logs:/var/log/squid` | Volume to store squid logs |
-| `-v /path/to/data:/var/spool/squid` | Volume to store the squid cache |
-| `-v /path/to/main/config:/etc/squid/squid.conf` | Main squid configuration file |
-| `-v /path/to/config/snippet:/etc/squid/conf.d/snippet.conf` | Configuration snippets included by squid.conf |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f squid-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it squid-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
-[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
-kubectl apply -f squid-deployment.yml
-```
-
-You can now access the squid proxy on port 3128
-
-## 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 "`squid: <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/squid:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md
index a3bb9d5..382878a 100644
--- a/docs/public.ecr.aws/lts/telegraf.md
+++ b/docs/public.ecr.aws/lts/telegraf.md
@@ -1,4 +1,4 @@
-# Telegraf™ software LTS Docker Image
+# Telegraf™ software | Ubuntu
  **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
@@ -18,75 +18,12 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/telegraf but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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 telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/lts/telegraf:latest
-```
-Access your Telegraf server at `localhost:30273`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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?h=1.21-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f telegraf-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it telegraf-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
-[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
-kubectl apply -f telegraf-deployment.yml
-```
-
-You will now be able to connect to the Telegraf server on `localhost:30073`.
-
-## 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 "`telegraf: <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/telegraf:<tag>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/lts/usage/apache2.md b/docs/public.ecr.aws/lts/usage/apache2.md
new file mode 100644
index 0000000..c1329a3
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/apache2.md
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+## 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-22.04_beta
+```
+Access your Apache2 server at `http://localhost:8080`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-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?h=2.4-22.04)). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f apache2-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it apache2-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
+[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-22.04_beta`), then:
+
+```sh
+kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
+kubectl apply -f apache2-deployment.yml
+```
+
+You will now be able to connect to the apache2 server on `http://localhost:30080`.
+
+## 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 "`apache2: <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/apache2:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/bind9.md b/docs/public.ecr.aws/lts/usage/bind9.md
new file mode 100644
index 0000000..9f6e4b5
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/bind9.md
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+## 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.18-22.04_beta
+```
+Access your Bind9 server at `localhost:30053`
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-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. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f bind9-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it bind9-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
+[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
+```
+
+You will now be able to connect to the Bind9 server on localhost:30053`.
+
+## 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 "`bind9: <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/bind9:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/cassandra.md b/docs/public.ecr.aws/lts/usage/cassandra.md
new file mode 100644
index 0000000..5973c25
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/cassandra.md
@@ -0,0 +1,67 @@
+
+
+
+## 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-22.04_beta
+```
+Access your Cassandra server with `cqlsh localhost 9042`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 7000:7000` | Expose itra-node communication |
+| `-p 7001:7001` | Expose TLS itra-node communication |
+| `-p 7199:7199` | Expose JMX |
+| `-p 9042:9042` | Expose CQL |
+| `-p 9160:9160` | Expose thrift service |
+| `-v /local/path/to/data:/var/lib/cassandra` | Volume to store Cassandra data |
+| `-v /path/to/logs:/var/log/cassandra` | Volume to store cassandra logs |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f cassandra-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it cassandra-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
+[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-22.04_beta`), then:
+
+```sh
+kubectl apply -f cassandra-deployment.yml
+```
+
+You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042)
+
+## 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 "`cassandra: <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/cassandra:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/cortex.md b/docs/public.ecr.aws/lts/usage/cortex.md
new file mode 100644
index 0000000..4b874e6
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/cortex.md
@@ -0,0 +1,64 @@
+
+
+
+## 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.11-22.04_beta
+```
+Access your Cortex server at `http://localhost:32709`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-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?h=1.11-22.04)). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f cortex-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it cortex-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
+[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.11-22.04_beta`), then:
+
+```sh
+kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
+kubectl apply -f cortex-deployment.yml
+```
+
+You will now be able to connect to the Cortex server on `localhost:32709`.
+
+## 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 "`cortex: <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/cortex:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/grafana.md b/docs/public.ecr.aws/lts/usage/grafana.md
new file mode 100644
index 0000000..f143d00
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/grafana.md
@@ -0,0 +1,65 @@
+
+
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/ubuntu/grafana:8.2-22.04_beta
+```
+Access your Grafana server at `localhost:30000`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 30000:3000` | Expose Grafana on `localhost:30000`. |
+| `-v /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/` | Pass a directory with files to provision a Grafana `datasource` and `dashboard` (see [documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/)). |
+| `-v /path/to/persisted/data:/var/lib/grafana` | Persist data with a volume instead of initializing a new database for each newly launched container. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f grafana-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it grafana-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
+[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.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
+kubectl apply -f grafana-deployment.yml
+```
+
+You will now be able to connect to the Grafana on `http://localhost:30000`.
+
+## 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 "`grafana: <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/grafana:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/kafka.md b/docs/public.ecr.aws/lts/usage/kafka.md
new file mode 100644
index 0000000..5bcd66e
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/kafka.md
@@ -0,0 +1,67 @@
+
+
+
+## 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/lts/usage/loki.md b/docs/public.ecr.aws/lts/usage/loki.md
new file mode 100644
index 0000000..fea14d4
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/loki.md
@@ -0,0 +1,65 @@
+
+
+
+## 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/lts/usage/memcached.md b/docs/public.ecr.aws/lts/usage/memcached.md
new file mode 100644
index 0000000..e48dc7a
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/memcached.md
@@ -0,0 +1,96 @@
+
+
+
+
+
+## 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
+```
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e MEMCACHED_CACHE_SIZE=64MB` | Determines the size of the cache. |
+| `-e MEMCACHED_MAX_CONNECTIONS=1024` | Determines the maximum number of concurrent connections. |
+| `-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:11211` | Memcached is exposed inside the container on port `11211`. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f memcached-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it memcached-container /bin/bash
+```
+
+<details>
+<summary>You can access the Memcached instance with telnet from another container (click to expand).</summary>
+
+```sh
+# Create a dedicated network
+$ docker network create memcached-network
+# Connect the main container to it
+$ docker network connect memcached-network memcached-container
+# Run an interactive container with the latest Ubuntu
+$ docker run -it --rm --name telnet --network memcached-network ubuntu bash
+# Install the telnet cli from within the container
+> apt update && apt install telnet -y
+# Connect to the memcached instance using telnet
+> telnet memcached-container 11211
+Trying 172.30.0.2...
+Connected to memcached.
+Escape character is '^]'.
+```
+From there you can run `memcached` commands, as documented in [their wiki](https://github.com/memcached/memcached/wiki/Commands).
+
+</details>
+
+```sh
+$ telnet memcached-container 11211
+```
+
+There are cases where one might want to pass some memcached command line flags that are not configurable via environment variables.
+In this case you can append the flags themselves or a shell script to the run command.
+
+
+## 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
+[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.5-20.04_beta`), then:
+
+```sh
+kubectl apply -f memcached-deployment.yml
+```
+
+Memcached will be listening on port `31211` in your host.
+
+## 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 "`memcached: <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/memcached:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/mysql.md b/docs/public.ecr.aws/lts/usage/mysql.md
new file mode 100644
index 0000000..463bedf
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/mysql.md
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+## 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-22.04_beta
+```
+Access your MySQL server at `localhost:30306`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e MYSQL_ROOT_PASSWORD=secret_for_root` | Set the password for the `root` user. This option is **mandatory** and **must not be empty**. |
+| `-e MYSQL_PASSWORD=secret` | Set the password for the `MYSQL_USER` user. |
+| `-e MYSQL_USER=john` | Create a new user with superuser privileges. This is used in conjunction with `MYSQL_PASSWORD`. |
+| `-e MYSQL_DATABASE=db_test` | Set the name of the default database. |
+| `-e MYSQL_ALLOW_EMPTY_PASSWORD=yes` | Set up a blank password for the `root` user. **This is not recommended to be used in production, make sure you know what you are doing**. |
+| `-e MYSQL_RANDOM_ROOT_PASSWORD=yes` | Generate a random initial password for the `root` user using `pwgen`. It will be printed in the logs, search for `GENERATED ROOT PASSWORD`. |
+| `-e MYSQL_ONETIME_PASSWORD=yes` | Set `root` user as experide once initialization is complete, forcing a password change on first login. |
+| `-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-custom.cnf?h=8.0-22.04)). |
+
+#### Initialization Scripts
+
+One can also add initialization scripts to their containers. This includes `*.sql`, `.sql.gz`, and `*.sh` scripts, and you just need to put them inside the  `/docker-entrypoint-initdb.d` directory inside the container. After MySQL initialization is done and the default database and user are created, the scripts are executed in the following order:
+
+* Run any `*.sql` files in alphabetically order. By default the target database is specified via `MYSQL_DATABASE`.
+* Run any executable `*.sh` scripts in alphabetically order.
+* Source any non-executable `*.sh` scripts in alphabetically order.
+
+All of this is done before the MySQL service is started. Keep in mind if your database directory is not empty (contains pre-existing database) they will be left untouched.
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f mysql-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it mysql-container /bin/bash
+```
+
+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-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.
+
+## 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
+[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-22.04_beta`), then:
+
+```sh
+kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
+kubectl apply -f mysql-deployment.yml
+```
+
+You will now be able to connect to the MySQL server on `localhost:30306`.
+
+## 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 "`mysql: <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/mysql:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/nginx.md b/docs/public.ecr.aws/lts/usage/nginx.md
new file mode 100644
index 0000000..fa2aa03
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/nginx.md
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+## 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-22.04_beta
+```
+Access your Nginx server at `http://localhost:8080`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-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?h=1.18-22.04)). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f nginx-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it nginx-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
+[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-22.04_beta`), then:
+
+```sh
+kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
+kubectl apply -f nginx-deployment.yml
+```
+
+You will now be able to connect to the nginx server on `http://localhost:31080`.
+
+## 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 "`nginx: <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/nginx:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/postgres.md b/docs/public.ecr.aws/lts/usage/postgres.md
new file mode 100644
index 0000000..2df6b8d
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/postgres.md
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+## 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:14-22.04_beta
+```
+Access your PostgreSQL server at `localhost:30432`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e POSTGRES_PASSWORD=secret` | Set the password for the superuser which is `postgres` by default. Bear in mind that to connect to the database in the same host the password is not needed but to access it via an external host (for instance another container) the password is needed. This option is **mandatory** and **must not be empty**. |
+| `-e POSTGRES_USER=john` | Create a new user with superuser privileges. This is used in conjunction with `POSTGRES_PASSWORD`. |
+| `-e POSTGRES_DB=db_test` | Set the name of the default database. |
+| `-e POSTGRES_INITDB_ARGS="--data-checksums"` | Pass arguments to the `postgres initdb` call. |
+| `-e POSTGRES_INITDB_WALDIR=/path/to/location` | Set the location of the Postgres transaction log. By default it is stored in a subdirectory of the main Postgres data folder (`PGDATA`). |
+| `-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?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
+
+One can also add initialization scripts to their containers. This includes `*.sql`, `.sql.gz`, and `*.sh` scripts, and you just need to put them inside the  `/docker-entrypoint-initdb.d` directory inside the container. After Postgres initialization is done and the default database and user are created, the scripts are executed in the following order:
+
+* Run any `*.sql` files in alphabetically order. It will be executed with `POSTGRES_USER`.
+* Run any executable `*.sh` scripts in alphabetically order.
+* Source any non-executable `*.sh` scripts in alphabetically order.
+
+All of this is done before the Postgres service is started. Keep in mind if your `PGDATA` directory is not empty (contains pre-existing database) they will be left untouched.
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f postgres-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it postgres-container /bin/bash
+```
+
+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: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.
+
+## 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
+[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:14-22.04_beta`), then:
+
+```sh
+kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
+kubectl apply -f postgres-deployment.yml
+```
+
+You will now be able to connect to the Postgres server on `localhost:30306`.
+
+## 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 "`postgres: <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/postgres:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/usage/prometheus-alertmanager.md
new file mode 100644
index 0000000..c065cce
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/prometheus-alertmanager.md
@@ -0,0 +1,65 @@
+
+
+
+## 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.23-22.04_beta
+```
+Access your Prometheus Alertmanager server at `localhost:30093`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-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/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. |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f prometheus-alertmanager-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it prometheus-alertmanager-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
+[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.23-22.04_beta`), then:
+
+```sh
+kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml
+kubectl apply -f prometheus-alertmanager-deployment.yml
+```
+
+You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`.
+
+## 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 "`prometheus-alertmanager: <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/prometheus-alertmanager:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/prometheus.md b/docs/public.ecr.aws/lts/usage/prometheus.md
new file mode 100644
index 0000000..485e4c6
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/prometheus.md
@@ -0,0 +1,65 @@
+
+
+
+## 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.33-22.04_beta
+```
+Access your Prometheus server at `localhost:30090`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-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/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
+
+To debug the container:
+
+```sh
+docker logs -f prometheus-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it prometheus-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
+[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.33-22.04_beta`), then:
+
+```sh
+kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml
+kubectl apply -f prometheus-deployment.yml
+```
+
+You will now be able to connect to the Prometheus on `http://localhost:30090`.
+
+## 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 "`prometheus: <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/prometheus:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/redis.md b/docs/public.ecr.aws/lts/usage/redis.md
new file mode 100644
index 0000000..fe20835
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/redis.md
@@ -0,0 +1,87 @@
+
+
+
+
+## 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.10_beta
+```
+Access your Redis server at `localhost:30073`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-e ALLOW_EMPTY_PASSWORD` | Set to `yes` to allow connections to `redis-server` without a password.  **This setting is not recommended in production environments**. |
+| `-e REDIS_PASSWORD` | Set the desired password to be used. |
+| `-e REDIS_RANDOM_PASSWORD` | Set this variable to `1` if you would like the entrypoint script to generate a random password for you.  You will be able to see the generated password in the logs (`docker logs`). |
+| `-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?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
+
+To debug the container:
+
+```sh
+docker logs -f redis-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it redis-container /bin/bash
+```
+
+This image also includes the `redis-cli` client for interactive container use:
+
+```sh
+$ docker network create redis-network
+$ docker network connect redis-network redis-container
+$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
+```
+Now you can:
+```
+redis:6379> AUTH mypassword
+OK
+redis:6379> PING
+PONG
+redis:6379>
+
+```
+
+## 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
+[redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.10_beta`), then:
+
+```sh
+kubectl create configmap redis-config --from-file=redis=redis.conf
+kubectl apply -f redis-deployment.yml
+```
+
+You will now be able to connect to the Redis server on `localhost:30073`.
+
+## 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 "`redis: <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/redis:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/squid.md b/docs/public.ecr.aws/lts/usage/squid.md
new file mode 100644
index 0000000..f36124d
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/squid.md
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+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`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 3128:3128` | Expose the proxy service |
+| `-v /path/to/logs:/var/log/squid` | Volume to store squid logs |
+| `-v /path/to/data:/var/spool/squid` | Volume to store the squid cache |
+| `-v /path/to/main/config:/etc/squid/squid.conf` | Main squid configuration file |
+| `-v /path/to/config/snippet:/etc/squid/conf.d/snippet.conf` | Configuration snippets included by squid.conf |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f squid-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it squid-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
+[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
+kubectl apply -f squid-deployment.yml
+```
+
+You can now access the squid proxy on port 3128
+
+## 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 "`squid: <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/squid:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/telegraf.md b/docs/public.ecr.aws/lts/usage/telegraf.md
new file mode 100644
index 0000000..618bd5c
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/telegraf.md
@@ -0,0 +1,65 @@
+
+
+
+
+## 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.19-21.10_beta
+```
+Access your Telegraf server at `localhost:30273`.
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-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?h=1.21-22.04)). |
+
+
+#### Testing/Debugging
+
+To debug the container:
+
+```sh
+docker logs -f telegraf-container
+```
+
+To get an interactive shell:
+
+```sh
+docker exec -it telegraf-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
+[telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta`), then:
+
+```sh
+kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
+kubectl apply -f telegraf-deployment.yml
+```
+
+You will now be able to connect to the Telegraf server on `localhost:30073`.
+
+## 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 "`telegraf: <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/telegraf:<tag>
+```
+
+
diff --git a/docs/public.ecr.aws/lts/usage/zookeeper.md b/docs/public.ecr.aws/lts/usage/zookeeper.md
new file mode 100644
index 0000000..89f8c82
--- /dev/null
+++ b/docs/public.ecr.aws/lts/usage/zookeeper.md
@@ -0,0 +1,62 @@
+
+
+
+## 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/docs/public.ecr.aws/lts/zookeeper.md b/docs/public.ecr.aws/lts/zookeeper.md
index 9a6c415..972d375 100644
--- a/docs/public.ecr.aws/lts/zookeeper.md
+++ b/docs/public.ecr.aws/lts/zookeeper.md
@@ -1,4 +1,4 @@
-# Apache ZooKeeper LTS Docker Image
+# Apache ZooKeeper | Ubuntu
  **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
@@ -18,73 +18,12 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques
 
 <!-- _Tags in italics are not available in public.ecr.aws/lts/zookeeper but are shown here for completeness._ -->
 
-| Channel 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 |
+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
 |---|---|---|---|---|
 | _`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes redistribution or requires 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>
-```
+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md
index f247eb4..0f701c3 100644
--- a/docs/public.ecr.aws/ubuntu/apache2.md
+++ b/docs/public.ecr.aws/ubuntu/apache2.md
@@ -15,26 +15,26 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/apache2](https:
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/apache2`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | 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/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` |
+ | **`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:_
+_The following tags might not be available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | 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/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` |
+ | _**`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
@@ -44,66 +44,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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-21.04
-```
-Access your Apache2 server at `http://localhost:8080`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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?h=2.4-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f apache2-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it apache2-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
-[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
-kubectl apply -f apache2-deployment.yml
-```
-
-You will now be able to connect to the apache2 server on `http://localhost:30080`.
-
-## 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 "`apache2: <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/apache2:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md
index 3533670..d82f16c 100644
--- a/docs/public.ecr.aws/ubuntu/bind9.md
+++ b/docs/public.ecr.aws/ubuntu/bind9.md
@@ -15,26 +15,26 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/bind9](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | **`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:_
+_The following tags might not be available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | _**`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
@@ -43,66 +43,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`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.18-22.04_beta
-```
-Access your Bind9 server at `localhost:30053`
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-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. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f bind9-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it bind9-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
-[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
-```
-
-You will now be able to connect to the Bind9 server on localhost:30053`.
-
-## 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 "`bind9: <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/bind9:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md
index c029246..c5dc089 100644
--- a/docs/public.ecr.aws/ubuntu/cassandra.md
+++ b/docs/public.ecr.aws/ubuntu/cassandra.md
@@ -25,17 +25,17 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/cassandra`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`4.0-22.04_beta`** &nbsp;&nbsp; | [-](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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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.**
+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **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.
@@ -47,68 +47,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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.10
-```
-Access your Cassandra server with `cqlsh localhost 9042`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-p 7000:7000` | Expose itra-node communication |
-| `-p 7001:7001` | Expose TLS itra-node communication |
-| `-p 7199:7199` | Expose JMX |
-| `-p 9042:9042` | Expose CQL |
-| `-p 9160:9160` | Expose thrift service |
-| `-v /local/path/to/data:/var/lib/cassandra` | Volume to store Cassandra data |
-| `-v /path/to/logs:/var/log/cassandra` | Volume to store cassandra logs |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f cassandra-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it cassandra-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
-[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
-```
-
-You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042)
-
-## 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 "`cassandra: <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/cassandra:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md
index 2fac18a..9ad439c 100644
--- a/docs/public.ecr.aws/ubuntu/cortex.md
+++ b/docs/public.ecr.aws/ubuntu/cortex.md
@@ -21,17 +21,17 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/cortex`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`1.11-22.04_beta`** &nbsp;&nbsp; | [-](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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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.**
+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **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.
@@ -43,65 +43,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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.10-21.10
-```
-Access your Cortex server at `http://localhost:32709`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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?h=1.11-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f cortex-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it cortex-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
-[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
-kubectl apply -f cortex-deployment.yml
-```
-
-You will now be able to connect to the Cortex server on `localhost:32709`.
-
-## 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 "`cortex: <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/cortex:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md
index 1108fcb..48aed51 100644
--- a/docs/public.ecr.aws/ubuntu/grafana.md
+++ b/docs/public.ecr.aws/ubuntu/grafana.md
@@ -14,17 +14,17 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/grafana`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`8.2-22.04_beta`** &nbsp;&nbsp; | [-](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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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.**
+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **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.
@@ -36,66 +36,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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:8.1-21.10
-```
-Access your Grafana server at `localhost:30000`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-p 30000:3000` | Expose Grafana on `localhost:30000`. |
-| `-v /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/` | Pass a directory with files to provision a Grafana `datasource` and `dashboard` (see [documentation](https://grafana.com/docs/grafana/latest/administration/provisioning/)). |
-| `-v /path/to/persisted/data:/var/lib/grafana` | Persist data with a voulme instead of initializing a new database for each newly launched container. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f grafana-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it grafana-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
-[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
-kubectl apply -f grafana-deployment.yml
-```
-
-You will now be able to connect to the Grafana on `http://localhost:30000`.
-
-## 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 "`grafana: <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/grafana:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/kafka.md b/docs/public.ecr.aws/ubuntu/kafka.md
index 59a4554..83042f1 100644
--- a/docs/public.ecr.aws/ubuntu/kafka.md
+++ b/docs/public.ecr.aws/ubuntu/kafka.md
@@ -14,17 +14,17 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/kafka`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | 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` |
+ | **`3.1-22.04_beta`** &nbsp;&nbsp; | [-](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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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.**
+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **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.
@@ -33,68 +33,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`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
index 4346232..cf98aef 100644
--- a/docs/public.ecr.aws/ubuntu/loki.md
+++ b/docs/public.ecr.aws/ubuntu/loki.md
@@ -14,17 +14,17 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/loki`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | 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` |
+ | **`2.4-22.04_beta`** &nbsp;&nbsp; | [-](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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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.**
+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **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.
@@ -33,66 +33,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
 |---|---|---|---|
 | _`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 213ef3c..4487878 100644
--- a/docs/public.ecr.aws/ubuntu/memcached.md
+++ b/docs/public.ecr.aws/ubuntu/memcached.md
@@ -15,25 +15,25 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/memcached](http
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/memcached`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`1.6-22.04_beta`** &nbsp;&nbsp; | [-](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:_
+_The following tags might not be available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | 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) | [![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` |
+ | _**`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
@@ -43,95 +43,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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.6-21.04
-```
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e MEMCACHED_CACHE_SIZE=64MB` | Determines the size of the cache. |
-| `-e MEMCACHED_MAX_CONNECTIONS=1024` | Determines the maximum number of concurrent connections. |
-| `-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:11211` | Memcached is exposed inside the container on port `11211`. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f memcached-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it memcached-container /bin/bash
-```
-
-<details>
-<summary>You can access the Memcached instance with telnet from another container (click to expand).</summary>
-
-```sh
-# Create a dedicated network
-$ docker network create memcached-network
-# Connect the main container to it
-$ docker network connect memcached-network memcached-container
-# Run an interactive container with the latest Ubuntu
-$ docker run -it --rm --name telnet --network memcached-network ubuntu bash
-# Install the telnet cli from within the container
-> apt update && apt install telnet -y
-# Connect to the memcached instance using telnet
-> telnet memcached-container 11211
-Trying 172.30.0.2...
-Connected to memcached.
-Escape character is '^]'.
-```
-From there you can run `memcached` commands, as documented in [their wiki](https://github.com/memcached/memcached/wiki/Commands).
-
-</details>
-
-```sh
-$ telnet memcached-container 11211
-```
-
-There are cases where one might want to pass some memcached command line flags that are not configurable via environment variables.
-In this case you can append the flags themselves or a shell script to the run command.
-
-
-## 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
-[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
-```
-
-Memcached will be listening on port `31211` in your host.
-
-## 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 "`memcached: <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/memcached:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md
index 42fe55e..0346a6f 100644
--- a/docs/public.ecr.aws/ubuntu/mysql.md
+++ b/docs/public.ecr.aws/ubuntu/mysql.md
@@ -15,26 +15,26 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/mysql](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/mysql`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | **`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:_
+_The following tags might not be available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | _**`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
@@ -44,92 +44,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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-21.04
-```
-Access your MySQL server at `localhost:30306`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e MYSQL_ROOT_PASSWORD=secret_for_root` | Set the password for the `root` user. This option is **mandatory** and **must not be empty**. |
-| `-e MYSQL_PASSWORD=secret` | Set the password for the `MYSQL_USER` user. |
-| `-e MYSQL_USER=john` | Create a new user with superuser privileges. This is used in conjunction with `MYSQL_PASSWORD`. |
-| `-e MYSQL_DATABASE=db_test` | Set the name of the default database. |
-| `-e MYSQL_ALLOW_EMPTY_PASSWORD=yes` | Set up a blank password for the `root` user. **This is not recommended to be used in production, make sure you know what you are doing**. |
-| `-e MYSQL_RANDOM_ROOT_PASSWORD=yes` | Generate a random initial password for the `root` user using `pwgen`. It will be printed in the logs, search for `GENERATED ROOT PASSWORD`. |
-| `-e MYSQL_ONETIME_PASSWORD=yes` | Set `root` user as experide once initialization is complete, forcing a password change on first login. |
-| `-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-custom.cnf?h=8.0-22.04)). |
-
-#### Initialization Scripts
-
-One can also add initialization scripts to their containers. This includes `*.sql`, `.sql.gz`, and `*.sh` scripts, and you just need to put them inside the  `/docker-entrypoint-initdb.d` directory inside the container. After MySQL initialization is done and the default database and user are created, the scripts are executed in the following order:
-
-* Run any `*.sql` files in alphabetically order. By default the target database is specified via `MYSQL_DATABASE`.
-* Run any executable `*.sh` scripts in alphabetically order.
-* Source any non-executable `*.sh` scripts in alphabetically order.
-
-All of this is done before the MySQL service is started. Keep in mind if your database directory is not empty (contains pre-existing database) they will be left untouched.
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f mysql-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it mysql-container /bin/bash
-```
-
-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-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.
-
-## 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
-[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
-kubectl apply -f mysql-deployment.yml
-```
-
-You will now be able to connect to the MySQL server on `localhost:30306`.
-
-## 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 "`mysql: <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/mysql:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md
index e34f14b..78ce0c9 100644
--- a/docs/public.ecr.aws/ubuntu/nginx.md
+++ b/docs/public.ecr.aws/ubuntu/nginx.md
@@ -15,26 +15,26 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/nginx](https://
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/nginx`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | **`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:_
+_The following tags might not be available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | _**`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
@@ -44,67 +44,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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-21.04
-```
-Access your Nginx server at `http://localhost:8080`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-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?h=1.18-22.04)). |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f nginx-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it nginx-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
-[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
-kubectl apply -f nginx-deployment.yml
-```
-
-You will now be able to connect to the nginx server on `http://localhost:31080`.
-
-## 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 "`nginx: <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/nginx:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md
index 9981a38..9a1d5ee 100644
--- a/docs/public.ecr.aws/ubuntu/postgres.md
+++ b/docs/public.ecr.aws/ubuntu/postgres.md
@@ -15,26 +15,26 @@ Up to 5 years free security maintenance [from public.ecr.aws/lts/postgres](https
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/postgres`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | **`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:_
+_The following tags might not be available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | _**`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` |
+ | _**`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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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 commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
 
 ## Deprecated channels & tags
 These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
@@ -44,91 +44,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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:13-21.04
-```
-Access your PostgreSQL server at `localhost:30432`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-e TZ=UTC` | Timezone. |
-| `-e POSTGRES_PASSWORD=secret` | Set the password for the superuser which is `postgres` by default. Bear in mind that to connect to the database in the same host the password is not needed but to access it via an external host (for instance another container) the password is needed. This option is **mandatory** and **must not be empty**. |
-| `-e POSTGRES_USER=john` | Create a new user with superuser privileges. This is used in conjunction with `POSTGRES_PASSWORD`. |
-| `-e POSTGRES_DB=db_test` | Set the name of the default database. |
-| `-e POSTGRES_INITDB_ARGS="--data-checksums"` | Pass arguments to the `postgres initdb` call. |
-| `-e POSTGRES_INITDB_WALDIR=/path/to/location` | Set the location of the Postgres transaction log. By default it is stored in a subdirectory of the main Postgres data folder (`PGDATA`). |
-| `-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?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
-
-One can also add initialization scripts to their containers. This includes `*.sql`, `.sql.gz`, and `*.sh` scripts, and you just need to put them inside the  `/docker-entrypoint-initdb.d` directory inside the container. After Postgres initialization is done and the default database and user are created, the scripts are executed in the following order:
-
-* Run any `*.sql` files in alphabetically order. It will be executed with `POSTGRES_USER`.
-* Run any executable `*.sh` scripts in alphabetically order.
-* Source any non-executable `*.sh` scripts in alphabetically order.
-
-All of this is done before the Postgres service is started. Keep in mind if your `PGDATA` directory is not empty (contains pre-existing database) they will be left untouched.
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f postgres-container
-```
-
-To get an interactive shell:
-
-```sh
-docker exec -it postgres-container /bin/bash
-```
-
-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: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.
-
-## 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
-[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
-kubectl apply -f postgres-deployment.yml
-```
-
-You will now be able to connect to the Postgres server on `localhost:30306`.
-
-## 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 "`postgres: <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/postgres:<tag>
-```
-
-
diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
index a5b1127..e6d19b0 100644
--- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
@@ -14,17 +14,17 @@ Up to 5 years free security maintenance. [Request access](https://ubuntu.com/sec
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
 Up to 10 years customer security maintenance `from canonical/prometheus-alertmanager`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-| Channel Tag | | | Currently | Architectures |
+| Channel Tags | | | Currently | Architectures |
 |---|---|---|---|---|
- | **`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` |
+ | **`0.23-22.04_beta`** &nbsp;&nbsp; | [-](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`.
+Channel Tags shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
 
 
 ### Commercial use and Extended Security Maintenance channels
-If your usage includes commercial redistribution or requires 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.**
+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **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.
@@ -36,66 +36,3 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels,
  | ~~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.22-21.10
-```
-Access your Prometheus Alertmanager server at `localhost:30093`.
-
-#### Parameters
-
-| Parameter | Description |
-|---|---|
-| `-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/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. |
-
-
-#### Testing/Debugging
-
-To debug the container:
-
-```sh
-docker logs -f prometheus-alertmanager-container
-```
-