diff --git a/cassandra/README.md b/cassandra/README.md
index 5e85c227a..8e1f4dfb8 100644
--- a/cassandra/README.md
+++ b/cassandra/README.md
@@ -24,11 +24,11 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.0-beta4`, `4.0`](https://github.com/docker-library/cassandra/blob/51b30b5d78616d8db73153dede5df440d0ea7fc4/4.0/Dockerfile)
--	[`3.11.10`, `3.11`, `3`, `latest`](https://github.com/docker-library/cassandra/blob/51b30b5d78616d8db73153dede5df440d0ea7fc4/3.11/Dockerfile)
--	[`3.0.24`, `3.0`](https://github.com/docker-library/cassandra/blob/51b30b5d78616d8db73153dede5df440d0ea7fc4/3.0/Dockerfile)
--	[`2.2.19`, `2.2`, `2`](https://github.com/docker-library/cassandra/blob/51b30b5d78616d8db73153dede5df440d0ea7fc4/2.2/Dockerfile)
--	[`2.1.22`, `2.1`](https://github.com/docker-library/cassandra/blob/51b30b5d78616d8db73153dede5df440d0ea7fc4/2.1/Dockerfile)
+-	[`4.0-beta4`, `4.0`](https://github.com/docker-library/cassandra/blob/03bef93db2ff4b5a3cbc954618f08c44ddcb7568/4.0/Dockerfile)
+-	[`3.11.10`, `3.11`, `3`, `latest`](https://github.com/docker-library/cassandra/blob/03bef93db2ff4b5a3cbc954618f08c44ddcb7568/3.11/Dockerfile)
+-	[`3.0.24`, `3.0`](https://github.com/docker-library/cassandra/blob/03bef93db2ff4b5a3cbc954618f08c44ddcb7568/3.0/Dockerfile)
+-	[`2.2.19`, `2.2`, `2`](https://github.com/docker-library/cassandra/blob/03bef93db2ff4b5a3cbc954618f08c44ddcb7568/2.2/Dockerfile)
+-	[`2.1.22`, `2.1`](https://github.com/docker-library/cassandra/blob/03bef93db2ff4b5a3cbc954618f08c44ddcb7568/2.1/Dockerfile)
 
 # Quick reference (cont.)
 
diff --git a/open-liberty/README.md b/open-liberty/README.md
index f9e8ea0f3..1b42e42ae 100644
--- a/open-liberty/README.md
+++ b/open-liberty/README.md
@@ -24,20 +24,24 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`beta`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8)
--	[`beta-java11`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11)
--	[`kernel-slim`, `kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
--	[`kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
--	[`full`, `full-java8-openj9`, `latest`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8)
--	[`full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11)
--	[`21.0.0.3-kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/21.0.0.3/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
--	[`21.0.0.3-kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/21.0.0.3/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
--	[`21.0.0.3-full-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/21.0.0.3/full/Dockerfile.ubuntu.adoptopenjdk8)
--	[`21.0.0.3-full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/21.0.0.3/full/Dockerfile.ubuntu.adoptopenjdk11)
--	[`20.0.0.12-kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/20.0.0.12/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
--	[`20.0.0.12-kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/20.0.0.12/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
--	[`20.0.0.12-full-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/20.0.0.12/full/Dockerfile.ubuntu.adoptopenjdk8)
--	[`20.0.0.12-full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/b1dbcedaacc014f39de1123c5432e33836c5430a/releases/20.0.0.12/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`beta`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`beta-java11`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/latest/beta/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`kernel-slim`, `kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/latest/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`full`, `full-java8-openj9`, `latest`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/latest/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.4-kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.4/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`21.0.0.4-kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.4/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.4-full-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.4/full/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`21.0.0.4-full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.4/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.3-kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.3/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`21.0.0.3-kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.3/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.3-full-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.3/full/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`21.0.0.3-full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/21.0.0.3/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`20.0.0.12-kernel-slim-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/20.0.0.12/kernel-slim/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`20.0.0.12-kernel-slim-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/20.0.0.12/kernel-slim/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`20.0.0.12-full-java8-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/20.0.0.12/full/Dockerfile.ubuntu.adoptopenjdk8)
+-	[`20.0.0.12-full-java11-openj9`](https://github.com/OpenLiberty/ci.docker/blob/a84c9e6b2adefcf1f8d830f533222b087874aefb/releases/20.0.0.12/full/Dockerfile.ubuntu.adoptopenjdk11)
 
 # Quick reference (cont.)
 
diff --git a/websphere-liberty/README.md b/websphere-liberty/README.md
index f328d5ab5..414066e54 100644
--- a/websphere-liberty/README.md
+++ b/websphere-liberty/README.md
@@ -24,17 +24,22 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`kernel`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8)
--	[`kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/latest/kernel/Dockerfile.ubuntu.adoptopenjdk11)
--	[`full`, `latest`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/latest/full/Dockerfile.ubuntu.ibmjava8)
--	[`full-java11-openj9`, `21.0.0.3-full-java11-openj9`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/latest/full/Dockerfile.ubuntu.adoptopenjdk11)
--	[`21.0.0.3-kernel-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/21.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8)
--	[`21.0.0.3-kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/21.0.0.3/kernel/Dockerfile.ubuntu.adoptopenjdk11)
--	[`21.0.0.3-full-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/21.0.0.3/full/Dockerfile.ubuntu.ibmjava8)
--	[`20.0.0.12-kernel-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/20.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8)
--	[`20.0.0.12-kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/20.0.0.12/kernel/Dockerfile.ubuntu.adoptopenjdk11)
--	[`20.0.0.12-full-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/20.0.0.12/full/Dockerfile.ubuntu.ibmjava8)
--	[`20.0.0.12-full-java11-openj9`](https://github.com/WASdev/ci.docker/blob/63fced9324fd5f4f488fdaeb54c05fb9fd2e1428/ga/20.0.0.12/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`kernel`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8)
+-	[`kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/latest/kernel/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`full`, `latest`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/latest/full/Dockerfile.ubuntu.ibmjava8)
+-	[`full-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/latest/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.4-kernel-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.4/kernel/Dockerfile.ubuntu.ibmjava8)
+-	[`21.0.0.4-kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.4/kernel/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.4-full-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.4/full/Dockerfile.ubuntu.ibmjava8)
+-	[`21.0.0.4-full-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.4/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.3-kernel-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8)
+-	[`21.0.0.3-kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.3/kernel/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`21.0.0.3-full-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.3/full/Dockerfile.ubuntu.ibmjava8)
+-	[`21.0.0.3-full-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/21.0.0.3/full/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`20.0.0.12-kernel-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/20.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8)
+-	[`20.0.0.12-kernel-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/20.0.0.12/kernel/Dockerfile.ubuntu.adoptopenjdk11)
+-	[`20.0.0.12-full-java8-ibmjava`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/20.0.0.12/full/Dockerfile.ubuntu.ibmjava8)
+-	[`20.0.0.12-full-java11-openj9`](https://github.com/WASdev/ci.docker/blob/498fd2562d74c98227db511bd7920c2406b4d921/ga/20.0.0.12/full/Dockerfile.ubuntu.adoptopenjdk11)
 
 # Quick reference (cont.)