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

[Valentin Viennot]

Data files in repository

- Moved data files into the templates repository.
- Update getting started scripting (including quickstart with .devcontainer)
- Update scripting

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Valentin. I'm leaving a few comments that should be easy to address; when you do, I think this will be ready to be merged.

Thanks.

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

BTW, once this is merged I will proceed with deleting the documentation bits from each image's repository/branch.

[Sergio Durigan Junior (sergiodj)]

Thanks, Valentin.

This LGTM now. I will merge it soon.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

review: Approve

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..35db662
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,11 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
+ARG VARIANT="3"
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends python3-mako python3-yaml
+
+RUN cd /usr/bin && git clone https://github.com/misterw97/RenderDown \
+    && pip3 --disable-pip-version-check --no-cache-dir install -r /usr/bin/RenderDown/requirements.txt \ 
+    && rm -rf /tmp/pip-tmp
+ENV RENDERDOWN /usr/bin/RenderDown/renderdown.py
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..2883d91
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,45 @@
+{
+	"name": "Python 3",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"context": "..",
+		"args": { 
+			// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
+			"VARIANT": "3",
+			// Options
+			"INSTALL_NODE": "true",
+			"NODE_VERSION": "lts/*"
+		}
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"python.pythonPath": "/usr/local/bin/python",
+		"python.linting.enabled": true,
+		"python.linting.pylintEnabled": true,
+		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-python.python"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "pip3 install --user -r requirements.txt",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a179a07
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,35 @@
+RENDERDOWN ?= ../RenderDown/renderdown.py
+PYTHON ?= python3
+BUILDDIR ?= docs
+DATADIR ?= data
+
+NS_DOCKERHUB = docker.io/ubuntu
+NS_ECR = public.ecr.aws/ubuntu
+NS_ECR_LTS = public.ecr.aws/lts
+
+README_TEMPLATE_DOCKERHUB = templates/README_DOCKERHUB.md
+README_TEMPLATE_ECR = templates/README_ECR.md
+README_TEMPLATE_ECR_LTS = templates/README_ECR_LTS.md
+
+all: all-doc
+
+all-doc: clean-doc dockerhub-docs ecr-docs ecr-lts-docs
+
+dockerhub-docs:
+	mkdir -p $(BUILDDIR)/$(NS_DOCKERHUB)
+	$(PYTHON) $(RENDERDOWN) $(README_TEMPLATE_DOCKERHUB) --outdir $(BUILDDIR)/$(NS_DOCKERHUB) --data $(DATADIR)
+
+ecr-docs:
+	mkdir -p $(BUILDDIR)/$(NS_ECR)
+	$(PYTHON) $(RENDERDOWN) $(README_TEMPLATE_ECR) --outdir $(BUILDDIR)/$(NS_ECR) --data $(DATADIR)
+
+ecr-lts-docs:
+	mkdir -p $(BUILDDIR)/$(NS_ECR_LTS)
+	$(PYTHON) $(RENDERDOWN) $(README_TEMPLATE_ECR_LTS) --outdir $(BUILDDIR)/$(NS_ECR_LTS) --data $(DATADIR)
+
+clean: clean-doc
+
+clean-doc:
+	rm -rf $(BUILDDIR)
+
+.PHONY: clean clean-doc all all-doc dockerhub-docs ecr-docs ecr-lts-docs
diff --git a/README.md b/README.md
index 1803ada..0166dea 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,36 @@
 
 This is where we store the template files for each OCI image.
 
-# Installing
+## Installing
 
+### DevContainer
+
+This repository contains a `.devcontainer` config folder to allow isolated-environment-controlled execution with [VScode](https://code.visualstudio.com/docs/remote/containers). 
+
+The DevContainer will provide you with a working environment out of the box. **You don't need any configuration.**
+
+### Manually
+
+```bash
+git clone https://github.com/misterw97/RenderDown
+sudo apt update && sudo apt install -y python3-mako python3-yaml
 ```
-$ git clone https://github.com/misterw97/RenderDown
-$ sudo apt install -y python3-mako python3-yaml
-$ python3 ./RenderDown/renderdown.py templates/README_DOCKERHUB.md --outdir out --data ./data
+
+## Running
+
+Create README files for all registries and namespaces:
+
+```bash
+make
 ```
+
+Create a README file for a specific registry/namespace combination:
+
+```bash
+make dockerhub-docs
+make ecr-docs
+make ecr-lts-docs
+```
+
+The documentation will be available under `docs`, respecting the image
+registry/namespace format.
diff --git a/data/apache2.yaml b/data/apache2.yaml
new file mode 100644
index 0000000..8ae01f1
--- /dev/null
+++ b/data/apache2.yaml
@@ -0,0 +1,54 @@
+application: Apache2
+repo: apache2
+description: >
+  The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet. Read more on the [apache2 website](https://httpd.apache.org/).
+releases:
+  - track: '2.4'
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '2.4'
+    risk: beta
+    version: '2.4.41'
+    base: 20.04
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 8080:80
+  access: Access your Apache2 server at `http://localhost:8080`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 8080:80
+    description: Expose Apache2 on `localhost:8080`.
+  - type: -v
+    value: /local/path/to/website:/var/www/html
+    description: Mount and serve a local website.
+  - type: -v
+    value: /path/to/apache2.conf:/etc/apache2/apache2.conf
+    description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf)).
+debug:
+  - nothing
+microk8s:
+  configmap:
+    files:
+      - key: apache2
+        name: apache2.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf
+      - key: apache2-site
+        name: index.html
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml
+    access: You will now be able to connect to the apache2 server on `http://localhost:30080`.
diff --git a/data/bind9.yaml b/data/bind9.yaml
new file mode 100644
index 0000000..82013ab
--- /dev/null
+++ b/data/bind9.yaml
@@ -0,0 +1,42 @@
+application: Bind9
+repo: bind9
+description: >
+  BIND 9 provides software for Domain Name System (DNS) management including both defining domain names authoritatively for a given DNS zone, and recursively resolving domain names to their IP addresses.
+  In addition to BIND 9's DNS server itself, `named`, this container also includes tools for performing DNS queries and dynamic updates.
+  Read more on the [BIND 9 website](https://www.isc.org/bind/).
+releases:
+  - track: '9.16.15'
+    risk: beta
+    base: '20.04'
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 30053:53
+  access: Access your Bind9 server at `localhost:30053`
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 30053:53
+    description: Expose bind9 on `localhost:30053`.
+  - type: -v
+    value: /path/to/bind/configuration:/etc/bind/named.conf
+    description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)).
+  - type: -v
+    value: /path/to/cached/data:/var/cache/bind
+    description: Location where locally cached data can be dumped.
+  - type: -v
+    value: /path/to/resource/records:/var/lib/bind
+    description: Location of Resource Records defining various domain information.
+debug:
+  - nothing
+microk8s:
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml
+    access: You will now be able to connect to the Bind9 server on localhost:30053`.
\ No newline at end of file
diff --git a/data/cassandra.yaml b/data/cassandra.yaml
new file mode 100644
index 0000000..56ae5c2
--- /dev/null
+++ b/data/cassandra.yaml
@@ -0,0 +1,64 @@
+application: Cassandra
+repo: cassandra
+description: >
+  Apache Cassandra is an open source NoSQL distributed database trusted by
+  thousands of companies for scalability and high availability without
+  compromising performance. Linear scalability and proven fault-tolerance on
+  commodity hardware or cloud infrastructure make it a good platform for
+  mission-critical data.
+releases:
+  - track: "4.0"
+    risk: beta
+    base: '21.04'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: "4.0"
+    risk: beta
+    base: '20.04'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 7000:7000
+    - -p 7001:7001
+    - -p 7199:7199
+    - -p 9042:9042
+    - -p 9160:9160
+  access: Access your Cassandra server with `cqlsh localhost 9042`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 7000:7000
+    description: Expose itra-node communication
+  - type: -p
+    value: 7001:7001
+    description: Expose TLS itra-node communication
+  - type: -p
+    value: 7199:7199
+    description: Expose JMX
+  - type: -p
+    value: 9042:9042
+    description: Expose CQL
+  - type: -p
+    value: 9160:9160
+    description: Expose thrift service
+  - type: -v
+    value: /local/path/to/data:/var/lib/cassandra
+    description: Volume to store Cassandra data
+  - type: -v
+    value: /path/to/logs:/var/log/cassandra
+    description: Volume to store cassandra logs
+debug:
+  - nothing
+microk8s:
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml
+    access: You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042)
diff --git a/data/cortex.yaml b/data/cortex.yaml
new file mode 100644
index 0000000..b39bdfe
--- /dev/null
+++ b/data/cortex.yaml
@@ -0,0 +1,54 @@
+application: Cortex
+repo: cortex
+description: |
+  Cortex provides horizontally scalable, highly available, multi-tenant, long term storage for Prometheus.
+
+  * Horizontally scalable: Cortex can run across multiple machines in a cluster, exceeding the throughput and storage of a single machine. This enables you to send the metrics from multiple Prometheus servers to a single Cortex cluster and run "globally aggregated" queries across all data in a single place.
+  * Highly available: When run in a cluster, Cortex can replicate data between machines. This allows you to survive machine failure without gaps in your graphs.
+  * Multi-tenant: Cortex can isolate data and queries from multiple different independent Prometheus sources in a single cluster, allowing untrusted parties to share the same cluster.
+  * Long term storage: Cortex supports Amazon DynamoDB, Google Bigtable, Cassandra, S3, GCS and Microsoft Azure for long term storage of metric data. This allows you to durably store data for longer than the lifetime of any single machine, and use this data for long term capacity planning.
+
+  Read more on the [Cortex website](https://cortexmetrics.io/).
+releases:
+  - track: 1.7
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: 1.4
+    risk: beta
+    version: '1.4.0'
+    base: 20.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 32709:9009
+  access: Access your Cortex server at `http://localhost:32709`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 32709:9009
+    description: Expose Cortex on `localhost:32709`.
+  - type: -v
+    value: /my/local/cortex.yaml:/etc/cortex/cortex.yaml
+    description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml)).
+debug:
+  - nothing
+microk8s:
+  configmap:
+    files:
+      - key: main-config
+        name: cortex.yaml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml
+    access: You will now be able to connect to the Cortex server on `localhost:32709`.
diff --git a/data/grafana.yaml b/data/grafana.yaml
new file mode 100644
index 0000000..9a2beec
--- /dev/null
+++ b/data/grafana.yaml
@@ -0,0 +1,56 @@
+application: Grafana™ software
+repo: grafana
+description: >
+  Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics. 
+  Read more on the [Grafana website](https://grafana.com/docs/).
+releases:
+  - track: 7.4
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: 7.2
+    risk: beta
+    version: '7.2.0'
+    base: 20.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 30000:3000
+  access: Access your Grafana server at `localhost:30000`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 30000:3000
+    description: Expose Grafana on `localhost:30000`.
+  - type: -v
+    value: /path/to/grafana/provisioning/files/:/etc/grafana/provisioning/
+    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.
+debug: None
+microk8s:
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml
+    access: You will now be able to connect to the Grafana on `http://localhost:30000`.
+  configmap:
+    files:
+    - key: grafana-datasource
+      name: datasource.yml
+      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml
+    - key: grafana-dashboard-definition
+      name: dashboard.yml
+      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml
+    - key: grafana-dashboard
+      name: system-stats-dashboard.json
+      link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json
diff --git a/data/memcached.yaml b/data/memcached.yaml
new file mode 100644
index 0000000..0a086b8
--- /dev/null
+++ b/data/memcached.yaml
@@ -0,0 +1,82 @@
+application: Memcached
+repo: memcached
+description: >
+  Memcached is an in-memory key-value store for small chunks of arbitrary data (strings, objects) from results of database calls, API calls, or page rendering. It is a short-term memory for applications.
+  Memcached allows to take memory from parts of a system where you have more than you need and make it accessible to areas where you have less than you need. Read more on the [memcached website](https://memcached.org/).
+releases:
+  - track: 1.6
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: 1.5
+    risk: beta
+    version: 1.5.22
+    base: 20.04
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  nothing:
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -e
+    value: MEMCACHED_CACHE_SIZE=64MB
+    description: Determines the size of the cache.
+  - type: -e
+    value: MEMCACHED_MAX_CONNECTIONS=1024
+    description: Determines the maximum number of concurrent connections.
+  - type: -e
+    value: MEMCACHED_THREADS=4
+    description: Determines the number of threads to process requests.
+  - type: -e
+    value: MEMCACHED_PASSWORD
+    description: 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.
+  - type: -e
+    value: MEMCACHED_USERNAME
+    description: Define a new user. If this option is passed a password is needed to authenticate the new user.
+  - type: -p
+    value: 11211
+    description: Memcached is exposed inside the container on port `11211`.
+debug:
+  text: |
+    <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.
+microk8s:
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml
+    access: Memcached will be listening on port `31211` in your host.
diff --git a/data/mysql.yaml b/data/mysql.yaml
new file mode 100644
index 0000000..c2b73d0
--- /dev/null
+++ b/data/mysql.yaml
@@ -0,0 +1,90 @@
+application: MySQL™
+repo: mysql
+description: >
+  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+  server. SQL (Structured Query Language) is the most popular database query
+  language in the world. The main goals of MySQL are speed, robustness and ease
+  of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
+releases:
+  - track: '8.0'
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - s390x
+  - track: '8.0'
+    risk: beta
+    version: 8.0.22
+    base: 20.04
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - s390x
+docker:
+  parameters:
+    - -p 30306:3306
+    - -e MYSQL_ROOT_PASSWORD=My:S3cr3t/
+  access: Access your MySQL server at `localhost:30306`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -e
+    value: MYSQL_ROOT_PASSWORD=secret_for_root
+    description: Set the password for the `root` user. This option is **mandatory** and **must not be empty**.
+  - type: -e
+    value: MYSQL_PASSWORD=secret
+    description: Set the password for the `MYSQL_USER` user.
+  - type: -e
+    value: MYSQL_USER=john
+    description: Create a new user with superuser privileges. This is used in conjunction with `MYSQL_PASSWORD`.
+  - type: -e
+    value: MYSQL_DATABASE=db_test
+    description: Set the name of the default database.
+  - type: -e
+    value: MYSQL_ALLOW_EMPTY_PASSWORD=yes
+    description: 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**.
+  - type: -e
+    value: MYSQL_RANDOM_ROOT_PASSWORD=yes
+    description: Generate a random initial password for the `root` user using `pwgen`. It will be printed in the logs, search for `GENERATED ROOT PASSWORD`.
+  - type: -e
+    value: MYSQL_ONETIME_PASSWORD=yes
+    description: Set `root` user as experide once initialization is complete, forcing a password change on first login.
+  - type: -e
+    value: MYSQL_INITSB_SKIP_TZINFO=yes
+    description: Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it.
+  - type: -p
+    value: 30306:3306
+    description: Expose MySQL server on `localhost:30306`.
+  - type: -v
+    value: /path/to/data:/var/lib/mysql
+    description: Persist data instead of initializing a new database every time you launch a new container.
+  - type: -v
+    value: /path/to/config/files/:/etc/mysql/mysql.conf.d/
+    description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my.cnf)).
+debug:
+  extraparagraph: |
+    #### 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.
+  network:
+    client: mysql
+    args: -hmysql-container -uroot -p
+    helper: The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged in and can enjoy your new instance.
+microk8s:
+  configmap:
+    files:
+      - key: main-config
+        name: my-custom.cnf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml
+    access: You will now be able to connect to the MySQL server on `localhost:30306`.
diff --git a/data/nginx.yaml b/data/nginx.yaml
new file mode 100644
index 0000000..05796e3
--- /dev/null
+++ b/data/nginx.yaml
@@ -0,0 +1,57 @@
+application: Nginx
+repo: nginx
+description: >
+  Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server and as a proxy to reduce the load on back-end HTTP or mail servers. Read more on the [nginx website](https://www.nginx.com/).
+releases:
+  - track: 1.18
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: 1.18
+    risk: beta
+    version: '1.18.0'
+    base: 20.04
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 8080:80
+  access: Access your Nginx server at `http://localhost:8080`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 8080:80
+    description: Expose Nginx on `localhost:8080`.
+  - type: -v
+    value: /local/path/to/website:/var/www/html
+    description: Mount and serve a local website.
+  - type: -v
+    value: /path/to/conf.template:/etc/nginx/templates/conf.template
+    description: Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`).
+  - type: -v
+    value: /path/to/nginx.conf:/etc/nginx/nginx.conf
+    description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf)).
+debug:
+  - nothing
+microk8s:
+  configmap:
+    files:
+      - key: nginx
+        name: nginx.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf
+      - key: nginx-site
+        name: index.html
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml
+    access: You will now be able to connect to the nginx server on `http://localhost:31080`.
diff --git a/data/postgres.yaml b/data/postgres.yaml
new file mode 100644
index 0000000..96cb169
--- /dev/null
+++ b/data/postgres.yaml
@@ -0,0 +1,84 @@
+application: Postgres
+repo: postgres
+description: >
+  PostgreSQL is a powerful, open source object-relational database system. It is fully ACID compliant, has full support for foreign keys, joins, views, triggers, and stored procedures (in multiple languages). It includes most SQL:2008 data types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video. It has native programming interfaces for C/C++, Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation. Read more on the [PostgreSQL website](https://www.postgresql.org/docs/).
+releases:
+  - track: 13.1
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - s390x
+  - track: 12.4
+    risk: beta
+    version: 12.4
+    base: 20.04
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - s390x
+docker:
+  parameters:
+    - -p 30432:5432
+    - -e POSTGRES_PASSWORD=My:s3Cr3t/
+  access: Access your PostgreSQL server at `localhost:30432`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -e
+    value: POSTGRES_PASSWORD=secret
+    description: 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**.
+  - type: -e
+    value: POSTGRES_USER=john
+    description: Create a new user with superuser privileges. This is used in conjunction with `POSTGRES_PASSWORD`.
+  - type: -e
+    value: POSTGRES_DB=db_test
+    description: Set the name of the default database.
+  - type: -e
+    value: POSTGRES_INITDB_ARGS="--data-checksums"
+    description: Pass arguments to the `postgres initdb` call.
+  - type: -e
+    value: POSTGRES_INITDB_WALDIR=/path/to/location
+    description: Set the location of the Postgres transaction log. By default it is stored in a subdirectory of the main Postgres data folder (`PGDATA`).
+  - type: -e
+    value: POSTGRES_HOST_AUTH_METHOD=trust
+    description: "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`."
+  - type: -e
+    value: PGDATA=/path/to/location
+    description: Set the location of the database files. The default is `/var/lib/postgresql/data`.
+  - type: -p
+    value: 30432:5432
+    description: Expose Postgres on `localhost:30432`.
+  - type: -v
+    value: /path/to/postgresql.conf:/etc/postgresql/postgresql.conf
+    description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf)).
+  - type: -v
+    value: /path/to/persisted/data:/var/lib/postgresql/data
+    description: Persist data instead of initializing a new database every time you launch a new container.
+debug:
+  extraparagraph: |
+    #### 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.
+  network:
+    client: psql
+    args: -h postgres-container -U postgres
+    helper: The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged in and can enjoy your new instance.
+microk8s:
+  configmap:
+    files:
+      - key: main-config
+        name: postgresql.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml
+    access: You will now be able to connect to the Postgres server on `localhost:30306`.
diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml
new file mode 100644
index 0000000..4168597
--- /dev/null
+++ b/data/prometheus-alertmanager.yaml
@@ -0,0 +1,50 @@
+application: Prometheus Alertmanager
+repo: prometheus-alertmanager
+description: >
+  The Alertmanager handles alerts sent by client applications such as the Prometheus server. It takes care of deduplicating, grouping, and routing them to the correct receiver integration such as email, PagerDuty, or OpsGenie. It also takes care of silencing and inhibition of alerts. Read more on the [Prometheus Alertmanager website](https://prometheus.io/docs/alerting/latest/alertmanager/).
+releases:
+  - track: '0.21'
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '0.21'
+    risk: beta
+    version: 0.21.0
+    base: 20.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 30093:9093
+  access: Access your Prometheus Alertmanager server at `localhost:30093`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 30093:9093
+    description: Expose Prometheus Alertmanager on `localhost:30093`.
+  - type: -v
+    value: /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml
+    description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml)).
+  - type: -v
+    value: /path/to/persisted/data:/alertmanager
+    description: "Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container."
+debug:
+  - nothing
+microk8s:
+  configmap:
+    files:
+      - key: alertmanager
+        name: alertmanager.yml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml
+    access: You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`.
diff --git a/data/prometheus.yaml b/data/prometheus.yaml
new file mode 100644
index 0000000..ca196f3
--- /dev/null
+++ b/data/prometheus.yaml
@@ -0,0 +1,53 @@
+application: Prometheus
+repo: prometheus
+description: >
+  Prometheus is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true. Read more on the [Prometheus website](https://prometheus.io/).
+releases:
+  - track: '2.25'
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '2.20'
+    risk: beta
+    version: '2.20.1'
+    base: 20.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 30090:9090
+  access: Access your Prometheus server at `localhost:30090`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 30090:9090
+    description: Expose Prometheus server on `localhost:30090`.
+  - type: -v
+    value: /path/to/prometheus.yml:/etc/prometheus/prometheus.yml
+    description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml)).
+  - type: -v
+    value: /path/to/alerts.yml:/etc/prometheus/alerts.yml
+    description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml)).
+debug:
+  - nothing
+microk8s:
+  configmap:
+    files:
+      - key: prometheus
+        name: prometheus.yml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml
+      - key: prometheus-alerts
+        name: alerts.yml
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml
+    access: You will now be able to connect to the Prometheus on `http://localhost:30090`.
diff --git a/data/redis.yaml b/data/redis.yaml
new file mode 100644
index 0000000..e862bae
--- /dev/null
+++ b/data/redis.yaml
@@ -0,0 +1,78 @@
+application: Redis™ software
+repo: redis
+description: >
+  Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. 
+  It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams. 
+  Redis has built-in replication, Lua scripting, LRU eviction, transactions and different levels of on-disk persistence, and provides high availability via Redis Sentinel and automatic partitioning with Redis Cluster. 
+  Read more on the [Redis website](https://redis.io/topics/introduction).
+releases:
+  - track: 6.0
+    base: 21.04
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: 5.0
+    version: 5.0.7
+    base: 20.04
+    risk: beta
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 30073:6379
+    - -e REDIS_PASSWORD=mypassword
+  access: Access your Redis server at `localhost:30073`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -e
+    value: ALLOW_EMPTY_PASSWORD
+    description: Set to `yes` to allow connections to `redis-server` without a password.  **This setting is not recommended in production environments**.
+  - type: -e
+    value: REDIS_PASSWORD
+    description: Set the desired password to be used.
+  - type: -e
+    value: REDIS_RANDOM_PASSWORD
+    description: 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`).
+  - type: -e
+    value: REDIS_ALLOW_REMOTE_CONNECTIONS=yes
+    description: Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only).
+  - type: -e
+    value: REDIS_EXTRA_FLAGS
+    description: Specify extra flags to be passed to `redis-server` when initializing it.
+  - type: -p
+    value: 30073:6379
+    description: Expose redis on `localhost:30073`.
+  - type: -v
+    value: /path/to/redis.conf:/etc/redis/redis.conf
+    description: Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)).
+debug:
+  network:
+    client: redis-cli
+    args: -h redis-container
+    followup: |
+      ```
+      Now you can:
+      ```
+      redis:6379> AUTH mypassword
+      OK
+      redis:6379> PING
+      PONG
+      redis:6379>
+microk8s:
+  configmap:
+    name: redis-config
+    files:
+      - key: redis
+        name: redis.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml
+    access: You will now be able to connect to the Redis server on `localhost:30073`.
diff --git a/data/squid.yaml b/data/squid.yaml
new file mode 100644
index 0000000..bd4cbec
--- /dev/null
+++ b/data/squid.yaml
@@ -0,0 +1,55 @@
+application: Squid
+repo: squid
+description: >
+  Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
+  It reduces bandwidth and improves response times by caching and reusing
+  frequently-requested web pages. Squid has extensive access controls and makes
+  a great server accelerator. It runs on most available operating systems,
+  including Windows and is licensed under the GNU GPL.
+releases:
+  - track: '4.10'
+    risk: beta
+    base: '20.04'
+    type: LTS
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: '4.13'
+    risk: edge
+    base: '21.10'
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 3128:3128
+  access: Access your Squid proxy at `localhost:3128`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 3128:3128
+    description: Expose the proxy service
+  - type: -v
+    value: /path/to/logs:/var/log/squid
+    description: Volume to store squid logs
+  - type: -v
+    value: /path/to/data:/var/spool/squid
+    description: Volume to store the squid cache
+debug:
+  - nothing
+microk8s:
+  configmap:
+    name: squid-config
+    files:
+      - key: squid
+        name: squid.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml
+    access: You can now access the squid proxy on port 3128
\ No newline at end of file
diff --git a/data/telegraf.yaml b/data/telegraf.yaml
new file mode 100644
index 0000000..27acffc
--- /dev/null
+++ b/data/telegraf.yaml
@@ -0,0 +1,47 @@
+application: Telegraf™ software
+repo: telegraf
+description: >
+  Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics. Read more on the [Telegraf website](https://www.influxdata.com/time-series-platform/telegraf/).
+releases:
+  - track: 1.17
+    risk: beta
+    base: 21.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+  - track: 1.15
+    risk: beta
+    version: 1.15.2
+    base: 20.04
+    architectures:
+      - amd64
+      - arm64
+      - ppc64el
+      - s390x
+docker:
+  parameters:
+    - -p 30273:9273
+  access: Access your Telegraf server at `localhost:30273`.
+parameters:
+  - type: -e
+    value: TZ=UTC
+    description: Timezone.
+  - type: -p
+    value: 30273:9273
+    description: Expose Telegraf on `localhost:30273`.
+  - type: -v
+    value: /path/to/telegraf.conf:/etc/telegraf/telegraf.conf
+    description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf)).
+debug:
+    - nothing
+microk8s:
+  configmap:
+    files:
+      - key: main-config
+        name: telegraf.conf
+        link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf
+  deploy:
+    link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml
+    access: You will now be able to connect to the Telegraf server on `localhost:30073`.
diff --git a/out/apache2.md b/docs/docker.io/ubuntu/apache2.md
similarity index 77%
rename from out/apache2.md
rename to docs/docker.io/ubuntu/apache2.md
index 0194f38..cc18fdf 100644
--- a/out/apache2.md
+++ b/docs/docker.io/ubuntu/apache2.md
@@ -1,6 +1,7 @@
 # Apache2 | Ubuntu
 
-Current Apache2 Docker Image from Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/apache2`. 
+Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/apache2`.  -->
 
 
 ## About Apache2
@@ -10,26 +11,31 @@ The Apache HTTP Server Project's goal is to build a secure, efficient and extens
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/apache2`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/apache2`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/apache2`.
+Up to 10 years customer security maintenance `from canonical/apache2`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`2.4-20.04_beta`** &nbsp;&nbsp; | | | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-21.04_beta`** &nbsp;&nbsp; |  | | Apache2 2.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.4-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-20.04_beta
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.04_beta
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -64,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html) and
-[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-20.04_beta`), then:
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-21.04_beta`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
@@ -85,3 +91,4 @@ Please title the bug "`apache2: <issue summary>`". Make sure to include the dige
 docker images --no-trunc --quiet ubuntu/apache2:<tag>
 ```
 
+
diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md
new file mode 100644
index 0000000..f2e3258
--- /dev/null
+++ b/docs/docker.io/ubuntu/bind9.md
@@ -0,0 +1,92 @@
+# Bind9 | Ubuntu
+
+Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Bind9 or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/bind9`.  -->
+
+
+## About Bind9
+
+BIND 9 provides software for Domain Name System (DNS) management including both defining domain names authoritatively for a given DNS zone, and recursively resolving domain names to their IP addresses. In addition to BIND 9's DNS server itself, `named`, this container also includes tools for performing DNS queries and dynamic updates. Read more on the [BIND 9 website](https://www.isc.org/bind/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/bind9`. -->
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+_Tags in italics are not available in ubuntu/bind9 but are shown here for completeness._
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`9.16-20.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+## Usage
+
+Launch this image locally:
+
+```sh
+docker run -d --name bind9-container -e TZ=UTC -p 30053:53 ubuntu/bind9:9.16-20.04_beta
+```
+Access your Bind9 server at `localhost:30053`
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 1803233` | Expose bind9 on `localhost:30053`. |
+| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)). |
+| `-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) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.16-20.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 ubuntu/bind9:<tag>
+```
+
+
diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md
new file mode 100644
index 0000000..400f771
--- /dev/null
+++ b/docs/docker.io/ubuntu/cassandra.md
@@ -0,0 +1,96 @@
+# Cassandra | Ubuntu
+
+Current Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cassandra or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/cassandra`.  -->
+
+
+## About Cassandra
+
+Apache Cassandra is an open source NoSQL distributed database trusted by thousands of companies for scalability and high availability without compromising performance. Linear scalability and proven fault-tolerance on commodity hardware or cloud infrastructure make it a good platform for mission-critical data.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/cassandra`. -->
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/cassandra`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+_Tags in italics are not available in ubuntu/cassandra but are shown here for completeness._
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`4.0-21.04_beta`** &nbsp;&nbsp; |  | | Cassandra 4.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.0-20.04_beta` &nbsp;&nbsp; |  | | Cassandra 4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+## Usage
+
+Launch this image locally:
+
+```sh
+docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 ubuntu/cassandra:4.0-21.04_beta
+```
+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) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-21.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 ubuntu/cassandra:<tag>
+```
+
+
diff --git a/out/cortex.md b/docs/docker.io/ubuntu/cortex.md
similarity index 78%
rename from out/cortex.md
rename to docs/docker.io/ubuntu/cortex.md
index 4301d6d..a2d0b20 100644
--- a/out/cortex.md
+++ b/docs/docker.io/ubuntu/cortex.md
@@ -1,6 +1,7 @@
 # Cortex | Ubuntu
 
-Current Cortex Docker Image from Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/cortex`. 
+Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/cortex`.  -->
 
 
 ## About Cortex
@@ -17,26 +18,31 @@ Read more on the [Cortex website](https://cortexmetrics.io/).
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/cortex`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/cortex`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/cortex`.
+Up to 10 years customer security maintenance `from canonical/cortex`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`1.4-20.04_beta`** &nbsp;&nbsp; | | | Cortex 1.4.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.7-21.04_beta`** &nbsp;&nbsp; |  | | Cortex 1.7 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.4-20.04_beta` &nbsp;&nbsp; |  | | Cortex 1.4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.4-20.04_beta
+docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.7-21.04_beta
 ```
 Access your Cortex server at `http://localhost:32709`.
 
@@ -70,7 +76,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml) and
-[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.4-20.04_beta`), then:
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.7-21.04_beta`), then:
 
 ```sh
 kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
@@ -91,3 +97,4 @@ Please title the bug "`cortex: <issue summary>`". Make sure to include the diges
 docker images --no-trunc --quiet ubuntu/cortex:<tag>
 ```
 
+
diff --git a/out/grafana.md b/docs/docker.io/ubuntu/grafana.md
similarity index 75%
rename from out/grafana.md
rename to docs/docker.io/ubuntu/grafana.md
index b090b98..c1aef62 100644
--- a/out/grafana.md
+++ b/docs/docker.io/ubuntu/grafana.md
@@ -1,35 +1,41 @@
-# Grafana | Ubuntu
+# Grafana™ software | Ubuntu
 
-Current Grafana Docker Image from Ubuntu. Receives security updates and rolls to newer Grafana or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/grafana`. 
+Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/grafana`.  -->
 
 
-## About Grafana
+## About Grafana™ software
 
 Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics.  Read more on the [Grafana website](https://grafana.com/docs/).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/grafana`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/grafana`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/grafana`.
+Up to 10 years customer security maintenance `from canonical/grafana`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`7.2-20.04_beta`** &nbsp;&nbsp; | | | Grafana 7.2.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`7.4-21.04_beta`** &nbsp;&nbsp; |  | | Grafana™ software 7.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.2-20.04_beta` &nbsp;&nbsp; |  | | Grafana™ software 7.2.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:7.2-20.04_beta
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:7.4-21.04_beta
 ```
 Access your Grafana server at `localhost:30000`.
 
@@ -64,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and
-[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:7.2-20.04_beta`), then:
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:7.4-21.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
@@ -85,3 +91,4 @@ Please title the bug "`grafana: <issue summary>`". Make sure to include the dige
 docker images --no-trunc --quiet ubuntu/grafana:<tag>
 ```
 
+
diff --git a/out/memcached.md b/docs/docker.io/ubuntu/memcached.md
similarity index 82%
rename from out/memcached.md
rename to docs/docker.io/ubuntu/memcached.md
index 54f042b..b03808f 100644
--- a/out/memcached.md
+++ b/docs/docker.io/ubuntu/memcached.md
@@ -1,6 +1,7 @@
 # Memcached | Ubuntu
 
-Current Memcached Docker Image from Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/memcached`. 
+Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/memcached`.  -->
 
 
 ## About Memcached
@@ -10,26 +11,31 @@ Memcached is an in-memory key-value store for small chunks of arbitrary data (st
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/memcached`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/memcached`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/memcached`.
+Up to 10 years customer security maintenance `from canonical/memcached`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`1.5-20.04_beta`** &nbsp;&nbsp; | | | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.6-21.04_beta`** &nbsp;&nbsp; |  | | Memcached 1.6 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.5-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.5-20.04_beta
+docker run -d --name memcached-container -e TZ=UTC  ubuntu/memcached:1.6-21.04_beta
 ```
 
 #### Parameters
@@ -94,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) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.5-20.04_beta`), then:
+[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-21.04_beta`), then:
 
 ```sh
 kubectl apply -f memcached-deployment.yml
@@ -114,3 +120,4 @@ Please title the bug "`memcached: <issue summary>`". Make sure to include the di
 docker images --no-trunc --quiet ubuntu/memcached:<tag>
 ```
 
+
diff --git a/out/mysql.md b/docs/docker.io/ubuntu/mysql.md
similarity index 80%
rename from out/mysql.md
rename to docs/docker.io/ubuntu/mysql.md
index 3d74860..5129a97 100644
--- a/out/mysql.md
+++ b/docs/docker.io/ubuntu/mysql.md
@@ -1,35 +1,41 @@
-# MySQL | Ubuntu
+# MySQL™ | Ubuntu
 
-Current MySQL Docker Image from Ubuntu. Receives security updates and rolls to newer MySQL or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/mysql`. 
+Current MySQL™ Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/mysql`.  -->
 
 
-## About MySQL
+## About MySQL™
 
 MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and ease of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/mysql`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/mysql`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/mysql`.
+Up to 10 years customer security maintenance `from canonical/mysql`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`8.0-20.04_beta`** &nbsp;&nbsp; | | | MySQL 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `s390x` |
+ | **`8.0-21.04_beta`** &nbsp;&nbsp; |  | | MySQL™ 8.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
+ | `8.0-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-20.04_beta
+docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-21.04_beta
 ```
 Access your MySQL server at `localhost:30306`.
 
@@ -80,7 +86,7 @@ This image also includes the `mysql` client for interactive container use:
 ```sh
 $ docker network create mysql-network
 $ docker network connect mysql-network mysql-container
-$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-20.04_beta mysql -hmysql-container -uroot -p
+$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.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.
 
@@ -90,7 +96,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf) and
-[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-20.04_beta`), then:
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-21.04_beta`), then:
 
 ```sh
 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
@@ -111,3 +117,4 @@ Please title the bug "`mysql: <issue summary>`". Make sure to include the digest
 docker images --no-trunc --quiet ubuntu/mysql:<tag>
 ```
 
+
diff --git a/out/nginx.md b/docs/docker.io/ubuntu/nginx.md
similarity index 77%
rename from out/nginx.md
rename to docs/docker.io/ubuntu/nginx.md
index 62230c9..710e302 100644
--- a/out/nginx.md
+++ b/docs/docker.io/ubuntu/nginx.md
@@ -1,6 +1,7 @@
 # Nginx | Ubuntu
 
-Current Nginx Docker Image from Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/nginx`. 
+Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/nginx`.  -->
 
 
 ## About Nginx
@@ -10,26 +11,31 @@ Nginx ("engine X") is a high-performance web and reverse proxy server created by
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/nginx`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/nginx`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/nginx`.
+Up to 10 years customer security maintenance `from canonical/nginx`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`1.18-20.04_beta`** &nbsp;&nbsp; | | | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.18-21.04_beta`** &nbsp;&nbsp; |  | | Nginx 1.18 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.18-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
-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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-20.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.04_beta
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -65,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html) and
-[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-20.04_beta`), then:
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.04_beta`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
@@ -86,3 +92,4 @@ Please title the bug "`nginx: <issue summary>`". Make sure to include the digest
 docker images --no-trunc --quiet ubuntu/nginx:<tag>
 ```
 
+
diff --git a/out/postgres.md b/docs/docker.io/ubuntu/postgres.md
similarity index 80%
rename from out/postgres.md
rename to docs/docker.io/ubuntu/postgres.md
index 9092aae..2ca4ef0 100644
--- a/out/postgres.md
+++ b/docs/docker.io/ubuntu/postgres.md
@@ -1,6 +1,7 @@
 # Postgres | Ubuntu
 
-Current Postgres Docker Image from Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/postgres`. 
+Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/postgres`.  -->
 
 
 ## About Postgres
@@ -10,26 +11,31 @@ PostgreSQL is a powerful, open source object-relational database system. It is f
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/postgres`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/postgres`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/postgres`.
+Up to 10 years customer security maintenance `from canonical/postgres`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`12.4-20.04_beta`** &nbsp;&nbsp; | | | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `s390x` |
+ | **`13.1-21.04_beta`** &nbsp;&nbsp; |  | | Postgres 13.1 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
+ | `12.4-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:12.4-20.04_beta
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:13.1-21.04_beta
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -79,7 +85,7 @@ This image also includes the `psql` client for interactive container use:
 ```sh
 $ docker network create postgres-network
 $ docker network connect postgres-network postgres-container
-$ docker run -it --rm --network postgres-network ubuntu/postgres:12.4-20.04_beta psql -h postgres-container -U postgres
+$ docker run -it --rm --network postgres-network ubuntu/postgres:13.1-21.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.
 
@@ -89,7 +95,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf) and
-[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:12.4-20.04_beta`), then:
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:13.1-21.04_beta`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
@@ -110,3 +116,4 @@ Please title the bug "`postgres: <issue summary>`". Make sure to include the dig
 docker images --no-trunc --quiet ubuntu/postgres:<tag>
 ```
 
+
diff --git a/out/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md
similarity index 77%
rename from out/prometheus-alertmanager.md
rename to docs/docker.io/ubuntu/prometheus-alertmanager.md
index b91d03b..89fa94c 100644
--- a/out/prometheus-alertmanager.md
+++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md
@@ -1,6 +1,7 @@
 # Prometheus Alertmanager | Ubuntu
 
-Current Prometheus Alertmanager Docker Image from Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/prometheus-alertmanager`. 
+Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/prometheus-alertmanager`.  -->
 
 
 ## About Prometheus Alertmanager
@@ -10,26 +11,31 @@ The Alertmanager handles alerts sent by client applications such as the Promethe
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/prometheus-alertmanager`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/prometheus-alertmanager`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/prometheus-alertmanager`.
+Up to 10 years customer security maintenance `from canonical/prometheus-alertmanager`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`0.21-20.04_beta`** &nbsp;&nbsp; | | | Prometheus Alertmanager 0.21.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`0.21-21.04_beta`** &nbsp;&nbsp; |  | | Prometheus Alertmanager 0.21 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `0.21-20.04_beta` &nbsp;&nbsp; |  | | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 ubuntu/prometheus-alertmanager:0.21-20.04_beta
+docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 ubuntu/prometheus-alertmanager:0.21-21.04_beta
 ```
 Access your Prometheus Alertmanager server at `localhost:30093`.
 
@@ -64,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml) and
-[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.21-20.04_beta`), then:
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.21-21.04_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
@@ -85,3 +91,4 @@ Please title the bug "`prometheus-alertmanager: <issue summary>`". Make sure to 
 docker images --no-trunc --quiet ubuntu/prometheus-alertmanager:<tag>
 ```
 
+
diff --git a/out/prometheus.md b/docs/docker.io/ubuntu/prometheus.md
similarity index 78%
rename from out/prometheus.md
rename to docs/docker.io/ubuntu/prometheus.md
index 66864d0..9bbeb86 100644
--- a/out/prometheus.md
+++ b/docs/docker.io/ubuntu/prometheus.md
@@ -1,6 +1,7 @@
 # Prometheus | Ubuntu
 
-Current Prometheus Docker Image from Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/prometheus`. 
+Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/prometheus`.  -->
 
 
 ## About Prometheus
@@ -10,26 +11,31 @@ Prometheus is a systems and service monitoring system. It collects metrics from 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/prometheus`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/prometheus`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/prometheus`.
+Up to 10 years customer security maintenance `from canonical/prometheus`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`2.20-20.04_beta`** &nbsp;&nbsp; | | | Prometheus 2.20.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.25-21.04_beta`** &nbsp;&nbsp; |  | | Prometheus 2.25 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.20-20.04_beta` &nbsp;&nbsp; |  | | Prometheus 2.20.1 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.20-20.04_beta
+docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.25-21.04_beta
 ```
 Access your Prometheus server at `localhost:30090`.
 
@@ -64,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and
-[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.20-20.04_beta`), then:
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.25-21.04_beta`), then:
 
 ```sh
 kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml
@@ -85,3 +91,4 @@ Please title the bug "`prometheus: <issue summary>`". Make sure to include the d
 docker images --no-trunc --quiet ubuntu/prometheus:<tag>
 ```
 
+
diff --git a/out/redis.md b/docs/docker.io/ubuntu/redis.md
similarity index 80%
rename from out/redis.md
rename to docs/docker.io/ubuntu/redis.md
index 9ef5a36..052a0c1 100644
--- a/out/redis.md
+++ b/docs/docker.io/ubuntu/redis.md
@@ -1,35 +1,41 @@
-# Redis | Ubuntu
+# Redis™ software | Ubuntu
 
-Current Redis Docker Image from Ubuntu. Receives security updates and rolls to newer Redis or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/redis`. 
+Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Redis™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/redis`.  -->
 
 
-## About Redis
+## About Redis™ software
 
 Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.  It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.  Redis has built-in replication, Lua scripting, LRU eviction, transactions and different levels of on-disk persistence, and provides high availability via Redis Sentinel and automatic partitioning with Redis Cluster.  Read more on the [Redis website](https://redis.io/topics/introduction).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/redis`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/redis`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/redis`.
+Up to 10 years customer security maintenance `from canonical/redis`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`5.0-20.04_beta`** &nbsp;&nbsp; | | | Redis 5.0.7 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`6.0-21.04_beta`** &nbsp;&nbsp; |  | | Redis™ software 6.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `5.0-20.04_beta` &nbsp;&nbsp; |  | | Redis™ software 5.0.7 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:5.0-20.04_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.04_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -66,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:5.0-20.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.04_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -84,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) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:5.0-20.04_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.04_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
@@ -105,3 +111,4 @@ Please title the bug "`redis: <issue summary>`". Make sure to include the digest
 docker images --no-trunc --quiet ubuntu/redis:<tag>
 ```
 
+
diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md
new file mode 100644
index 0000000..0e26afa
--- /dev/null
+++ b/docs/docker.io/ubuntu/squid.md
@@ -0,0 +1,94 @@
+# Squid | Ubuntu
+
+Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Squid or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/squid`.  -->
+
+
+## About Squid
+
+Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator. It runs on most available operating systems, including Windows and is licensed under the GNU GPL.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/squid`. -->
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/squid`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+_Tags in italics are not available in ubuntu/squid but are shown here for completeness._
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`4.10-20.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.13-21.10_edge` &nbsp;&nbsp; |  | | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+## Usage
+
+Launch this image locally:
+
+```sh
+docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.10-20.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 |
+
+
+#### 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) and
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.10-20.04_beta`), then:
+
+```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 ubuntu/squid:<tag>
+```
+
+
diff --git a/out/telegraf.md b/docs/docker.io/ubuntu/telegraf.md
similarity index 74%
rename from out/telegraf.md
rename to docs/docker.io/ubuntu/telegraf.md
index 75787de..614b5b6 100644
--- a/out/telegraf.md
+++ b/docs/docker.io/ubuntu/telegraf.md
@@ -1,35 +1,41 @@
-# Telegraf | Ubuntu
+# Telegraf™ software | Ubuntu
 
-Current Telegraf Docker Image from Ubuntu. Receives security updates and rolls to newer Telegraf or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/telegraf`. 
+Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Telegraf™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/telegraf`.  -->
 
 
-## About Telegraf
+## About Telegraf™ software
 
 Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics. Read more on the [Telegraf website](https://www.influxdata.com/time-series-platform/telegraf/).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/telegraf`.
+Up to 5 years free security maintenance on LTS channels.
+<!-- `from lts/telegraf`. -->
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/telegraf`.
+Up to 10 years customer security maintenance `from canonical/telegraf`. [Request access](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 Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`1.15-20.04_beta`** &nbsp;&nbsp; | | | Telegraf 1.15.2 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.17-21.04_beta`** &nbsp;&nbsp; |  | | Telegraf™ software 1.17 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.15-20.04_beta` &nbsp;&nbsp; |  | | Telegraf™ software 1.15.2 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
 
 Launch this image locally:
 
 ```sh
-docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.15-20.04_beta
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.17-21.04_beta
 ```
 Access your Telegraf server at `localhost:30273`.
 
@@ -63,7 +69,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.15-20.04_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.17-21.04_beta`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
@@ -84,3 +90,4 @@ Please title the bug "`telegraf: <issue summary>`". Make sure to include the dig
 docker images --no-trunc --quiet ubuntu/telegraf:<tag>
 ```
 
+
diff --git a/out-lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md
similarity index 78%
rename from out-lts/apache2.md
rename to docs/public.ecr.aws/lts/apache2.md
index 743c3b2..8dcac7e 100644
--- a/out-lts/apache2.md
+++ b/docs/public.ecr.aws/lts/apache2.md
@@ -1,8 +1,8 @@
 # Apache2 LTS Docker Image
+ 
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Apache2
 
@@ -11,28 +11,32 @@ The Apache HTTP Server Project's goal is to build a secure, efficient and extens
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/apache2`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/apache2`.
+Up to 10 years customer security maintenance `from canonical/apache2`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/apache2 but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
-| **`2.4-20.04_beta`** &nbsp;&nbsp; | - | - | Apache2 2.4.41 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`2.4-20.04_beta`** &nbsp;&nbsp; | - | - | 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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/apache2:2.4-20.04_beta
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/lts/apache2:2.4-20.04_beta
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -67,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html) and
-[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `lts/apache2:2.4-20.04_beta`), then:
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/apache2:2.4-20.04_beta`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
@@ -85,6 +89,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/apache2:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/apache2:<tag>
 ```
 
diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md
new file mode 100644
index 0000000..b53c2a8
--- /dev/null
+++ b/docs/public.ecr.aws/lts/bind9.md
@@ -0,0 +1,93 @@
+# Bind9 LTS Docker Image
+ 
+
+## LTS Docker Image Portfolio
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
+
+## About Bind9
+
+BIND 9 provides software for Domain Name System (DNS) management including both defining domain names authoritatively for a given DNS zone, and recursively resolving domain names to their IP addresses. In addition to BIND 9's DNS server itself, `named`, this container also includes tools for performing DNS queries and dynamic updates. Read more on the [BIND 9 website](https://www.isc.org/bind/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance from this repository.
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _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 |
+|---|---|---|---|---|
+ | **`9.16-20.04_beta`** &nbsp;&nbsp; | - | - | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes 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.16-20.04_beta
+```
+Access your Bind9 server at `localhost:30053`
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 1803233` | Expose bind9 on `localhost:30053`. |
+| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)). |
+| `-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) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/bind9:9.16-20.04_beta`), then:
+
+```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>
+```
+
diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md
new file mode 100644
index 0000000..0b9303e
--- /dev/null
+++ b/docs/public.ecr.aws/lts/cassandra.md
@@ -0,0 +1,95 @@
+# Cassandra LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
+
+## LTS Docker Image Portfolio
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
+
+## About Cassandra
+
+Apache Cassandra is an open source NoSQL distributed database trusted by thousands of companies for scalability and high availability without compromising performance. Linear scalability and proven fault-tolerance on commodity hardware or cloud infrastructure make it a good platform for mission-critical data.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance from this repository.
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/cassandra`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _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 |
+|---|---|---|---|---|
+| _`track_risk`_ |
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
+
+
+If your usage includes redistribution, please [contact Canonical](https://ubuntu.com/security/docker-images#get-in-touch).
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name 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) 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>
+```
+
diff --git a/out-lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md
similarity index 80%
rename from out-lts/cortex.md
rename to docs/public.ecr.aws/lts/cortex.md
index ae779d0..b321fda 100644
--- a/out-lts/cortex.md
+++ b/docs/public.ecr.aws/lts/cortex.md
@@ -1,8 +1,8 @@
 # Cortex LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Cortex
 
@@ -18,27 +18,31 @@ Read more on the [Cortex website](https://cortexmetrics.io/).
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/cortex`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/cortex`.
+Up to 10 years customer security maintenance `from canonical/cortex`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/cortex but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/cortex:1.4-20.04_beta
+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`.
 
@@ -72,7 +76,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml) and
-[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `lts/cortex:1.4-20.04_beta`), then:
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cortex:latest`), then:
 
 ```sh
 kubectl create configmap cortex-config --from-file=main-config=cortex.yaml
@@ -90,6 +94,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/cortex:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/cortex:<tag>
 ```
 
diff --git a/out-lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md
similarity index 77%
rename from out-lts/grafana.md
rename to docs/public.ecr.aws/lts/grafana.md
index af4cee1..3e003fa 100644
--- a/out-lts/grafana.md
+++ b/docs/public.ecr.aws/lts/grafana.md
@@ -1,37 +1,41 @@
-# Grafana LTS Docker Image
+# Grafana™ software LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
-
-## About Grafana
+## About Grafana™ software
 
 Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics.  Read more on the [Grafana website](https://grafana.com/docs/).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/grafana`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/grafana`.
+Up to 10 years customer security maintenance `from canonical/grafana`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/grafana but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/grafana:7.2-20.04_beta
+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`.
 
@@ -66,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and
-[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `lts/grafana:7.2-20.04_beta`), then:
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/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
@@ -84,6 +88,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/grafana:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/grafana:<tag>
 ```
 
diff --git a/out-lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md
similarity index 84%
rename from out-lts/memcached.md
rename to docs/public.ecr.aws/lts/memcached.md
index c33827e..2403521 100644
--- a/out-lts/memcached.md
+++ b/docs/public.ecr.aws/lts/memcached.md
@@ -1,8 +1,8 @@
 # Memcached LTS Docker Image
+ 
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Memcached
 
@@ -11,28 +11,32 @@ Memcached is an in-memory key-value store for small chunks of arbitrary data (st
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/memcached`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/memcached`.
+Up to 10 years customer security maintenance `from canonical/memcached`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/memcached but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
-| **`1.5-20.04_beta`** &nbsp;&nbsp; | - | - | Memcached 1.5.22 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.5-20.04_beta`** &nbsp;&nbsp; | - | - | 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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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  lts/memcached:1.5-20.04_beta
+docker run -d --name memcached-container -e TZ=UTC  public.ecr.aws/lts/memcached:1.5-20.04_beta
 ```
 
 #### Parameters
@@ -97,7 +101,7 @@ In this case you can append the flags themselves or a shell script to the run co
 Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`.
 
 Download
-[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `lts/memcached:1.5-20.04_beta`), then:
+[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml) 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
@@ -114,6 +118,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/memcached:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/memcached:<tag>
 ```
 
diff --git a/out-lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md
similarity index 81%
rename from out-lts/mysql.md
rename to docs/public.ecr.aws/lts/mysql.md
index 6239da7..d3cf571 100644
--- a/out-lts/mysql.md
+++ b/docs/public.ecr.aws/lts/mysql.md
@@ -1,38 +1,42 @@
-# MySQL LTS Docker Image
+# MySQL™ LTS Docker Image
+ 
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
-
-## About MySQL
+## About MySQL™
 
 MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and ease of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/mysql`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/mysql`.
+Up to 10 years customer security maintenance `from canonical/mysql`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/mysql but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
-| **`8.0-20.04_beta`** &nbsp;&nbsp; | - | - | MySQL 8.0.22 | `amd64`, `arm64`, `s390x` |
+ | **`8.0-20.04_beta`** &nbsp;&nbsp; | - | - | MySQL™ 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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/ lts/mysql:8.0-20.04_beta
+docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/lts/mysql:8.0-20.04_beta
 ```
 Access your MySQL server at `localhost:30306`.
 
@@ -83,7 +87,7 @@ This image also includes the `mysql` client for interactive container use:
 ```sh
 $ docker network create mysql-network
 $ docker network connect mysql-network mysql-container
-$ docker run -it --rm --network mysql-network lts/mysql:8.0-20.04_beta mysql -hmysql-container -uroot -p
+$ docker run -it --rm --network mysql-network public.ecr.aws/lts/mysql:8.0-20.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.
 
@@ -93,7 +97,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf) and
-[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `lts/mysql:8.0-20.04_beta`), then:
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/mysql:8.0-20.04_beta`), then:
 
 ```sh
 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
@@ -111,6 +115,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/mysql:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/mysql:<tag>
 ```
 
diff --git a/out-lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md
similarity index 78%
rename from out-lts/nginx.md
rename to docs/public.ecr.aws/lts/nginx.md
index d837f3c..2ba7470 100644
--- a/out-lts/nginx.md
+++ b/docs/public.ecr.aws/lts/nginx.md
@@ -1,8 +1,8 @@
 # Nginx LTS Docker Image
+ 
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Nginx
 
@@ -11,28 +11,32 @@ Nginx ("engine X") is a high-performance web and reverse proxy server created by
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/nginx`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/nginx`.
+Up to 10 years customer security maintenance `from canonical/nginx`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/nginx but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
-| **`1.18-20.04_beta`** &nbsp;&nbsp; | - | - | Nginx 1.18.0 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | **`1.18-20.04_beta`** &nbsp;&nbsp; | - | - | 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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/nginx:1.18-20.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/lts/nginx:1.18-20.04_beta
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -68,7 +72,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html) and
-[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `lts/nginx:1.18-20.04_beta`), then:
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/nginx:1.18-20.04_beta`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
@@ -86,6 +90,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/nginx:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/nginx:<tag>
 ```
 
diff --git a/out-lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md
similarity index 84%
rename from out-lts/postgres.md
rename to docs/public.ecr.aws/lts/postgres.md
index 49c284b..d39a9db 100644
--- a/out-lts/postgres.md
+++ b/docs/public.ecr.aws/lts/postgres.md
@@ -1,8 +1,8 @@
 # Postgres LTS Docker Image
+ 
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Postgres
 
@@ -11,28 +11,32 @@ PostgreSQL is a powerful, open source object-relational database system. It is f
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/postgres`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/postgres`.
+Up to 10 years customer security maintenance `from canonical/postgres`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/postgres but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
-| **`12.4-20.04_beta`** &nbsp;&nbsp; | - | - | Postgres 12.4 | `amd64`, `arm64`, `s390x` |
+ | **`12.4-20.04_beta`** &nbsp;&nbsp; | - | - | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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/ lts/postgres:12.4-20.04_beta
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/lts/postgres:12.4-20.04_beta
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -82,7 +86,7 @@ This image also includes the `psql` client for interactive container use:
 ```sh
 $ docker network create postgres-network
 $ docker network connect postgres-network postgres-container
-$ docker run -it --rm --network postgres-network lts/postgres:12.4-20.04_beta psql -h postgres-container -U postgres
+$ docker run -it --rm --network postgres-network public.ecr.aws/lts/postgres:12.4-20.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.
 
@@ -92,7 +96,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf) and
-[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `lts/postgres:12.4-20.04_beta`), then:
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/postgres:12.4-20.04_beta`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
@@ -110,6 +114,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/postgres:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/postgres:<tag>
 ```
 
diff --git a/out-lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
similarity index 79%
rename from out-lts/prometheus-alertmanager.md
rename to docs/public.ecr.aws/lts/prometheus-alertmanager.md
index 146a4b8..c204b27 100644
--- a/out-lts/prometheus-alertmanager.md
+++ b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
@@ -1,8 +1,8 @@
 # Prometheus Alertmanager LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Prometheus Alertmanager
 
@@ -11,27 +11,31 @@ The Alertmanager handles alerts sent by client applications such as the Promethe
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/prometheus-alertmanager`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/prometheus-alertmanager`.
+Up to 10 years customer security maintenance `from canonical/prometheus-alertmanager`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/prometheus-alertmanager but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/prometheus-alertmanager:0.21-20.04_beta
+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`.
 
@@ -66,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml) and
-[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `lts/prometheus-alertmanager:0.21-20.04_beta`), then:
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus-alertmanager:latest`), then:
 
 ```sh
 kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml
@@ -84,6 +88,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/prometheus-alertmanager:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/prometheus-alertmanager:<tag>
 ```
 
diff --git a/out-lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md
similarity index 80%
rename from out-lts/prometheus.md
rename to docs/public.ecr.aws/lts/prometheus.md
index 3c4066d..5b8bfc3 100644
--- a/out-lts/prometheus.md
+++ b/docs/public.ecr.aws/lts/prometheus.md
@@ -1,8 +1,8 @@
 # Prometheus LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
-
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
 ## About Prometheus
 
@@ -11,27 +11,31 @@ Prometheus is a systems and service monitoring system. It collects metrics from 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/prometheus`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/prometheus`.
+Up to 10 years customer security maintenance `from canonical/prometheus`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/prometheus but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/prometheus:2.20-20.04_beta
+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`.
 
@@ -66,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and
-[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `lts/prometheus:2.20-20.04_beta`), then:
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus:latest`), then:
 
 ```sh
 kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml
@@ -84,6 +88,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/prometheus:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/prometheus:<tag>
 ```
 
diff --git a/out-lts/redis.md b/docs/public.ecr.aws/lts/redis.md
similarity index 81%
rename from out-lts/redis.md
rename to docs/public.ecr.aws/lts/redis.md
index b4b7fda..4bc2973 100644
--- a/out-lts/redis.md
+++ b/docs/public.ecr.aws/lts/redis.md
@@ -1,37 +1,41 @@
-# Redis LTS Docker Image
+# Redis™ software LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
-
-## About Redis
+## About Redis™ software
 
 Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.  It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.  Redis has built-in replication, Lua scripting, LRU eviction, transactions and different levels of on-disk persistence, and provides high availability via Redis Sentinel and automatic partitioning with Redis Cluster.  Read more on the [Redis website](https://redis.io/topics/introduction).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/redis`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/redis`.
+Up to 10 years customer security maintenance `from canonical/redis`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/redis but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/redis:5.0-20.04_beta
+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`.
 
@@ -68,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 lts/redis:5.0-20.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network public.ecr.aws/lts/redis:latest redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -86,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) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `lts/redis:5.0-20.04_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/redis:latest`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
@@ -104,6 +108,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/redis:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/redis:<tag>
 ```
 
diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md
new file mode 100644
index 0000000..e4c9308
--- /dev/null
+++ b/docs/public.ecr.aws/lts/squid.md
@@ -0,0 +1,94 @@
+# Squid LTS Docker Image
+ 
+
+## LTS Docker Image Portfolio
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
+
+## About Squid
+
+Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator. It runs on most available operating systems, including Windows and is licensed under the GNU GPL.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance from this repository.
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/squid`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _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 |
+|---|---|---|---|---|
+ | **`4.10-20.04_beta`** &nbsp;&nbsp; | - | - | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes 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:4.10-20.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 |
+
+
+#### 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) and
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/squid:4.10-20.04_beta`), then:
+
+```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>
+```
+
diff --git a/out-lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md
similarity index 76%
rename from out-lts/telegraf.md
rename to docs/public.ecr.aws/lts/telegraf.md
index 778a1e4..69b85ea 100644
--- a/out-lts/telegraf.md
+++ b/docs/public.ecr.aws/lts/telegraf.md
@@ -1,37 +1,41 @@
-# Telegraf LTS Docker Image
+# Telegraf™ software LTS Docker Image
+ **This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**
 
 ## LTS Docker Image Portfolio
-The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical. This repository is exempted from per-user rate limits.
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
 
-
-## About Telegraf
+## About Telegraf™ software
 
 Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics. Read more on the [Telegraf website](https://www.influxdata.com/time-series-platform/telegraf/).
 
 
 ## Tags and Architectures
 ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
-Up to 5 years free security maintenance `from lts/telegraf`.
+Up to 5 years free security maintenance from this repository.
 
 ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
-Up to 10 years customer security maintenance `from store/canonical/telegraf`.
+Up to 10 years customer security maintenance `from canonical/telegraf`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
 
-_Tags in italics are not available in lts/telegraf but are shown here for completeness._
+<!-- _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 |
 |---|---|---|---|---|
 | _`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 Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
-## Usage
 
 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 lts/telegraf:1.15-20.04_beta
+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`.
 
@@ -65,7 +69,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf) and
-[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `lts/telegraf:1.15-20.04_beta`), then:
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/telegraf:latest`), then:
 
 ```sh
 kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf
@@ -83,6 +87,6 @@ If you find a bug in our image or want to request a specific feature, please fil
 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 lts/telegraf:<tag>
+docker images --no-trunc --quiet public.ecr.aws/lts/telegraf:<tag>
 ```
 
diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md
new file mode 100644
index 0000000..d433638
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/apache2.md
@@ -0,0 +1,97 @@
+# Apache2 | Ubuntu
+
+Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/apache2).
+
+## About Apache2
+
+The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet. Read more on the [apache2 website](https://httpd.apache.org/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/apache2`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`2.4-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`2.4-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/apache2:2.4-20.04_beta
+```
+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)). |
+
+
+#### 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), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html) and
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/apache2:2.4-20.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..bc6ea86
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/bind9.md
@@ -0,0 +1,96 @@
+# Bind9 | Ubuntu
+
+Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Bind9 or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/bind9).
+
+## About Bind9
+
+BIND 9 provides software for Domain Name System (DNS) management including both defining domain names authoritatively for a given DNS zone, and recursively resolving domain names to their IP addresses. In addition to BIND 9's DNS server itself, `named`, this container also includes tools for performing DNS queries and dynamic updates. Read more on the [BIND 9 website](https://www.isc.org/bind/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`9.16-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`9.16-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/ubuntu/bind9:9.16-20.04_beta
+```
+Access your Bind9 server at `localhost:30053`
+
+#### Parameters
+
+| Parameter | Description |
+|---|---|
+| `-e TZ=UTC` | Timezone. |
+| `-p 1803233` | Expose bind9 on `localhost:30053`. |
+| `-v /path/to/bind/configuration:/etc/bind/named.conf` | Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options)). |
+| `-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) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/bind9:9.16-20.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..f0eb9ad
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/cassandra.md
@@ -0,0 +1,92 @@
+# Cassandra | Ubuntu
+
+Current Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cassandra or Ubuntu release.
+
+## About Cassandra
+
+Apache Cassandra is an open source NoSQL distributed database trusted by thousands of companies for scalability and high availability without compromising performance. Linear scalability and proven fault-tolerance on commodity hardware or cloud infrastructure make it a good platform for mission-critical data.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/cassandra`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`4.0-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.0-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 public.ecr.aws/ubuntu/cassandra:4.0-21.04_beta
+```
+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) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cassandra:4.0-21.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..7896844
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/cortex.md
@@ -0,0 +1,96 @@
+# Cortex | Ubuntu
+
+Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu release.
+
+## About Cortex
+
+Cortex provides horizontally scalable, highly available, multi-tenant, long term storage for Prometheus.
+
+* Horizontally scalable: Cortex can run across multiple machines in a cluster, exceeding the throughput and storage of a single machine. This enables you to send the metrics from multiple Prometheus servers to a single Cortex cluster and run "globally aggregated" queries across all data in a single place.
+* Highly available: When run in a cluster, Cortex can replicate data between machines. This allows you to survive machine failure without gaps in your graphs.
+* Multi-tenant: Cortex can isolate data and queries from multiple different independent Prometheus sources in a single cluster, allowing untrusted parties to share the same cluster.
+* Long term storage: Cortex supports Amazon DynamoDB, Google Bigtable, Cassandra, S3, GCS and Microsoft Azure for long term storage of metric data. This allows you to durably store data for longer than the lifetime of any single machine, and use this data for long term capacity planning.
+
+Read more on the [Cortex website](https://cortexmetrics.io/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/cortex`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`1.7-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.7 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.4-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.4.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 public.ecr.aws/ubuntu/cortex:1.7-21.04_beta
+```
+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)). |
+
+
+#### 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) and
+[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cortex:1.7-21.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..87b4e80
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/grafana.md
@@ -0,0 +1,90 @@
+# Grafana™ software | Ubuntu
+
+Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana™ software or Ubuntu release.
+
+## About Grafana™ software
+
+Grafana is a feature rich metrics dashboard and graph editor for Cloudwatch, Elasticsearch, Graphite, InfluxDB, OpenTSB, Prometheus, and Hosted Metrics.  Read more on the [Grafana website](https://grafana.com/docs/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/grafana`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`7.4-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.4 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `7.2-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.2.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/ubuntu/grafana:7.4-21.04_beta
+```
+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), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and
+[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/grafana:7.4-21.04_beta`), then:
+
+```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/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md
new file mode 100644
index 0000000..f0b6dad
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/memcached.md
@@ -0,0 +1,126 @@
+# Memcached | Ubuntu
+
+Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/memcached).
+
+## About Memcached
+
+Memcached is an in-memory key-value store for small chunks of arbitrary data (strings, objects) from results of database calls, API calls, or page rendering. It is a short-term memory for applications. Memcached allows to take memory from parts of a system where you have more than you need and make it accessible to areas where you have less than you need. Read more on the [memcached website](https://memcached.org/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/memcached`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`1.6-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`1.5-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## 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` | 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) 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/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md
new file mode 100644
index 0000000..af55f37
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/mysql.md
@@ -0,0 +1,123 @@
+# MySQL™ | Ubuntu
+
+Current MySQL™ Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/mysql).
+
+## About MySQL™
+
+MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MySQL are speed, robustness and ease of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/mysql`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`8.0-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`8.0-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/ubuntu/mysql:8.0-20.04_beta
+```
+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.cnf)). |
+
+#### 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-20.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) and
+[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/mysql:8.0-20.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..16682e1
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/nginx.md
@@ -0,0 +1,98 @@
+# Nginx | Ubuntu
+
+Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/nginx).
+
+## About Nginx
+
+Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server and as a proxy to reduce the load on back-end HTTP or mail servers. Read more on the [nginx website](https://www.nginx.com/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/nginx`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`1.18-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`1.18-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/nginx:1.18-20.04_beta
+```
+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)). |
+
+
+#### 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), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html) and
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/nginx:1.18-20.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..bea237a
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/postgres.md
@@ -0,0 +1,122 @@
+# Postgres | Ubuntu
+
+Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/postgres).
+
+## About Postgres
+
+PostgreSQL is a powerful, open source object-relational database system. It is fully ACID compliant, has full support for foreign keys, joins, views, triggers, and stored procedures (in multiple languages). It includes most SQL:2008 data types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video. It has native programming interfaces for C/C++, Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation. Read more on the [PostgreSQL website](https://www.postgresql.org/docs/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/postgres`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`13.1-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`12.4-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/ubuntu/postgres:12.4-20.04_beta
+```
+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)). |
+| `-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:12.4-20.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) and
+[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/postgres:12.4-20.04_beta`), then:
+
+```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
new file mode 100644
index 0000000..676d417
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
@@ -0,0 +1,90 @@
+# Prometheus Alertmanager | Ubuntu
+
+Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu release.
+
+## About Prometheus Alertmanager
+
+The Alertmanager handles alerts sent by client applications such as the Prometheus server. It takes care of deduplicating, grouping, and routing them to the correct receiver integration such as email, PagerDuty, or OpsGenie. It also takes care of silencing and inhibition of alerts. Read more on the [Prometheus Alertmanager website](https://prometheus.io/docs/alerting/latest/alertmanager/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/prometheus-alertmanager`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`0.21-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `0.21-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21.0 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 public.ecr.aws/ubuntu/prometheus-alertmanager:0.21-21.04_beta
+```
+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/oci/examples/config/alertmanager.yml)). |
+| `-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/oci/examples/config/alertmanager.yml) and
+[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus-alertmanager:0.21-21.04_beta`), then:
+
+```sh
+kubectl create configmap prometheus-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/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md
new file mode 100644
index 0000000..1ce4776
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/prometheus.md
@@ -0,0 +1,90 @@
+# Prometheus | Ubuntu
+
+Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu release.
+
+## About Prometheus
+
+Prometheus is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true. Read more on the [Prometheus website](https://prometheus.io/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/prometheus`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`2.25-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.25 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `2.20-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.20.1 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 public.ecr.aws/ubuntu/prometheus:2.25-21.04_beta
+```
+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/oci/examples/config/prometheus.yml)). |
+| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml)). |
+
+
+#### 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/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and
+[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus:2.25-21.04_beta`), then:
+
+```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/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md
new file mode 100644
index 0000000..9f0e902
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/redis.md
@@ -0,0 +1,110 @@
+# Redis™ software | Ubuntu
+
+Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Redis™ software or Ubuntu release.
+
+## About Redis™ software
+
+Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.  It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.  Redis has built-in replication, Lua scripting, LRU eviction, transactions and different levels of on-disk persistence, and provides high availability via Redis Sentinel and automatic partitioning with Redis Cluster.  Read more on the [Redis website](https://redis.io/topics/introduction).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/redis`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`6.0-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `5.0-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 5.0.7 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.0-21.04_beta
+```
+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)). |
+
+
+#### 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.04_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) and
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.04_beta`), then:
+
+```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/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md
new file mode 100644
index 0000000..6add789
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/squid.md
@@ -0,0 +1,98 @@
+# Squid | Ubuntu
+
+Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Squid or Ubuntu release.
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/squid).
+
+## About Squid
+
+Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator. It runs on most available operating systems, including Windows and is licensed under the GNU GPL.
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance [from public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/${repo}).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/squid`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`4.10-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `4.13-21.10_edge` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/squid) | | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+_The following tags are not available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | _**`4.10-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). 
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/ubuntu/squid:4.10-20.04_beta
+```
+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 |
+
+
+#### 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) and
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/squid:4.10-20.04_beta`), then:
+
+```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/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md
new file mode 100644
index 0000000..508925d
--- /dev/null
+++ b/docs/public.ecr.aws/ubuntu/telegraf.md
@@ -0,0 +1,89 @@
+# Telegraf™ software | Ubuntu
+
+Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Telegraf™ software or Ubuntu release.
+
+## About Telegraf™ software
+
+Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics. Read more on the [Telegraf website](https://www.influxdata.com/time-series-platform/telegraf/).
+
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/telegraf`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+ | **`1.17-21.04_beta`** &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.17 on Ubuntu&nbsp;21.04&nbsp;| `amd64`, `arm64`, `ppc64el`, `s390x` |
+ | `1.15-20.04_beta` &nbsp;&nbsp; | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.15.2 on Ubuntu&nbsp;20.04&nbsp;LTS| `amd64`, `arm64`, `ppc64el`, `s390x` |
+| _`track_risk`_ |
+
+
+Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
+
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). **This repository has no LTS channel yet, please get in touch if you need one.**
+
+## Docker CLI
+
+Launch this image locally:
+
+```sh
+docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.17-21.04_beta
+```
+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)). |
+
+
+#### 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) and
+[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.17-21.04_beta`), then:
+
+```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/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md
index e66ca40..107b42e 100644
--- a/templates/README_DOCKERHUB.md
+++ b/templates/README_DOCKERHUB.md
@@ -1,21 +1,37 @@
 # ${application} | Ubuntu
 
-Current ${application} Docker Image from Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu LTS. This repository is exempted from per-user rate limits. For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/${repo}`. 
+Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
+<!-- For [LTS Docker Image](https://ubuntu.com/security/docker-images) versions of this image, see `lts/${repo}`.  -->
 <%
     baserepo='ubuntu'
-    distroversion=base.strip('Ubuntu').strip('LTS').lstrip().rstrip()
-    swver='.'.join(version.split(".")[:2])
-    pretag=swver+'-'+distroversion+'_'
-    tag=pretag+'beta'
+    tag='latest'
 %>
-<%include file="header.md" args="tag=tag, pretag=pretag, baserepo=baserepo, **locals()['pageargs']"/>
+<%include file="header.md" args="baserepo=baserepo, **locals()['pageargs']"/>
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`${tag}`** &nbsp;&nbsp; | | | ${application} ${version} on ${base} | ${", ".join(map(lambda x: "`"+x+"`", architectures))} |
+% for i, release in enumerate(releases):
+<% 
+    first=i==0
+    track=str(release['track'])
+    risk=str(release['risk'])
+    base=str(release['base'])
+    LTS_BASES=['18.04', '20.04', '22.04']
+    ESM_BASES=['16.04']
+    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
+    type=str(release['type']) if 'type' in release else ''
+    version=str(release['version']) if 'version' in release else track
+    architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
+    swver='.'.join(track.split(".")[:2])
+    thistag=swver+'-'+base+'_'+''+risk
+    tag=thistag if first else tag
+%> | ${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp; | ${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else ''} | | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype}| ${architectures} |
+% endfor
 | _`track_risk`_ |
 
 <%include file="channels_message.md" />
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]).
 
 ## Usage
-<%include file="common_usage.md" args="tag=tag, pretag=pretag, baserepo=baserepo, **locals()['pageargs']"/>
+<%include file="common_usage.md" args="tag=tag, baserepo=baserepo, **locals()['pageargs']"/>
diff --git a/templates/README_ECR.md b/templates/README_ECR.md
new file mode 100644
index 0000000..47ae031
--- /dev/null
+++ b/templates/README_ECR.md
@@ -0,0 +1,54 @@
+# ${application} | Ubuntu
+<%
+    baserepo='public.ecr.aws/ubuntu'
+    tag='latest'
+    lts_releases=list(filter(lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False, releases))
+    current_releases=[releases.pop(0)]+[release for release in releases if release not in lts_releases]
+    has_an_lts=len(lts_releases)>0
+%>
+Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release.
+% if has_an_lts:
+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/${repo}](https://gallery.ecr.aws/lts/${repo}).
+% endif
+
+## About ${application}
+
+${description}
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](https://gallery.ecr.aws/lts/${repo})' if has_an_lts else '. [Request access](https://ubuntu.com/security/docker-images#get-in-touch)'}.
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+% for k, list_releases in enumerate([current_releases, lts_releases] if has_an_lts else [current_releases]):
+
+| Channel Tag | | | Currently | Architectures |
+|---|---|---|---|---|
+% for i, release in enumerate(list_releases):
+<% 
+    first=i==0
+    track=str(release['track'])
+    risk=str(release['risk'])
+    base=str(release['base'])
+    LTS_BASES=['18.04', '20.04', '22.04']
+    ESM_BASES=['16.04']
+    basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
+    type=str(release['type']) if 'type' in release else ''
+    version=str(release['version']) if 'version' in release else track
+    architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
+    swver='.'.join(track.split(".")[:2])
+    thistag=swver+'-'+base+'_'+''+risk
+    tag=thistag if first else tag
+%> | ${'_' if type == 'LTS' else ''}${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp;${'_' if type == 'LTS' else ''} | [${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else ''}](https://gallery.ecr.aws/lts/${repo}) | | ${application} ${version} on Ubuntu&nbsp;${base}&nbsp;${basetype}| ${architectures} |
+% endfor
+| _`track_risk`_ |
+
+${'_The following tags are not available in '+baserepo+'/'+repo+' but are shown here for completeness:_' if k==0 and has_an_lts else ''}
+% endfor
+<%include file="channels_message.md" />
+### Commercial use and Extended Security Maintenance channels
+If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using [e-mail]). ${'' if has_an_lts else '**This repository has no LTS channel yet, please get in touch if you need one.**'}
+
+## Docker CLI
+<%include file="common_usage.md" args="tag=tag, baserepo=baserepo, **locals()['pageargs']"/>
diff --git a/templates/README_ECR_LTS.md b/templates/README_ECR_LTS.md
new file mode 100644
index 0000000..c060f1a
--- /dev/null
+++ b/templates/README_ECR_LTS.md
@@ -0,0 +1,55 @@
+# ${application} LTS Docker Image
+<%
+    baserepo='public.ecr.aws/lts'
+    tag='latest'
+    lts_releases=list(filter(lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False, releases))
+    has_an_lts=len(lts_releases)>0
+%> ${'' if has_an_lts else '**This repository has no LTS channel yet, please [get in touch](https://ubuntu.com/security/docker-images#get-in-touch) if you need one.**'}
+
+## LTS Docker Image Portfolio
+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
+
+## About ${application}
+
+${description}
+
+## Tags and Architectures
+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
+Up to 5 years free security maintenance from this repository.
+
+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
+Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
+
+<!-- _Tags in italics are not available in ${baserepo}/${repo} 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 |
+|---|---|---|---|---|
+% for i, release in enumerate(lts_releases):
+<% 
+    first=i==0
+    track=str(release['track'])
+    risk=str(release['risk'])
+    base=str(release['base'])
+    LTS_BASES=['18.04', '20.04', '22.04']
+    ESM_BASES=['16.04']