Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AdoptOpenJDK: Oct 2020 release of 8u272-b10, 11.0.9+11 and 15.0.1+9. #8953

Merged
merged 3 commits into from
Oct 28, 2020
Merged

AdoptOpenJDK: Oct 2020 release of 8u272-b10, 11.0.9+11 and 15.0.1+9. #8953

merged 3 commits into from
Oct 28, 2020

Conversation

dinogun
Copy link
Contributor

@dinogun dinogun commented Oct 25, 2020

Remove Java 13 images as they are no longer supported.

@dinogun dinogun changed the title Oct 2020 release of 8u272-b10, 11.0.9+11 and 15.0.1+9. WIP: AdoptOpenJDK: Oct 2020 release of 8u272-b10, 11.0.9+11 and 15.0.1+9. Oct 25, 2020
@tianon
Copy link
Member

tianon commented Oct 26, 2020

Diff: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3d0fa90..4c1712d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,293 +1,201 @@
 Maintainers: Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 GitRepo: https://github.com/AdoptOpenJDK/openjdk-docker.git
 
-Tags: 8u265-b01-jdk-hotspot-bionic, 8-jdk-hotspot-bionic, 8-hotspot-bionic
-SharedTags: 8u265-b01-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 8u272-b10-jdk-hotspot-focal, 8-jdk-hotspot-focal, 8-hotspot-focal
+SharedTags: 8u272-b10-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 8u265-b01-jdk-hotspot-windowsservercore-1809, 8-jdk-hotspot-windowsservercore-1809, 8-hotspot-windowsservercore-1809
-SharedTags: 8u265-b01-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u265-b01-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
+Tags: 8u272-b10-jdk-hotspot-windowsservercore-1809, 8-jdk-hotspot-windowsservercore-1809, 8-hotspot-windowsservercore-1809
+SharedTags: 8u272-b10-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u272-b10-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jdk-hotspot-windowsservercore-ltsc2016, 8-jdk-hotspot-windowsservercore-ltsc2016, 8-hotspot-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u265-b01-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
+Tags: 8u272-b10-jdk-hotspot-windowsservercore-ltsc2016, 8-jdk-hotspot-windowsservercore-ltsc2016, 8-hotspot-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u272-b10-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 8u265-b01-jdk-openj9-0.21.0-bionic, 8-jdk-openj9-bionic, 8-openj9-bionic
-SharedTags: 8u265-b01-jdk-openj9-0.21.0, 8-jdk-openj9, 8-openj9
+Tags: 8u272-b10-jdk-openj9-0.23.0-focal, 8-jdk-openj9-focal, 8-openj9-focal
+SharedTags: 8u272-b10-jdk-openj9-0.23.0, 8-jdk-openj9, 8-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore-1809, 8-jdk-openj9-windowsservercore-1809, 8-openj9-windowsservercore-1809
-SharedTags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u265-b01-jdk-openj9-0.21.0, 8-jdk-openj9, 8-openj9
+Tags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore-1809, 8-jdk-openj9-windowsservercore-1809, 8-openj9-windowsservercore-1809
+SharedTags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u272-b10-jdk-openj9-0.23.0, 8-jdk-openj9, 8-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 8-jdk-openj9-windowsservercore-ltsc2016, 8-openj9-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u265-b01-jdk-openj9-0.21.0, 8-jdk-openj9, 8-openj9
+Tags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore-ltsc2016, 8-jdk-openj9-windowsservercore-ltsc2016, 8-openj9-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u272-b10-jdk-openj9-0.23.0, 8-jdk-openj9, 8-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 8u265-b01-jre-hotspot-bionic, 8-jre-hotspot-bionic
-SharedTags: 8u265-b01-jre-hotspot, 8-jre-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 8u272-b10-jre-hotspot-focal, 8-jre-hotspot-focal
+SharedTags: 8u272-b10-jre-hotspot, 8-jre-hotspot
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 8u265-b01-jre-hotspot-windowsservercore-1809, 8-jre-hotspot-windowsservercore-1809
-SharedTags: 8u265-b01-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u265-b01-jre-hotspot, 8-jre-hotspot
+Tags: 8u272-b10-jre-hotspot-windowsservercore-1809, 8-jre-hotspot-windowsservercore-1809
+SharedTags: 8u272-b10-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u272-b10-jre-hotspot, 8-jre-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jre-hotspot-windowsservercore-ltsc2016, 8-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u265-b01-jre-hotspot, 8-jre-hotspot
+Tags: 8u272-b10-jre-hotspot-windowsservercore-ltsc2016, 8-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u272-b10-jre-hotspot, 8-jre-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 8u265-b01-jre-openj9-0.21.0-bionic, 8-jre-openj9-bionic
-SharedTags: 8u265-b01-jre-openj9-0.21.0, 8-jre-openj9
+Tags: 8u272-b10-jre-openj9-0.23.0-focal, 8-jre-openj9-focal
+SharedTags: 8u272-b10-jre-openj9-0.23.0, 8-jre-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 8u265-b01-jre-openj9-0.21.0-windowsservercore-1809, 8-jre-openj9-windowsservercore-1809
-SharedTags: 8u265-b01-jre-openj9-0.21.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u265-b01-jre-openj9-0.21.0, 8-jre-openj9
+Tags: 8u272-b10-jre-openj9-0.23.0-windowsservercore-1809, 8-jre-openj9-windowsservercore-1809
+SharedTags: 8u272-b10-jre-openj9-0.23.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u272-b10-jre-openj9-0.23.0, 8-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jre-openj9-0.21.0-windowsservercore-ltsc2016, 8-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jre-openj9-0.21.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u265-b01-jre-openj9-0.21.0, 8-jre-openj9
+Tags: 8u272-b10-jre-openj9-0.23.0-windowsservercore-ltsc2016, 8-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jre-openj9-0.23.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u272-b10-jre-openj9-0.23.0, 8-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 8/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jdk-hotspot-bionic, 11-jdk-hotspot-bionic, 11-hotspot-bionic
-SharedTags: 11.0.8_10-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
+Tags: 11.0.9_11-jdk-hotspot-focal, 11-jdk-hotspot-focal, 11-hotspot-focal
+SharedTags: 11.0.9_11-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 11.0.8_10-jdk-hotspot-windowsservercore-1809, 11-jdk-hotspot-windowsservercore-1809, 11-hotspot-windowsservercore-1809
-SharedTags: 11.0.8_10-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.8_10-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
+Tags: 11.0.9_11-jdk-hotspot-windowsservercore-1809, 11-jdk-hotspot-windowsservercore-1809, 11-hotspot-windowsservercore-1809
+SharedTags: 11.0.9_11-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.9_11-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jdk-hotspot-windowsservercore-ltsc2016, 11-jdk-hotspot-windowsservercore-ltsc2016, 11-hotspot-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.8_10-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
+Tags: 11.0.9_11-jdk-hotspot-windowsservercore-ltsc2016, 11-jdk-hotspot-windowsservercore-ltsc2016, 11-hotspot-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.9_11-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jdk-openj9-0.21.0-bionic, 11-jdk-openj9-bionic, 11-openj9-bionic
-SharedTags: 11.0.8_10-jdk-openj9-0.21.0, 11-jdk-openj9, 11-openj9
+Tags: 11.0.9_11-jdk-openj9-0.23.0-focal, 11-jdk-openj9-focal, 11-openj9-focal
+SharedTags: 11.0.9_11-jdk-openj9-0.23.0, 11-jdk-openj9, 11-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore-1809, 11-jdk-openj9-windowsservercore-1809, 11-openj9-windowsservercore-1809
-SharedTags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.8_10-jdk-openj9-0.21.0, 11-jdk-openj9, 11-openj9
+Tags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore-1809, 11-jdk-openj9-windowsservercore-1809, 11-openj9-windowsservercore-1809
+SharedTags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.9_11-jdk-openj9-0.23.0, 11-jdk-openj9, 11-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 11-jdk-openj9-windowsservercore-ltsc2016, 11-openj9-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.8_10-jdk-openj9-0.21.0, 11-jdk-openj9, 11-openj9
+Tags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore-ltsc2016, 11-jdk-openj9-windowsservercore-ltsc2016, 11-openj9-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.9_11-jdk-openj9-0.23.0, 11-jdk-openj9, 11-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jre-hotspot-bionic, 11-jre-hotspot-bionic
-SharedTags: 11.0.8_10-jre-hotspot, 11-jre-hotspot
+Tags: 11.0.9_11-jre-hotspot-focal, 11-jre-hotspot-focal
+SharedTags: 11.0.9_11-jre-hotspot, 11-jre-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 11.0.8_10-jre-hotspot-windowsservercore-1809, 11-jre-hotspot-windowsservercore-1809
-SharedTags: 11.0.8_10-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.8_10-jre-hotspot, 11-jre-hotspot
+Tags: 11.0.9_11-jre-hotspot-windowsservercore-1809, 11-jre-hotspot-windowsservercore-1809
+SharedTags: 11.0.9_11-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.9_11-jre-hotspot, 11-jre-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jre-hotspot-windowsservercore-ltsc2016, 11-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.8_10-jre-hotspot, 11-jre-hotspot
+Tags: 11.0.9_11-jre-hotspot-windowsservercore-ltsc2016, 11-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.9_11-jre-hotspot, 11-jre-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jre-openj9-0.21.0-bionic, 11-jre-openj9-bionic
-SharedTags: 11.0.8_10-jre-openj9-0.21.0, 11-jre-openj9
+Tags: 11.0.9_11-jre-openj9-0.23.0-focal, 11-jre-openj9-focal
+SharedTags: 11.0.9_11-jre-openj9-0.23.0, 11-jre-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore-1809, 11-jre-openj9-windowsservercore-1809
-SharedTags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.8_10-jre-openj9-0.21.0, 11-jre-openj9
+Tags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore-1809, 11-jre-openj9-windowsservercore-1809
+SharedTags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.9_11-jre-openj9-0.23.0, 11-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore-ltsc2016, 11-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.8_10-jre-openj9-0.21.0, 11-jre-openj9
+Tags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore-ltsc2016, 11-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.9_11-jre-openj9-0.23.0, 11-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 11/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 13.0.2_8-jdk-hotspot-bionic, 13-jdk-hotspot-bionic, 13-hotspot-bionic
-SharedTags: 13.0.2_8-jdk-hotspot, 13-jdk-hotspot, 13-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/ubuntu
-File: Dockerfile.hotspot.releases.full
-
-Tags: 13.0.2_8-jdk-hotspot-windowsservercore-1809, 13-jdk-hotspot-windowsservercore-1809, 13-hotspot-windowsservercore-1809
-SharedTags: 13.0.2_8-jdk-hotspot-windowsservercore, 13-jdk-hotspot-windowsservercore, 13-hotspot-windowsservercore, 13.0.2_8-jdk-hotspot, 13-jdk-hotspot, 13-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-1809
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jdk-hotspot-windowsservercore-ltsc2016, 13-jdk-hotspot-windowsservercore-ltsc2016, 13-hotspot-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jdk-hotspot-windowsservercore, 13-jdk-hotspot-windowsservercore, 13-hotspot-windowsservercore, 13.0.2_8-jdk-hotspot, 13-jdk-hotspot, 13-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-ltsc2016
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 13.0.2_8-jdk-openj9-0.18.0-bionic, 13-jdk-openj9-bionic, 13-openj9-bionic
-SharedTags: 13.0.2_8-jdk-openj9-0.18.0, 13-jdk-openj9, 13-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/ubuntu
-File: Dockerfile.openj9.releases.full
-
-Tags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore-1809, 13-jdk-openj9-windowsservercore-1809, 13-openj9-windowsservercore-1809
-SharedTags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore, 13-jdk-openj9-windowsservercore, 13-openj9-windowsservercore, 13.0.2_8-jdk-openj9-0.18.0, 13-jdk-openj9, 13-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-1809
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore-ltsc2016, 13-jdk-openj9-windowsservercore-ltsc2016, 13-openj9-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore, 13-jdk-openj9-windowsservercore, 13-openj9-windowsservercore, 13.0.2_8-jdk-openj9-0.18.0, 13-jdk-openj9, 13-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-ltsc2016
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 13.0.2_8-jre-hotspot-bionic, 13-jre-hotspot-bionic
-SharedTags: 13.0.2_8-jre-hotspot, 13-jre-hotspot
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/ubuntu
-File: Dockerfile.hotspot.releases.full
-
-Tags: 13.0.2_8-jre-hotspot-windowsservercore-1809, 13-jre-hotspot-windowsservercore-1809
-SharedTags: 13.0.2_8-jre-hotspot-windowsservercore, 13-jre-hotspot-windowsservercore, 13.0.2_8-jre-hotspot, 13-jre-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-1809
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jre-hotspot-windowsservercore-ltsc2016, 13-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jre-hotspot-windowsservercore, 13-jre-hotspot-windowsservercore, 13.0.2_8-jre-hotspot, 13-jre-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-ltsc2016
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 13.0.2_8-jre-openj9-0.18.0-bionic, 13-jre-openj9-bionic
-SharedTags: 13.0.2_8-jre-openj9-0.18.0, 13-jre-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/ubuntu
-File: Dockerfile.openj9.releases.full
-
-Tags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore-1809, 13-jre-openj9-windowsservercore-1809
-SharedTags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore, 13-jre-openj9-windowsservercore, 13.0.2_8-jre-openj9-0.18.0, 13-jre-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-1809
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore-ltsc2016, 13-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore, 13-jre-openj9-windowsservercore, 13.0.2_8-jre-openj9-0.18.0, 13-jre-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-ltsc2016
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 14.0.2_12-jdk-hotspot-bionic, 14-jdk-hotspot-bionic, 14-hotspot-bionic
+Tags: 14.0.2_12-jdk-hotspot-focal, 14-jdk-hotspot-focal, 14-hotspot-focal
 SharedTags: 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 14.0.2_12-jdk-hotspot-windowsservercore-1809, 14-jdk-hotspot-windowsservercore-1809, 14-hotspot-windowsservercore-1809
 SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
@@ -295,22 +203,22 @@ Constraints: windowsservercore-1809
 Tags: 14.0.2_12-jdk-hotspot-windowsservercore-ltsc2016, 14-jdk-hotspot-windowsservercore-ltsc2016, 14-hotspot-windowsservercore-ltsc2016
 SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jdk-openj9-0.21.0-bionic, 14-jdk-openj9-bionic, 14-openj9-bionic
+Tags: 14.0.2_12-jdk-openj9-0.21.0-focal, 14-jdk-openj9-focal, 14-openj9-focal
 SharedTags: 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore-1809, 14-jdk-openj9-windowsservercore-1809, 14-openj9-windowsservercore-1809
 SharedTags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore, 14-jdk-openj9-windowsservercore, 14-openj9-windowsservercore, 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -318,22 +226,22 @@ Constraints: windowsservercore-1809
 Tags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 14-jdk-openj9-windowsservercore-ltsc2016, 14-openj9-windowsservercore-ltsc2016
 SharedTags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore, 14-jdk-openj9-windowsservercore, 14-openj9-windowsservercore, 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jre-hotspot-bionic, 14-jre-hotspot-bionic
+Tags: 14.0.2_12-jre-hotspot-focal, 14-jre-hotspot-focal
 SharedTags: 14.0.2_12-jre-hotspot, 14-jre-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 14.0.2_12-jre-hotspot-windowsservercore-1809, 14-jre-hotspot-windowsservercore-1809
 SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
@@ -341,22 +249,22 @@ Constraints: windowsservercore-1809
 Tags: 14.0.2_12-jre-hotspot-windowsservercore-ltsc2016, 14-jre-hotspot-windowsservercore-ltsc2016
 SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jre-openj9-0.21.0-bionic, 14-jre-openj9-bionic
+Tags: 14.0.2_12-jre-openj9-0.21.0-focal, 14-jre-openj9-focal
 SharedTags: 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore-1809, 14-jre-openj9-windowsservercore-1809
 SharedTags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore, 14-jre-openj9-windowsservercore, 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -364,99 +272,99 @@ Constraints: windowsservercore-1809
 Tags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore-ltsc2016, 14-jre-openj9-windowsservercore-ltsc2016
 SharedTags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore, 14-jre-openj9-windowsservercore, 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 14/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jdk-hotspot-bionic, 15-jdk-hotspot-bionic, 15-hotspot-bionic, hotspot-bionic
-SharedTags: 15_36-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
+Tags: 15.0.1_9-jdk-hotspot-focal, 15-jdk-hotspot-focal, 15-hotspot-focal, hotspot-focal
+SharedTags: 15.0.1_9-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 15_36-jdk-hotspot-windowsservercore-1809, 15-jdk-hotspot-windowsservercore-1809, 15-hotspot-windowsservercore-1809, hotspot-windowsservercore-1809
-SharedTags: 15_36-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15_36-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
+Tags: 15.0.1_9-jdk-hotspot-windowsservercore-1809, 15-jdk-hotspot-windowsservercore-1809, 15-hotspot-windowsservercore-1809, hotspot-windowsservercore-1809
+SharedTags: 15.0.1_9-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15.0.1_9-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jdk-hotspot-windowsservercore-ltsc2016, 15-jdk-hotspot-windowsservercore-ltsc2016, 15-hotspot-windowsservercore-ltsc2016, hotspot-windowsservercore-ltsc2016
-SharedTags: 15_36-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15_36-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
+Tags: 15.0.1_9-jdk-hotspot-windowsservercore-ltsc2016, 15-jdk-hotspot-windowsservercore-ltsc2016, 15-hotspot-windowsservercore-ltsc2016, hotspot-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15.0.1_9-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jdk-openj9-0.22.0-bionic, 15-jdk-openj9-bionic, 15-openj9-bionic, openj9-bionic
-SharedTags: 15_36-jdk-openj9-0.22.0, 15-jdk-openj9, 15-openj9, openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 15.0.1_9-jdk-openj9-0.23.0-focal, 15-jdk-openj9-focal, 15-openj9-focal, openj9-focal
+SharedTags: 15.0.1_9-jdk-openj9-0.23.0, 15-jdk-openj9, 15-openj9, openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 15_36-jdk-openj9-0.22.0-windowsservercore-1809, 15-jdk-openj9-windowsservercore-1809, 15-openj9-windowsservercore-1809, openj9-windowsservercore-1809
-SharedTags: 15_36-jdk-openj9-0.22.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15_36-jdk-openj9-0.22.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore-1809, 15-jdk-openj9-windowsservercore-1809, 15-openj9-windowsservercore-1809, openj9-windowsservercore-1809
+SharedTags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15.0.1_9-jdk-openj9-0.23.0, 15-jdk-openj9, 15-openj9, openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jdk-openj9-0.22.0-windowsservercore-ltsc2016, 15-jdk-openj9-windowsservercore-ltsc2016, 15-openj9-windowsservercore-ltsc2016, openj9-windowsservercore-ltsc2016
-SharedTags: 15_36-jdk-openj9-0.22.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15_36-jdk-openj9-0.22.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore-ltsc2016, 15-jdk-openj9-windowsservercore-ltsc2016, 15-openj9-windowsservercore-ltsc2016, openj9-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15.0.1_9-jdk-openj9-0.23.0, 15-jdk-openj9, 15-openj9, openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jre-hotspot-bionic, 15-jre-hotspot-bionic
-SharedTags: 15_36-jre-hotspot, 15-jre-hotspot, latest
+Tags: 15.0.1_9-jre-hotspot-focal, 15-jre-hotspot-focal
+SharedTags: 15.0.1_9-jre-hotspot, 15-jre-hotspot, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 15_36-jre-hotspot-windowsservercore-1809, 15-jre-hotspot-windowsservercore-1809
-SharedTags: 15_36-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15_36-jre-hotspot, 15-jre-hotspot, latest
+Tags: 15.0.1_9-jre-hotspot-windowsservercore-1809, 15-jre-hotspot-windowsservercore-1809
+SharedTags: 15.0.1_9-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.1_9-jre-hotspot, 15-jre-hotspot, latest
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jre-hotspot-windowsservercore-ltsc2016, 15-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 15_36-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15_36-jre-hotspot, 15-jre-hotspot, latest
+Tags: 15.0.1_9-jre-hotspot-windowsservercore-ltsc2016, 15-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.1_9-jre-hotspot, 15-jre-hotspot, latest
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jre-openj9-0.22.0-bionic, 15-jre-openj9-bionic
-SharedTags: 15_36-jre-openj9-0.22.0, 15-jre-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 15.0.1_9-jre-openj9-0.23.0-focal, 15-jre-openj9-focal
+SharedTags: 15.0.1_9-jre-openj9-0.23.0, 15-jre-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 15_36-jre-openj9-0.22.0-windowsservercore-1809, 15-jre-openj9-windowsservercore-1809
-SharedTags: 15_36-jre-openj9-0.22.0-windowsservercore, 15-jre-openj9-windowsservercore, 15_36-jre-openj9-0.22.0, 15-jre-openj9
+Tags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore-1809, 15-jre-openj9-windowsservercore-1809
+SharedTags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.1_9-jre-openj9-0.23.0, 15-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jre-openj9-0.22.0-windowsservercore-ltsc2016, 15-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 15_36-jre-openj9-0.22.0-windowsservercore, 15-jre-openj9-windowsservercore, 15_36-jre-openj9-0.22.0, 15-jre-openj9
+Tags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore-ltsc2016, 15-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.1_9-jre-openj9-0.23.0, 15-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 51c60f2382db67fc0b4e21c1f3f21b2217a911e8
 Directory: 15/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 20af45a..36c5e70 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,261 +1,211 @@
-adoptopenjdk:8u265-b01-jdk-hotspot
-adoptopenjdk:8u265-b01-jdk-hotspot-bionic
-adoptopenjdk:8u265-b01-jdk-hotspot-windowsservercore
-adoptopenjdk:8u265-b01-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:8u265-b01-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-bionic
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-windowsservercore
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:8u265-b01-jre-hotspot
-adoptopenjdk:8u265-b01-jre-hotspot-bionic
-adoptopenjdk:8u265-b01-jre-hotspot-windowsservercore
-adoptopenjdk:8u265-b01-jre-hotspot-windowsservercore-1809
-adoptopenjdk:8u265-b01-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-bionic
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-windowsservercore
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jdk-hotspot
+adoptopenjdk:8u272-b10-jdk-hotspot-focal
+adoptopenjdk:8u272-b10-jdk-hotspot-windowsservercore
+adoptopenjdk:8u272-b10-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:8u272-b10-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-focal
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-windowsservercore
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jre-hotspot
+adoptopenjdk:8u272-b10-jre-hotspot-focal
+adoptopenjdk:8u272-b10-jre-hotspot-windowsservercore
+adoptopenjdk:8u272-b10-jre-hotspot-windowsservercore-1809
+adoptopenjdk:8u272-b10-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-focal
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-windowsservercore
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-windowsservercore-ltsc2016
 adoptopenjdk:8-hotspot
-adoptopenjdk:8-hotspot-bionic
+adoptopenjdk:8-hotspot-focal
 adoptopenjdk:8-hotspot-windowsservercore
 adoptopenjdk:8-hotspot-windowsservercore-1809
 adoptopenjdk:8-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:8-jdk-hotspot
-adoptopenjdk:8-jdk-hotspot-bionic
+adoptopenjdk:8-jdk-hotspot-focal
 adoptopenjdk:8-jdk-hotspot-windowsservercore
 adoptopenjdk:8-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:8-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:8-jdk-openj9
-adoptopenjdk:8-jdk-openj9-bionic
+adoptopenjdk:8-jdk-openj9-focal
 adoptopenjdk:8-jdk-openj9-windowsservercore
 adoptopenjdk:8-jdk-openj9-windowsservercore-1809
 adoptopenjdk:8-jdk-openj9-windowsservercore-ltsc2016
 adoptopenjdk:8-jre-hotspot
-adoptopenjdk:8-jre-hotspot-bionic
+adoptopenjdk:8-jre-hotspot-focal
 adoptopenjdk:8-jre-hotspot-windowsservercore
 adoptopenjdk:8-jre-hotspot-windowsservercore-1809
 adoptopenjdk:8-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:8-jre-openj9
-adoptopenjdk:8-jre-openj9-bionic
+adoptopenjdk:8-jre-openj9-focal
 adoptopenjdk:8-jre-openj9-windowsservercore
 adoptopenjdk:8-jre-openj9-windowsservercore-1809
 adoptopenjdk:8-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:8-openj9
-adoptopenjdk:8-openj9-bionic
+adoptopenjdk:8-openj9-focal
 adoptopenjdk:8-openj9-windowsservercore
 adoptopenjdk:8-openj9-windowsservercore-1809
 adoptopenjdk:8-openj9-windowsservercore-ltsc2016
 adoptopenjdk:11-hotspot
-adoptopenjdk:11-hotspot-bionic
+adoptopenjdk:11-hotspot-focal
 adoptopenjdk:11-hotspot-windowsservercore
 adoptopenjdk:11-hotspot-windowsservercore-1809
 adoptopenjdk:11-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:11-jdk-hotspot
-adoptopenjdk:11-jdk-hotspot-bionic
+adoptopenjdk:11-jdk-hotspot-focal
 adoptopenjdk:11-jdk-hotspot-windowsservercore
 adoptopenjdk:11-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:11-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:11-jdk-openj9
-adoptopenjdk:11-jdk-openj9-bionic
+adoptopenjdk:11-jdk-openj9-focal
 adoptopenjdk:11-jdk-openj9-windowsservercore
 adoptopenjdk:11-jdk-openj9-windowsservercore-1809
 adoptopenjdk:11-jdk-openj9-windowsservercore-ltsc2016
 adoptopenjdk:11-jre-hotspot
-adoptopenjdk:11-jre-hotspot-bionic
+adoptopenjdk:11-jre-hotspot-focal
 adoptopenjdk:11-jre-hotspot-windowsservercore
 adoptopenjdk:11-jre-hotspot-windowsservercore-1809
 adoptopenjdk:11-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:11-jre-openj9
-adoptopenjdk:11-jre-openj9-bionic
+adoptopenjdk:11-jre-openj9-focal
 adoptopenjdk:11-jre-openj9-windowsservercore
 adoptopenjdk:11-jre-openj9-windowsservercore-1809
 adoptopenjdk:11-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:11-openj9
-adoptopenjdk:11-openj9-bionic
+adoptopenjdk:11-openj9-focal
 adoptopenjdk:11-openj9-windowsservercore
 adoptopenjdk:11-openj9-windowsservercore-1809
 adoptopenjdk:11-openj9-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jdk-hotspot
-adoptopenjdk:11.0.8_10-jdk-hotspot-bionic
-adoptopenjdk:11.0.8_10-jdk-hotspot-windowsservercore
-adoptopenjdk:11.0.8_10-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-bionic
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-windowsservercore
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jre-hotspot
-adoptopenjdk:11.0.8_10-jre-hotspot-bionic
-adoptopenjdk:11.0.8_10-jre-hotspot-windowsservercore
-adoptopenjdk:11.0.8_10-jre-hotspot-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-bionic
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-windowsservercore
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:13-hotspot
-adoptopenjdk:13-hotspot-bionic
-adoptopenjdk:13-hotspot-windowsservercore
-adoptopenjdk:13-hotspot-windowsservercore-1809
-adoptopenjdk:13-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13-jdk-hotspot
-adoptopenjdk:13-jdk-hotspot-bionic
-adoptopenjdk:13-jdk-hotspot-windowsservercore
-adoptopenjdk:13-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:13-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13-jdk-openj9
-adoptopenjdk:13-jdk-openj9-bionic
-adoptopenjdk:13-jdk-openj9-windowsservercore
-adoptopenjdk:13-jdk-openj9-windowsservercore-1809
-adoptopenjdk:13-jdk-openj9-windowsservercore-ltsc2016
-adoptopenjdk:13-jre-hotspot
-adoptopenjdk:13-jre-hotspot-bionic
-adoptopenjdk:13-jre-hotspot-windowsservercore
-adoptopenjdk:13-jre-hotspot-windowsservercore-1809
-adoptopenjdk:13-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13-jre-openj9
-adoptopenjdk:13-jre-openj9-bionic
-adoptopenjdk:13-jre-openj9-windowsservercore
-adoptopenjdk:13-jre-openj9-windowsservercore-1809
-adoptopenjdk:13-jre-openj9-windowsservercore-ltsc2016
-adoptopenjdk:13-openj9
-adoptopenjdk:13-openj9-bionic
-adoptopenjdk:13-openj9-windowsservercore
-adoptopenjdk:13-openj9-windowsservercore-1809
-adoptopenjdk:13-openj9-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jdk-hotspot
-adoptopenjdk:13.0.2_8-jdk-hotspot-bionic
-adoptopenjdk:13.0.2_8-jdk-hotspot-windowsservercore
-adoptopenjdk:13.0.2_8-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-bionic
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-windowsservercore
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jre-hotspot
-adoptopenjdk:13.0.2_8-jre-hotspot-bionic
-adoptopenjdk:13.0.2_8-jre-hotspot-windowsservercore
-adoptopenjdk:13.0.2_8-jre-hotspot-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-bionic
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-windowsservercore
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jdk-hotspot
+adoptopenjdk:11.0.9_11-jdk-hotspot-focal
+adoptopenjdk:11.0.9_11-jdk-hotspot-windowsservercore
+adoptopenjdk:11.0.9_11-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-focal
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-windowsservercore
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jre-hotspot
+adoptopenjdk:11.0.9_11-jre-hotspot-focal
+adoptopenjdk:11.0.9_11-jre-hotspot-windowsservercore
+adoptopenjdk:11.0.9_11-jre-hotspot-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-focal
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-windowsservercore
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-windowsservercore-ltsc2016
 adoptopenjdk:14-hotspot
-adoptopenjdk:14-hotspot-bionic
+adoptopenjdk:14-hotspot-focal
 adoptopenjdk:14-hotspot-windowsservercore
 adoptopenjdk:14-hotspot-windowsservercore-1809
 adoptopenjdk:14-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14-jdk-hotspot
-adoptopenjdk:14-jdk-hotspot-bionic
+adoptopenjdk:14-jdk-hotspot-focal
 adoptopenjdk:14-jdk-hotspot-windowsservercore
 adoptopenjdk:14-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:14-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14-jdk-openj9
-adoptopenjdk:14-jdk-openj9-bionic
+adoptopenjdk:14-jdk-openj9-focal
 adoptopenjdk:14-jdk-openj9-windowsservercore
 adoptopenjdk:14-jdk-openj9-windowsservercore-1809
 adoptopenjdk:14-jdk-openj9-windowsservercore-ltsc2016
 adoptopenjdk:14-jre-hotspot
-adoptopenjdk:14-jre-hotspot-bionic
+adoptopenjdk:14-jre-hotspot-focal
 adoptopenjdk:14-jre-hotspot-windowsservercore
 adoptopenjdk:14-jre-hotspot-windowsservercore-1809
 adoptopenjdk:14-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14-jre-openj9
-adoptopenjdk:14-jre-openj9-bionic
+adoptopenjdk:14-jre-openj9-focal
 adoptopenjdk:14-jre-openj9-windowsservercore
 adoptopenjdk:14-jre-openj9-windowsservercore-1809
 adoptopenjdk:14-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:14-openj9
-adoptopenjdk:14-openj9-bionic
+adoptopenjdk:14-openj9-focal
 adoptopenjdk:14-openj9-windowsservercore
 adoptopenjdk:14-openj9-windowsservercore-1809
 adoptopenjdk:14-openj9-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jdk-hotspot
-adoptopenjdk:14.0.2_12-jdk-hotspot-bionic
+adoptopenjdk:14.0.2_12-jdk-hotspot-focal
 adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore
 adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-bionic
+adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-focal
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jre-hotspot
-adoptopenjdk:14.0.2_12-jre-hotspot-bionic
+adoptopenjdk:14.0.2_12-jre-hotspot-focal
 adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore
 adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-bionic
+adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-focal
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore-ltsc2016
 adoptopenjdk:15-hotspot
-adoptopenjdk:15-hotspot-bionic
+adoptopenjdk:15-hotspot-focal
 adoptopenjdk:15-hotspot-windowsservercore
 adoptopenjdk:15-hotspot-windowsservercore-1809
 adoptopenjdk:15-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:15-jdk-hotspot
-adoptopenjdk:15-jdk-hotspot-bionic
+adoptopenjdk:15-jdk-hotspot-focal
 adoptopenjdk:15-jdk-hotspot-windowsservercore
 adoptopenjdk:15-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:15-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:15-jdk-openj9
-adoptopenjdk:15-jdk-openj9-bionic
+adoptopenjdk:15-jdk-openj9-focal
 adoptopenjdk:15-jdk-openj9-windowsservercore
 adoptopenjdk:15-jdk-openj9-windowsservercore-1809
 adoptopenjdk:15-jdk-openj9-windowsservercore-ltsc2016
 adoptopenjdk:15-jre-hotspot
-adoptopenjdk:15-jre-hotspot-bionic
+adoptopenjdk:15-jre-hotspot-focal
 adoptopenjdk:15-jre-hotspot-windowsservercore
 adoptopenjdk:15-jre-hotspot-windowsservercore-1809
 adoptopenjdk:15-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:15-jre-openj9
-adoptopenjdk:15-jre-openj9-bionic
+adoptopenjdk:15-jre-openj9-focal
 adoptopenjdk:15-jre-openj9-windowsservercore
 adoptopenjdk:15-jre-openj9-windowsservercore-1809
 adoptopenjdk:15-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:15-openj9
-adoptopenjdk:15-openj9-bionic
+adoptopenjdk:15-openj9-focal
 adoptopenjdk:15-openj9-windowsservercore
 adoptopenjdk:15-openj9-windowsservercore-1809
 adoptopenjdk:15-openj9-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jdk-hotspot
-adoptopenjdk:15_36-jdk-hotspot-bionic
-adoptopenjdk:15_36-jdk-hotspot-windowsservercore
-adoptopenjdk:15_36-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:15_36-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jdk-openj9-0.22.0
-adoptopenjdk:15_36-jdk-openj9-0.22.0-bionic
-adoptopenjdk:15_36-jdk-openj9-0.22.0-windowsservercore
-adoptopenjdk:15_36-jdk-openj9-0.22.0-windowsservercore-1809
-adoptopenjdk:15_36-jdk-openj9-0.22.0-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jre-hotspot
-adoptopenjdk:15_36-jre-hotspot-bionic
-adoptopenjdk:15_36-jre-hotspot-windowsservercore
-adoptopenjdk:15_36-jre-hotspot-windowsservercore-1809
-adoptopenjdk:15_36-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jre-openj9-0.22.0
-adoptopenjdk:15_36-jre-openj9-0.22.0-bionic
-adoptopenjdk:15_36-jre-openj9-0.22.0-windowsservercore
-adoptopenjdk:15_36-jre-openj9-0.22.0-windowsservercore-1809
-adoptopenjdk:15_36-jre-openj9-0.22.0-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jdk-hotspot
+adoptopenjdk:15.0.1_9-jdk-hotspot-focal
+adoptopenjdk:15.0.1_9-jdk-hotspot-windowsservercore
+adoptopenjdk:15.0.1_9-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-focal
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-windowsservercore
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jre-hotspot
+adoptopenjdk:15.0.1_9-jre-hotspot-focal
+adoptopenjdk:15.0.1_9-jre-hotspot-windowsservercore
+adoptopenjdk:15.0.1_9-jre-hotspot-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-focal
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-windowsservercore
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-windowsservercore-ltsc2016
 adoptopenjdk:hotspot
-adoptopenjdk:hotspot-bionic
+adoptopenjdk:hotspot-focal
 adoptopenjdk:hotspot-windowsservercore
 adoptopenjdk:hotspot-windowsservercore-1809
 adoptopenjdk:hotspot-windowsservercore-ltsc2016
 adoptopenjdk:latest
 adoptopenjdk:openj9
-adoptopenjdk:openj9-bionic
+adoptopenjdk:openj9-focal
 adoptopenjdk:openj9-windowsservercore
 adoptopenjdk:openj9-windowsservercore-1809
 adoptopenjdk:openj9-windowsservercore-ltsc2016
diff --git a/adoptopenjdk_11-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 69%
rename from adoptopenjdk_11-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_11-hotspot-focal/Dockerfile.hotspot.releases.full
index db96e3c..cbe020a 100644
--- a/adoptopenjdk_11-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='fb27ea52ed901c14c9fe8ad2fc10b338b8cf47d6762571be1fe3fb7c426bab7c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='16823192c576d4cdb63d44f87af9653995a6588704d43cb9c0c7a6d00f80c49d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='d00370967e4657e137cc511e81d6accbfdb08dba91e6268abef8219e735fbfc5'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='d206a63cd719b65717f7f20ee3fe49f0b8b2db922986b4811c828db57212699e'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='5c619e9acc182b0e40391c8c378ede120bb4ef7b8f0312d582d7aa1ecc684bd6'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='5619e1437c7cd400169eb7f1c831c2635fdb2776a401147a2fc1841b01f83ed6'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='e5cf6026a37db22133c671e4643e9735f8a9e8b85aa5a30f0dbeac8367d0a6a7'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='6e4cead158037cb7747ca47416474d4f408c9126be5b96f9befd532e0a762b47'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='d555c98066a611ddc2cff240f2e8d04730eb1237a8ea516483cba651c2fb45fd'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index b1db662..3c910ef 100644
--- a/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (25b24551dcc1f9ef295ef3639f319f9ea47315a1c49f729bf6b7690902cbde7f) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '25b24551dcc1f9ef295ef3639f319f9ea47315a1c49f729bf6b7690902cbde7f') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 21a28db..06c26bb 100644
--- a/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (25b24551dcc1f9ef295ef3639f319f9ea47315a1c49f729bf6b7690902cbde7f) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '25b24551dcc1f9ef295ef3639f319f9ea47315a1c49f729bf6b7690902cbde7f') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 69%
rename from adoptopenjdk_11-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_11-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index 4f42896..934fc31 100644
--- a/adoptopenjdk_11-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='286c869dbaefda9b470ae71d1250fdecf9f06d8da97c0f7df9021d381d749106'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='f8190b8c8df0ee2109655840b1739a9bad83ac57b2b0267bbe574281ae909b26'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='ffa627b2d0c6001448bb8f1f24f7c9921dad37e67637f6ed0a9a479e680a3393'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='89231e1667d7cc4202d1a401497bb287d4eb12281c90c17e2570211cc4e901a3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='0af961d70523d95e4b42cc74646653294e8d9eb51e9e7538f8e8c4b61a4d1ac5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='dc0e715c17abcb12bedf77c638e58e67d828d3c4bf24a898f0d4b053caaeb25f'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_s390x_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='aab4b30307da51cdbcd266a35bf21e7cd2c981fc472441bec7a7b316c45fc86c'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_s390x_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='98615b1b369509965a612232622d39b5cefe117d6189179cbad4dcef2ee2f4e1'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='59d43510030cc8cec19049bcc83c741693a19da3e9c78df99918381075f99232'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index 63eb586..bd1611c 100644
--- a/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (ebaf35d74ad6ceb3c44cbea81c207c9a7bb123e6d641e09678d12c9de2770dc4) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'ebaf35d74ad6ceb3c44cbea81c207c9a7bb123e6d641e09678d12c9de2770dc4') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 8dca7f7..d22e3ec 100644
--- a/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (ebaf35d74ad6ceb3c44cbea81c207c9a7bb123e6d641e09678d12c9de2770dc4) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'ebaf35d74ad6ceb3c44cbea81c207c9a7bb123e6d641e09678d12c9de2770dc4') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_11-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 85%
rename from adoptopenjdk_11-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_11-jre-openj9-focal/Dockerfile.openj9.releases.full
index fd88c73..fe94f8d 100644
--- a/adoptopenjdk_11-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,26 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='9771cd3e486697c5b7188ea81d1c32ad89cb007499fe8e1173ca491412b5d503'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='2d65c778d9b0116baa832f8c238470052e3c9eca930eeec8a717de1bb8454828'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='256a01e045867dcbbc541a6dd95ed315599f737b278319c4b936ce5a8a464424'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='4e44051683689efe25e00181bc09525aa378aea85e2ab03ab114c942c0abc999'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='91b74f434a3d7000dac788693f0b1e5288bd99c9bc6ef345ba6e165957defcf3'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='7cc4b24e2ac0ed26bf3ec31241bde65b672952bf0df5e1606b263fadcb21b3b7'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 00b380f..b3d0feb 100644
--- a/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 846a7c0..a79d519 100644
--- a/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_11-openj9-focal/Dockerfile.openj9.releases.full
similarity index 85%
rename from adoptopenjdk_11-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_11-openj9-focal/Dockerfile.openj9.releases.full
index d36a01c..1736f7b 100644
--- a/adoptopenjdk_11-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,26 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='b4bad13c0d9c2fbb1954fcddae9ccc5a32c609f2b48bf43ecaa5f39915390604'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='5bcaa2075ce5bf634b542c04ea79b9ca505407b6f94d2d8350c712da387120d9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='acef470ed75f6938168c39b4397fc80ef0d4e12adf1b73e359c84233c08d30e3'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='5e89692057fb8dfcb8e215fd3917b721fdb721c1eeea2b14948f4782413846bb'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='ac876b8136b977f2c167909b9698ebf4667d19f4d9eca89516f10882e1f05026'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='9ab79436180d41809f4fca8afe43e778ae2d82c7b50f3653c62d7a2728150836'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 247d90b..f00b6db 100644
--- a/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index eb4dd09..7d1c11d 100644
--- a/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_13-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-hotspot-bionic/Dockerfile.hotspot.releases.full
deleted file mode 100644
index b17482d..0000000
diff --git a/adoptopenjdk_13-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
deleted file mode 100644
index a438c2a..0000000
diff --git a/adoptopenjdk_13-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
deleted file mode 100644
index ceeab95..0000000
diff --git a/adoptopenjdk_13-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
deleted file mode 100644
index b1f58d2..0000000
diff --git a/adoptopenjdk_13-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
deleted file mode 100644
index 0e1691f..0000000
diff --git a/adoptopenjdk_13-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
deleted file mode 100644
index a6ba70a..0000000
diff --git a/adoptopenjdk_13-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_13-jre-openj9-bionic/Dockerfile.openj9.releases.full
deleted file mode 100644
index b8415da..0000000
diff --git a/adoptopenjdk_13-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_13-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
deleted file mode 100644
index 8769114..0000000
diff --git a/adoptopenjdk_13-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_13-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
deleted file mode 100644
index 5769db2..0000000
diff --git a/adoptopenjdk_13-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_13-openj9-bionic/Dockerfile.openj9.releases.full
deleted file mode 100644
index 59cc004..0000000
diff --git a/adoptopenjdk_13-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_13-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
deleted file mode 100644
index 96e3b6b..0000000
diff --git a/adoptopenjdk_13-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_13-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
deleted file mode 100644
index 89b2f07..0000000
diff --git a/adoptopenjdk_14-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 99%
rename from adoptopenjdk_14-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
index b9cfc0c..93b4243 100644
--- a/adoptopenjdk_14-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_14-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 99%
rename from adoptopenjdk_14-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index 7d8bbb0..c3f04ca 100644
--- a/adoptopenjdk_14-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_14-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 99%
rename from adoptopenjdk_14-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
index 9479f48..77b7893 100644
--- a/adoptopenjdk_14-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_14-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
similarity index 99%
rename from adoptopenjdk_14-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
index 143cfbb..5148412 100644
--- a/adoptopenjdk_14-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_15-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 69%
rename from adoptopenjdk_15-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index f291f7c..88f2f59 100644
--- a/adoptopenjdk_15-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='318f50bae6652d4468ee262ce0fd6569adbc461bea0d1ecce77ce2843efee8d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_aarch64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='09c1ba3636e7899d8b43795d7988bcc4b1e1be2919764d94f6d4a1a855ce774f'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_arm_linux_hotspot_15_36.tar.gz'; \
+         ESUM='f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='6ea692c7e43bee201a56313bd9f4ddcdea43bed1dfe203c49316ac4d08a4cdd3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_ppc64le_linux_hotspot_15_36.tar.gz'; \
+         ESUM='e759661cf8b41cecd61709ce14d2169d607288f2efc62739cb2c690605a5a28b'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='e1e124a29e2bf892d267eb63d00dd136558b4e276bcb6741ea676c995b2fff51'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_s390x_linux_hotspot_15_36.tar.gz'; \
+         ESUM='47e57b1b67627312e34f911c29a0b7970bef734308db1e413fe53376ed894f3a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_s390x_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='230d97a6b16a0735f15013a91f7582a22282ec12bdfaec291ab63274cc075efb'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index b3d622e..2e80f09 100644
--- a/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (d14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 98f4a11..a1d4740 100644
--- a/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (d14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_15-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_15-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 84%
rename from adoptopenjdk_15-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_15-jre-openj9-focal/Dockerfile.openj9.releases.full
index 9454bc3..07a28eb 100644
--- a/adoptopenjdk_15-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_15-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
+         ;; \
        ppc64el|ppc64le) \
-         ESUM='fef3e6034a861b0bfa14120f064373d866b65f3525b9c791a647010194eb5632'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_ppc64le_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='ea9e8225edb9fee7c425983fd8bb370327867dd06f4c9763834bde9977bfa81f'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='5f5a6a46a432af651d63538997b0850fed9f631ab4a797e29d33347d3052fddc'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_s390x_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='b430f9b59d909867b05cbec1da2c7e49793838fcc5056f01a8203e09a77e5a76'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_s390x_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='3811aea0eeaccd4aa50bbf6a374e31b19f52a22c1f2c8b378e8ea0ac194b8638'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index dc5accf..45f4eb3 100644
--- a/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 8aea245..9fd7ba7 100644
--- a/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 67%
rename from adoptopenjdk_8-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_8-hotspot-focal/Dockerfile.hotspot.releases.full
index 702b190..39295a5 100644
--- a/adoptopenjdk_8-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='2f9c5be1bf704f1233bcf96b8c02524c14dc4d43dc80c4926856091961b79948'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_aarch64_linux_hotspot_8u265b01.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='4ac2503725b2729ec245dbdb000b2486f9c73ae86860c9525f9ac822ec81f0d6'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_arm_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='4fb3640fae4b9bd4ebf834c775b547ed930cd1b805f4686223994480411aee72'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_ppc64le_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='56cccbff1073aba7637d7d71da2d8469a1db0be994176acaa44055396cefaef9'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='8b76480c809c4fde654ab55d10371c35d70b50069ab1724960509d99ed61065d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_s390x_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='a40e1ff112b7c2115c4525edaf6739276a6f3b96beb3221f70bde32aa6f2ab7d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='9bce39f63d24626da75778f240294fa466a0ed117e32db798164621fe30b0723'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index 7f626b3..49934f0 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading  ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033') { \
+    wget  -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 1ce974f..cfcaab7 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 67%
rename from adoptopenjdk_8-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_8-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index e3c718d..2a791f0 100644
--- a/adoptopenjdk_8-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='87d16dac293d2a9abbb559a277bfaded702f28d1bfdc526f8613bb9cfed84a12'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='dc3405aab81f422b7721f665c76371bd7b03c291eea89cd110a82d8bcf07809a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='7bbb9d76458ee29bc5e2458b32a91b8c032ecffe6cb8500734ca41d2d8f5c9f3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='00f2fdc9b424b7ef27a1df1032ee7ea1e477d677a685936550d85db267f97c0d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='aca50f02d59169cb428d54501846b518edc9fff6a6f428459c72b4faa2b4abb0'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_s390x_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='7832e0cc1200e457abd2b964510a3b1c965c17824ad6728a5b3ab82c66088daa'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='1285da6278f2d38a790a21148d7e683f20de0799c44b937043830ef6b57f58c4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index f414d68..1521b2b 100644
--- a/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 660a88c..b72726c 100644
--- a/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 88%
rename from adoptopenjdk_8-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
index ad4e102..be9344e 100644
--- a/adoptopenjdk_8-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,22 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        ppc64el|ppc64le) \
-         ESUM='b1c91e757195b87d51027ea97fece00ac1adb9837b055e5f039dd45511fb3c0a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='57fd112b347255aeb85a9659397333314e1edf7457ddb5f9ffd7384bfc6d6a05'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='ec573cb2361b5fee3944387329d7859889d73c6c8a7d5f7ecf0d95503efda726'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_s390x_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='6e5d0eb867b00395e720e211c02f36308e36f953037f21483eb49ade35587103'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_s390x_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='0da0aad21f02b4f08f717647def8beafcf0116c36b195705416f46a1ab97f4de'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 1e463ce..0cb1597 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index da154b2..469036c 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_8-openj9-focal/Dockerfile.openj9.releases.full
similarity index 88%
rename from adoptopenjdk_8-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_8-openj9-focal/Dockerfile.openj9.releases.full
index df2b916..d0b7992 100644
--- a/adoptopenjdk_8-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,22 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        ppc64el|ppc64le) \
-         ESUM='ad78af32749b40f9f1dcc7ba23aa5e0ac0e7b63edd355d56e766a04d7ab3b60c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='71f649a103e2abab58c062adc7cca0a60dca5feba1cb868cdf87bba1e1a9d333'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='54b9dbcf9f221a0c2ed469b3b5828b56b2cf22fbbf61f0b462b4a9db0737f7f7'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_s390x_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='893caadb7d61cfc895f40d35911ce4b3b400443de05f38c1936a91107271a68d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_s390x_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='88ff739005cbb012f3ee73d426bd75810ce7de551d08e555475a261d57e3ecbf'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 2549894..0e82790 100644
--- a/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index a2b57bf..8cc99bb 100644
--- a/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 70%
rename from adoptopenjdk_hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
index 7cd3268..127272e 100644
--- a/adoptopenjdk_hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='44c8cd580f6e828f8fbb431a59b3c8f694da8c75adb7c311f7b6b9ed81c19c54'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_aarch64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='d7de37fee91fe098791d48ea2a880cf2789949665d6bc9a232380738f99c16a9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_arm_linux_hotspot_15_36.tar.gz'; \
+         ESUM='bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='537eb289a0fc56915078ff92616574b00b8ad0119543f5e4a817ede0e52c4030'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_ppc64le_linux_hotspot_15_36.tar.gz'; \
+         ESUM='bc5347c011025f9830a420f943f52b97ebf0fc642ebff9a25bf465d0a6f3f3b9'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='3e238ea4924f4dd2a8167c911a99b96ffdfb51e12f3969cffbdc0791a58d0cf2'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_s390x_linux_hotspot_15_36.tar.gz'; \
+         ESUM='d402e322841abc3c5c8b0352f08d54d6b5c25b7d6f81716401da266bcb1d1ff0'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='c198593d1b5188ee3570e2ca33c3bc004aaefbda2c11e68e58ae7296cf5c3982'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index e0c0d34..552ff25 100644
--- a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index d288c3c..34171da 100644
--- a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
similarity index 84%
rename from adoptopenjdk_openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
index 1b40301..cc73c0e 100644
--- a/adoptopenjdk_openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
+         ;; \
        ppc64el|ppc64le) \
-         ESUM='88058a977c63382b59b7aaaec08d656490494b2c9575ae787c873de1b2baeaca'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='26b083d7b1bcb31040210c02ce33b4fb28ed5ad92de72a3e681e51e04d6beb5c'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='1cb8366199635c82a58b2619483f84318e9ead5b542b52ffc355fb561adb0f14'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_s390x_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='477da764a43ce89408c2a81d1f56f7df064cd34b360c3fbf8e2028c2668c17a2'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_s390x_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='3f016e23a1fba0b1d29f03415c36d54a8a33480ce1d238fbef09d38c5a69eff7'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 70d6b68..4e93378 100644
--- a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 8c4a975..093ffeb 100644
--- a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \

@tianon
Copy link
Member

tianon commented Oct 26, 2020 

-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading  ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033') { \
+    wget  -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d') { \

Something about this is Not Right (see also the CI failures). 😄

@tianon
Copy link
Member

tianon commented Oct 26, 2020

It also looks like we need to adjust 58a56aa and 050d47d. 😞

@tianon
Copy link
Member

tianon commented Oct 26, 2020

(Is it perhaps because we're compiling a .class file on hotspot that we then try to run on openj9? Are those not compatible in that way?)

@dinogun dinogun mentioned this pull request Oct 26, 2020
Merged
@dinogun dinogun changed the title WIP: AdoptOpenJDK: Oct 2020 release of 8u272-b10, 11.0.9+11 and 15.0.1+9. AdoptOpenJDK: Oct 2020 release of 8u272-b10, 11.0.9+11 and 15.0.1+9. Oct 26, 2020
@tianon
Copy link
Member

tianon commented Oct 26, 2020

Any ideas for how to make #8929 better so these tests work more reliably on adoptopenjdk version bumps?

@dinogun dinogun mentioned this pull request Oct 27, 2020
Closed
@aahlenst aahlenst mentioned this pull request Oct 27, 2020
Closed
@dinogun
Copy link
Contributor Author

dinogun commented Oct 27, 2020 •
edited

@tianon It appears that the java hello world test (librarytest/java-hello-world ?) has been compiled with the latest jdk (15 probably ?). When we try to run this with older JRE's they fail with the same error that we see the tests failing.
Eg. here I have a simple java hello world compiled with the 15-jdk-hotspot JDK and trying to run it within the 8-jre-hotspot

$ docker run --rm -it -v $PWD:/app adoptopenjdk:8-jre-hotspot /bin/bash
# cd /app/
# ls -l
total 12
-rw-rw-r--. 1 root root  427 Oct 27 11:37 HelloWorld.class      -->       Compiled with 15-jdk-hotspot
-rw-rw-r--. 1 root root  141 Oct 27 11:09 HelloWorld.java
-rw-------. 1 root root 1784 Oct 27 10:41 run-java-in-container.sh
#
# java HelloWorld
Error: A JNI error has occurred, please check your installation and try again
Exception in thread "main" java.lang.UnsupportedClassVersionError: HelloWorld has been compiled by a more recent version of the Java Runtime (class file version 59.0), this version of the Java Runtime only recognizes class file versions up to 52.0
	at java.lang.ClassLoader.defineClass1(Native Method)
	at java.lang.ClassLoader.defineClass(ClassLoader.java:756)
	at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
	at java.net.URLClassLoader.defineClass(URLClassLoader.java:468)
	at java.net.URLClassLoader.access$100(URLClassLoader.java:74)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:369)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:363)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.net.URLClassLoader.findClass(URLClassLoader.java:362)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:418)
	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:352)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:351)
	at sun.launcher.LauncherHelper.checkAndLoadMain(LauncherHelper.java:495)

Similarly with the 8-jre-openj9 image

$ docker run --rm -it -v $PWD:/app adoptopenjdk:8-jre-openj9 /bin/bash
# cd /app/
# ls -l
total 12
-rw-rw-r--. 1 root root  427 Oct 27 11:37 HelloWorld.class
-rw-rw-r--. 1 root root  141 Oct 27 11:09 HelloWorld.java
-rw-------. 1 root root 1784 Oct 27 10:41 run-java-in-container.sh
# java HelloWorld
Error: A JNI error has occurred, please check your installation and try again
Exception in thread "main" java.lang.UnsupportedClassVersionError: JVMCFRE003 bad major version; class=HelloWorld, offset=6
	at java.lang.ClassLoader.defineClassImpl(Native Method)
	at java.lang.ClassLoader.defineClassInternal(ClassLoader.java:398)
	at java.lang.ClassLoader.defineClass(ClassLoader.java:359)
	at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
	at java.net.URLClassLoader.defineClass(URLClassLoader.java:682)
	at java.net.URLClassLoader.access$400(URLClassLoader.java:89)
	at java.net.URLClassLoader$ClassFinder.run(URLClassLoader.java:1086)
	at java.security.AccessController.doPrivileged(AccessController.java:770)
	at java.net.URLClassLoader.findClass(URLClassLoader.java:589)
	at java.lang.ClassLoader.loadClassHelper(ClassLoader.java:953)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:898)
	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:352)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:881)
	at sun.launcher.LauncherHelper.checkAndLoadMain(LauncherHelper.java:495)

Compiling the hello world testcase with older jdk (8-jdk) should ensure we dont run into these kind of issues.

@tianon
Copy link
Member

tianon commented Oct 27, 2020

From my comments above: 😉

It also looks like we need to adjust 58a56aa and 050d47d.

(Is it perhaps because we're compiling a .class file on hotspot that we then try to run on openj9? Are those not compatible in that way?)

Any ideas for how to make #8929 better so these tests work more reliably on adoptopenjdk version bumps?

These are cases where the tests used to just fail because the desired JDK image couldn't be found, but we recently updated the harness to try harder to find a suitable JDK (and to use javac --release 8 when possible to maximize compatibility), and it's still not quite good enough, and I'd love to use this as an opportunity to improve that logic if you're amenable?

@dinogun
Add additional shared tags that make it similar to openjdk repo.
e6a02c1 
(Should help the common testing infra for these images too)
@github-actions
Copy link

Diff for e6a02c1: 
TODO diff too large for GitHub comment!
See: http://github.com/docker-library/official-images/actions/runs/333365504

@dinogun
Copy link
Contributor Author

dinogun commented Oct 28, 2020

@tianon I have added additional tags to make it more inline with what openjdk does and so it should end up using 8-jdk tag as potentialJdk in run-java-in-container.sh instead of latest (which would be 15). I am still seeing failures as those tags currently don't exist, hopefully future PRs should not run into this issue.

@tianon
Copy link
Member

tianon commented Oct 28, 2020

Oh 😅

I was planning to adapt the test to what AdoptOpenJDK provides, but if you prefer this solution, this is fine?
(I just needed some guidance on what assumptions are still OK for the test, but it sounds like building with JDK 8 is the winning ticket? Does that even work across OpenJ9 vs Hotspot? Any idea why javac --release 8 doesn't seem to work here?)

@tianon
Copy link
Member

tianon commented Oct 28, 2020

(To be clear, this LGTM and I'm happy to merge it, but I want to make sure you're not changing your supported tags list just to fix this test, and have other reasons for doing so. 😅)

Diff: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3d0fa90..9145d4f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,316 +1,224 @@
 Maintainers: Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
 GitRepo: https://github.com/AdoptOpenJDK/openjdk-docker.git
 
-Tags: 8u265-b01-jdk-hotspot-bionic, 8-jdk-hotspot-bionic, 8-hotspot-bionic
-SharedTags: 8u265-b01-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 8u272-b10-jdk-hotspot-focal, 8-jdk-hotspot-focal, 8-hotspot-focal
+SharedTags: 8u272-b10-jdk-hotspot, 8-jdk-hotspot, 8-hotspot, 8-jdk, 8
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 8u265-b01-jdk-hotspot-windowsservercore-1809, 8-jdk-hotspot-windowsservercore-1809, 8-hotspot-windowsservercore-1809
-SharedTags: 8u265-b01-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u265-b01-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
+Tags: 8u272-b10-jdk-hotspot-windowsservercore-1809, 8-jdk-hotspot-windowsservercore-1809, 8-hotspot-windowsservercore-1809
+SharedTags: 8u272-b10-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u272-b10-jdk-hotspot, 8-jdk-hotspot, 8-hotspot, 8-jdk, 8
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jdk-hotspot-windowsservercore-ltsc2016, 8-jdk-hotspot-windowsservercore-ltsc2016, 8-hotspot-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u265-b01-jdk-hotspot, 8-jdk-hotspot, 8-hotspot
+Tags: 8u272-b10-jdk-hotspot-windowsservercore-ltsc2016, 8-jdk-hotspot-windowsservercore-ltsc2016, 8-hotspot-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u272-b10-jdk-hotspot, 8-jdk-hotspot, 8-hotspot, 8-jdk, 8
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 8u265-b01-jdk-openj9-0.21.0-bionic, 8-jdk-openj9-bionic, 8-openj9-bionic
-SharedTags: 8u265-b01-jdk-openj9-0.21.0, 8-jdk-openj9, 8-openj9
+Tags: 8u272-b10-jdk-openj9-0.23.0-focal, 8-jdk-openj9-focal, 8-openj9-focal
+SharedTags: 8u272-b10-jdk-openj9-0.23.0, 8-jdk-openj9, 8-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore-1809, 8-jdk-openj9-windowsservercore-1809, 8-openj9-windowsservercore-1809
-SharedTags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u265-b01-jdk-openj9-0.21.0, 8-jdk-openj9, 8-openj9
+Tags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore-1809, 8-jdk-openj9-windowsservercore-1809, 8-openj9-windowsservercore-1809
+SharedTags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u272-b10-jdk-openj9-0.23.0, 8-jdk-openj9, 8-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 8-jdk-openj9-windowsservercore-ltsc2016, 8-openj9-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jdk-openj9-0.21.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u265-b01-jdk-openj9-0.21.0, 8-jdk-openj9, 8-openj9
+Tags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore-ltsc2016, 8-jdk-openj9-windowsservercore-ltsc2016, 8-openj9-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jdk-openj9-0.23.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u272-b10-jdk-openj9-0.23.0, 8-jdk-openj9, 8-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 8u265-b01-jre-hotspot-bionic, 8-jre-hotspot-bionic
-SharedTags: 8u265-b01-jre-hotspot, 8-jre-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 8u272-b10-jre-hotspot-focal, 8-jre-hotspot-focal
+SharedTags: 8u272-b10-jre-hotspot, 8-jre-hotspot, 8-jre
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 8u265-b01-jre-hotspot-windowsservercore-1809, 8-jre-hotspot-windowsservercore-1809
-SharedTags: 8u265-b01-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u265-b01-jre-hotspot, 8-jre-hotspot
+Tags: 8u272-b10-jre-hotspot-windowsservercore-1809, 8-jre-hotspot-windowsservercore-1809
+SharedTags: 8u272-b10-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u272-b10-jre-hotspot, 8-jre-hotspot, 8-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jre-hotspot-windowsservercore-ltsc2016, 8-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u265-b01-jre-hotspot, 8-jre-hotspot
+Tags: 8u272-b10-jre-hotspot-windowsservercore-ltsc2016, 8-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u272-b10-jre-hotspot, 8-jre-hotspot, 8-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 8u265-b01-jre-openj9-0.21.0-bionic, 8-jre-openj9-bionic
-SharedTags: 8u265-b01-jre-openj9-0.21.0, 8-jre-openj9
+Tags: 8u272-b10-jre-openj9-0.23.0-focal, 8-jre-openj9-focal
+SharedTags: 8u272-b10-jre-openj9-0.23.0, 8-jre-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 8u265-b01-jre-openj9-0.21.0-windowsservercore-1809, 8-jre-openj9-windowsservercore-1809
-SharedTags: 8u265-b01-jre-openj9-0.21.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u265-b01-jre-openj9-0.21.0, 8-jre-openj9
+Tags: 8u272-b10-jre-openj9-0.23.0-windowsservercore-1809, 8-jre-openj9-windowsservercore-1809
+SharedTags: 8u272-b10-jre-openj9-0.23.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u272-b10-jre-openj9-0.23.0, 8-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 8u265-b01-jre-openj9-0.21.0-windowsservercore-ltsc2016, 8-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 8u265-b01-jre-openj9-0.21.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u265-b01-jre-openj9-0.21.0, 8-jre-openj9
+Tags: 8u272-b10-jre-openj9-0.23.0-windowsservercore-ltsc2016, 8-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 8u272-b10-jre-openj9-0.23.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u272-b10-jre-openj9-0.23.0, 8-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 8/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jdk-hotspot-bionic, 11-jdk-hotspot-bionic, 11-hotspot-bionic
-SharedTags: 11.0.8_10-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
+Tags: 11.0.9_11-jdk-hotspot-focal, 11-jdk-hotspot-focal, 11-hotspot-focal
+SharedTags: 11.0.9_11-jdk-hotspot, 11-jdk-hotspot, 11-hotspot, 11-jdk, 11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 11.0.8_10-jdk-hotspot-windowsservercore-1809, 11-jdk-hotspot-windowsservercore-1809, 11-hotspot-windowsservercore-1809
-SharedTags: 11.0.8_10-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.8_10-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
+Tags: 11.0.9_11-jdk-hotspot-windowsservercore-1809, 11-jdk-hotspot-windowsservercore-1809, 11-hotspot-windowsservercore-1809
+SharedTags: 11.0.9_11-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.9_11-jdk-hotspot, 11-jdk-hotspot, 11-hotspot, 11-jdk, 11
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jdk-hotspot-windowsservercore-ltsc2016, 11-jdk-hotspot-windowsservercore-ltsc2016, 11-hotspot-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.8_10-jdk-hotspot, 11-jdk-hotspot, 11-hotspot
+Tags: 11.0.9_11-jdk-hotspot-windowsservercore-ltsc2016, 11-jdk-hotspot-windowsservercore-ltsc2016, 11-hotspot-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.9_11-jdk-hotspot, 11-jdk-hotspot, 11-hotspot, 11-jdk, 11
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jdk-openj9-0.21.0-bionic, 11-jdk-openj9-bionic, 11-openj9-bionic
-SharedTags: 11.0.8_10-jdk-openj9-0.21.0, 11-jdk-openj9, 11-openj9
+Tags: 11.0.9_11-jdk-openj9-0.23.0-focal, 11-jdk-openj9-focal, 11-openj9-focal
+SharedTags: 11.0.9_11-jdk-openj9-0.23.0, 11-jdk-openj9, 11-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore-1809, 11-jdk-openj9-windowsservercore-1809, 11-openj9-windowsservercore-1809
-SharedTags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.8_10-jdk-openj9-0.21.0, 11-jdk-openj9, 11-openj9
+Tags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore-1809, 11-jdk-openj9-windowsservercore-1809, 11-openj9-windowsservercore-1809
+SharedTags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.9_11-jdk-openj9-0.23.0, 11-jdk-openj9, 11-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 11-jdk-openj9-windowsservercore-ltsc2016, 11-openj9-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jdk-openj9-0.21.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.8_10-jdk-openj9-0.21.0, 11-jdk-openj9, 11-openj9
+Tags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore-ltsc2016, 11-jdk-openj9-windowsservercore-ltsc2016, 11-openj9-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jdk-openj9-0.23.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.9_11-jdk-openj9-0.23.0, 11-jdk-openj9, 11-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jre-hotspot-bionic, 11-jre-hotspot-bionic
-SharedTags: 11.0.8_10-jre-hotspot, 11-jre-hotspot
+Tags: 11.0.9_11-jre-hotspot-focal, 11-jre-hotspot-focal
+SharedTags: 11.0.9_11-jre-hotspot, 11-jre-hotspot, 11-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 11.0.8_10-jre-hotspot-windowsservercore-1809, 11-jre-hotspot-windowsservercore-1809
-SharedTags: 11.0.8_10-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.8_10-jre-hotspot, 11-jre-hotspot
+Tags: 11.0.9_11-jre-hotspot-windowsservercore-1809, 11-jre-hotspot-windowsservercore-1809
+SharedTags: 11.0.9_11-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.9_11-jre-hotspot, 11-jre-hotspot, 11-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jre-hotspot-windowsservercore-ltsc2016, 11-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.8_10-jre-hotspot, 11-jre-hotspot
+Tags: 11.0.9_11-jre-hotspot-windowsservercore-ltsc2016, 11-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.9_11-jre-hotspot, 11-jre-hotspot, 11-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 11.0.8_10-jre-openj9-0.21.0-bionic, 11-jre-openj9-bionic
-SharedTags: 11.0.8_10-jre-openj9-0.21.0, 11-jre-openj9
+Tags: 11.0.9_11-jre-openj9-0.23.0-focal, 11-jre-openj9-focal
+SharedTags: 11.0.9_11-jre-openj9-0.23.0, 11-jre-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore-1809, 11-jre-openj9-windowsservercore-1809
-SharedTags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.8_10-jre-openj9-0.21.0, 11-jre-openj9
+Tags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore-1809, 11-jre-openj9-windowsservercore-1809
+SharedTags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.9_11-jre-openj9-0.23.0, 11-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore-ltsc2016, 11-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 11.0.8_10-jre-openj9-0.21.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.8_10-jre-openj9-0.21.0, 11-jre-openj9
+Tags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore-ltsc2016, 11-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 11.0.9_11-jre-openj9-0.23.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.9_11-jre-openj9-0.23.0, 11-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 11/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 13.0.2_8-jdk-hotspot-bionic, 13-jdk-hotspot-bionic, 13-hotspot-bionic
-SharedTags: 13.0.2_8-jdk-hotspot, 13-jdk-hotspot, 13-hotspot
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/ubuntu
-File: Dockerfile.hotspot.releases.full
-
-Tags: 13.0.2_8-jdk-hotspot-windowsservercore-1809, 13-jdk-hotspot-windowsservercore-1809, 13-hotspot-windowsservercore-1809
-SharedTags: 13.0.2_8-jdk-hotspot-windowsservercore, 13-jdk-hotspot-windowsservercore, 13-hotspot-windowsservercore, 13.0.2_8-jdk-hotspot, 13-jdk-hotspot, 13-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-1809
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jdk-hotspot-windowsservercore-ltsc2016, 13-jdk-hotspot-windowsservercore-ltsc2016, 13-hotspot-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jdk-hotspot-windowsservercore, 13-jdk-hotspot-windowsservercore, 13-hotspot-windowsservercore, 13.0.2_8-jdk-hotspot, 13-jdk-hotspot, 13-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-ltsc2016
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 13.0.2_8-jdk-openj9-0.18.0-bionic, 13-jdk-openj9-bionic, 13-openj9-bionic
-SharedTags: 13.0.2_8-jdk-openj9-0.18.0, 13-jdk-openj9, 13-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/ubuntu
-File: Dockerfile.openj9.releases.full
-
-Tags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore-1809, 13-jdk-openj9-windowsservercore-1809, 13-openj9-windowsservercore-1809
-SharedTags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore, 13-jdk-openj9-windowsservercore, 13-openj9-windowsservercore, 13.0.2_8-jdk-openj9-0.18.0, 13-jdk-openj9, 13-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-1809
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore-ltsc2016, 13-jdk-openj9-windowsservercore-ltsc2016, 13-openj9-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jdk-openj9-0.18.0-windowsservercore, 13-jdk-openj9-windowsservercore, 13-openj9-windowsservercore, 13.0.2_8-jdk-openj9-0.18.0, 13-jdk-openj9, 13-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jdk/windows/windowsservercore-ltsc2016
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 13.0.2_8-jre-hotspot-bionic, 13-jre-hotspot-bionic
-SharedTags: 13.0.2_8-jre-hotspot, 13-jre-hotspot
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/ubuntu
-File: Dockerfile.hotspot.releases.full
-
-Tags: 13.0.2_8-jre-hotspot-windowsservercore-1809, 13-jre-hotspot-windowsservercore-1809
-SharedTags: 13.0.2_8-jre-hotspot-windowsservercore, 13-jre-hotspot-windowsservercore, 13.0.2_8-jre-hotspot, 13-jre-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-1809
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jre-hotspot-windowsservercore-ltsc2016, 13-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jre-hotspot-windowsservercore, 13-jre-hotspot-windowsservercore, 13.0.2_8-jre-hotspot, 13-jre-hotspot
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-ltsc2016
-File: Dockerfile.hotspot.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 13.0.2_8-jre-openj9-0.18.0-bionic, 13-jre-openj9-bionic
-SharedTags: 13.0.2_8-jre-openj9-0.18.0, 13-jre-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/ubuntu
-File: Dockerfile.openj9.releases.full
-
-Tags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore-1809, 13-jre-openj9-windowsservercore-1809
-SharedTags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore, 13-jre-openj9-windowsservercore, 13.0.2_8-jre-openj9-0.18.0, 13-jre-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-1809
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-1809
-
-Tags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore-ltsc2016, 13-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 13.0.2_8-jre-openj9-0.18.0-windowsservercore, 13-jre-openj9-windowsservercore, 13.0.2_8-jre-openj9-0.18.0, 13-jre-openj9
-Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
-Directory: 13/jre/windows/windowsservercore-ltsc2016
-File: Dockerfile.openj9.releases.full
-Constraints: windowsservercore-ltsc2016
-
-Tags: 14.0.2_12-jdk-hotspot-bionic, 14-jdk-hotspot-bionic, 14-hotspot-bionic
-SharedTags: 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot
+Tags: 14.0.2_12-jdk-hotspot-focal, 14-jdk-hotspot-focal, 14-hotspot-focal
+SharedTags: 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot, 14-jdk, 14
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 14.0.2_12-jdk-hotspot-windowsservercore-1809, 14-jdk-hotspot-windowsservercore-1809, 14-hotspot-windowsservercore-1809
-SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot
+SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot, 14-jdk, 14
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
 Tags: 14.0.2_12-jdk-hotspot-windowsservercore-ltsc2016, 14-jdk-hotspot-windowsservercore-ltsc2016, 14-hotspot-windowsservercore-ltsc2016
-SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot
+SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot, 14-jdk, 14
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jdk-openj9-0.21.0-bionic, 14-jdk-openj9-bionic, 14-openj9-bionic
+Tags: 14.0.2_12-jdk-openj9-0.21.0-focal, 14-jdk-openj9-focal, 14-openj9-focal
 SharedTags: 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore-1809, 14-jdk-openj9-windowsservercore-1809, 14-openj9-windowsservercore-1809
 SharedTags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore, 14-jdk-openj9-windowsservercore, 14-openj9-windowsservercore, 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -318,45 +226,45 @@ Constraints: windowsservercore-1809
 Tags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 14-jdk-openj9-windowsservercore-ltsc2016, 14-openj9-windowsservercore-ltsc2016
 SharedTags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore, 14-jdk-openj9-windowsservercore, 14-openj9-windowsservercore, 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jre-hotspot-bionic, 14-jre-hotspot-bionic
-SharedTags: 14.0.2_12-jre-hotspot, 14-jre-hotspot
+Tags: 14.0.2_12-jre-hotspot-focal, 14-jre-hotspot-focal
+SharedTags: 14.0.2_12-jre-hotspot, 14-jre-hotspot, 14-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 14.0.2_12-jre-hotspot-windowsservercore-1809, 14-jre-hotspot-windowsservercore-1809
-SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot
+SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot, 14-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
 Tags: 14.0.2_12-jre-hotspot-windowsservercore-ltsc2016, 14-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot
+SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot, 14-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jre-openj9-0.21.0-bionic, 14-jre-openj9-bionic
+Tags: 14.0.2_12-jre-openj9-0.21.0-focal, 14-jre-openj9-focal
 SharedTags: 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
 Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore-1809, 14-jre-openj9-windowsservercore-1809
 SharedTags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore, 14-jre-openj9-windowsservercore, 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -364,99 +272,99 @@ Constraints: windowsservercore-1809
 Tags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore-ltsc2016, 14-jre-openj9-windowsservercore-ltsc2016
 SharedTags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore, 14-jre-openj9-windowsservercore, 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 14/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jdk-hotspot-bionic, 15-jdk-hotspot-bionic, 15-hotspot-bionic, hotspot-bionic
-SharedTags: 15_36-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
+Tags: 15.0.1_9-jdk-hotspot-focal, 15-jdk-hotspot-focal, 15-hotspot-focal, hotspot-focal
+SharedTags: 15.0.1_9-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, 15-jdk, hotspot, jdk, 15, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 15_36-jdk-hotspot-windowsservercore-1809, 15-jdk-hotspot-windowsservercore-1809, 15-hotspot-windowsservercore-1809, hotspot-windowsservercore-1809
-SharedTags: 15_36-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15_36-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
+Tags: 15.0.1_9-jdk-hotspot-windowsservercore-1809, 15-jdk-hotspot-windowsservercore-1809, 15-hotspot-windowsservercore-1809, hotspot-windowsservercore-1809
+SharedTags: 15.0.1_9-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15.0.1_9-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, 15-jdk, hotspot, jdk, 15, latest
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jdk-hotspot-windowsservercore-ltsc2016, 15-jdk-hotspot-windowsservercore-ltsc2016, 15-hotspot-windowsservercore-ltsc2016, hotspot-windowsservercore-ltsc2016
-SharedTags: 15_36-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15_36-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, latest
+Tags: 15.0.1_9-jdk-hotspot-windowsservercore-ltsc2016, 15-jdk-hotspot-windowsservercore-ltsc2016, 15-hotspot-windowsservercore-ltsc2016, hotspot-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15.0.1_9-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, 15-jdk, hotspot, jdk, 15, latest
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jdk-openj9-0.22.0-bionic, 15-jdk-openj9-bionic, 15-openj9-bionic, openj9-bionic
-SharedTags: 15_36-jdk-openj9-0.22.0, 15-jdk-openj9, 15-openj9, openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 15.0.1_9-jdk-openj9-0.23.0-focal, 15-jdk-openj9-focal, 15-openj9-focal, openj9-focal
+SharedTags: 15.0.1_9-jdk-openj9-0.23.0, 15-jdk-openj9, 15-openj9, openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 15_36-jdk-openj9-0.22.0-windowsservercore-1809, 15-jdk-openj9-windowsservercore-1809, 15-openj9-windowsservercore-1809, openj9-windowsservercore-1809
-SharedTags: 15_36-jdk-openj9-0.22.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15_36-jdk-openj9-0.22.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore-1809, 15-jdk-openj9-windowsservercore-1809, 15-openj9-windowsservercore-1809, openj9-windowsservercore-1809
+SharedTags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15.0.1_9-jdk-openj9-0.23.0, 15-jdk-openj9, 15-openj9, openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jdk-openj9-0.22.0-windowsservercore-ltsc2016, 15-jdk-openj9-windowsservercore-ltsc2016, 15-openj9-windowsservercore-ltsc2016, openj9-windowsservercore-ltsc2016
-SharedTags: 15_36-jdk-openj9-0.22.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15_36-jdk-openj9-0.22.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore-ltsc2016, 15-jdk-openj9-windowsservercore-ltsc2016, 15-openj9-windowsservercore-ltsc2016, openj9-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jdk-openj9-0.23.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15.0.1_9-jdk-openj9-0.23.0, 15-jdk-openj9, 15-openj9, openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jre-hotspot-bionic, 15-jre-hotspot-bionic
-SharedTags: 15_36-jre-hotspot, 15-jre-hotspot, latest
+Tags: 15.0.1_9-jre-hotspot-focal, 15-jre-hotspot-focal
+SharedTags: 15.0.1_9-jre-hotspot, 15-jre-hotspot, 15-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 15_36-jre-hotspot-windowsservercore-1809, 15-jre-hotspot-windowsservercore-1809
-SharedTags: 15_36-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15_36-jre-hotspot, 15-jre-hotspot, latest
+Tags: 15.0.1_9-jre-hotspot-windowsservercore-1809, 15-jre-hotspot-windowsservercore-1809
+SharedTags: 15.0.1_9-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.1_9-jre-hotspot, 15-jre-hotspot, 15-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jre-hotspot-windowsservercore-ltsc2016, 15-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 15_36-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15_36-jre-hotspot, 15-jre-hotspot, latest
+Tags: 15.0.1_9-jre-hotspot-windowsservercore-ltsc2016, 15-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.1_9-jre-hotspot, 15-jre-hotspot, 15-jre
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15_36-jre-openj9-0.22.0-bionic, 15-jre-openj9-bionic
-SharedTags: 15_36-jre-openj9-0.22.0, 15-jre-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+Tags: 15.0.1_9-jre-openj9-0.23.0-focal, 15-jre-openj9-focal
+SharedTags: 15.0.1_9-jre-openj9-0.23.0, 15-jre-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 15_36-jre-openj9-0.22.0-windowsservercore-1809, 15-jre-openj9-windowsservercore-1809
-SharedTags: 15_36-jre-openj9-0.22.0-windowsservercore, 15-jre-openj9-windowsservercore, 15_36-jre-openj9-0.22.0, 15-jre-openj9
+Tags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore-1809, 15-jre-openj9-windowsservercore-1809
+SharedTags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.1_9-jre-openj9-0.23.0, 15-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15_36-jre-openj9-0.22.0-windowsservercore-ltsc2016, 15-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 15_36-jre-openj9-0.22.0-windowsservercore, 15-jre-openj9-windowsservercore, 15_36-jre-openj9-0.22.0, 15-jre-openj9
+Tags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore-ltsc2016, 15-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 15.0.1_9-jre-openj9-0.23.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.1_9-jre-openj9-0.23.0, 15-jre-openj9
 Architectures: windows-amd64
-GitCommit: 6b25b910101cc3772d688d7aea0755ee3db51e2e
+GitCommit: 9b88ff88450a006bb669e4def8dab866e56baad9
 Directory: 15/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 20af45a..a421907 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,261 +1,224 @@
-adoptopenjdk:8u265-b01-jdk-hotspot
-adoptopenjdk:8u265-b01-jdk-hotspot-bionic
-adoptopenjdk:8u265-b01-jdk-hotspot-windowsservercore
-adoptopenjdk:8u265-b01-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:8u265-b01-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-bionic
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-windowsservercore
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:8u265-b01-jdk-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:8u265-b01-jre-hotspot
-adoptopenjdk:8u265-b01-jre-hotspot-bionic
-adoptopenjdk:8u265-b01-jre-hotspot-windowsservercore
-adoptopenjdk:8u265-b01-jre-hotspot-windowsservercore-1809
-adoptopenjdk:8u265-b01-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-bionic
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-windowsservercore
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:8u265-b01-jre-openj9-0.21.0-windowsservercore-ltsc2016
+adoptopenjdk:8
+adoptopenjdk:8u272-b10-jdk-hotspot
+adoptopenjdk:8u272-b10-jdk-hotspot-focal
+adoptopenjdk:8u272-b10-jdk-hotspot-windowsservercore
+adoptopenjdk:8u272-b10-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:8u272-b10-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-focal
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-windowsservercore
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:8u272-b10-jdk-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jre-hotspot
+adoptopenjdk:8u272-b10-jre-hotspot-focal
+adoptopenjdk:8u272-b10-jre-hotspot-windowsservercore
+adoptopenjdk:8u272-b10-jre-hotspot-windowsservercore-1809
+adoptopenjdk:8u272-b10-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-focal
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-windowsservercore
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:8u272-b10-jre-openj9-0.23.0-windowsservercore-ltsc2016
 adoptopenjdk:8-hotspot
-adoptopenjdk:8-hotspot-bionic
+adoptopenjdk:8-hotspot-focal
 adoptopenjdk:8-hotspot-windowsservercore
 adoptopenjdk:8-hotspot-windowsservercore-1809
 adoptopenjdk:8-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:8-jdk
 adoptopenjdk:8-jdk-hotspot
-adoptopenjdk:8-jdk-hotspot-bionic
+adoptopenjdk:8-jdk-hotspot-focal
 adoptopenjdk:8-jdk-hotspot-windowsservercore
 adoptopenjdk:8-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:8-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:8-jdk-openj9
-adoptopenjdk:8-jdk-openj9-bionic
+adoptopenjdk:8-jdk-openj9-focal
 adoptopenjdk:8-jdk-openj9-windowsservercore
 adoptopenjdk:8-jdk-openj9-windowsservercore-1809
 adoptopenjdk:8-jdk-openj9-windowsservercore-ltsc2016
+adoptopenjdk:8-jre
 adoptopenjdk:8-jre-hotspot
-adoptopenjdk:8-jre-hotspot-bionic
+adoptopenjdk:8-jre-hotspot-focal
 adoptopenjdk:8-jre-hotspot-windowsservercore
 adoptopenjdk:8-jre-hotspot-windowsservercore-1809
 adoptopenjdk:8-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:8-jre-openj9
-adoptopenjdk:8-jre-openj9-bionic
+adoptopenjdk:8-jre-openj9-focal
 adoptopenjdk:8-jre-openj9-windowsservercore
 adoptopenjdk:8-jre-openj9-windowsservercore-1809
 adoptopenjdk:8-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:8-openj9
-adoptopenjdk:8-openj9-bionic
+adoptopenjdk:8-openj9-focal
 adoptopenjdk:8-openj9-windowsservercore
 adoptopenjdk:8-openj9-windowsservercore-1809
 adoptopenjdk:8-openj9-windowsservercore-ltsc2016
+adoptopenjdk:11
 adoptopenjdk:11-hotspot
-adoptopenjdk:11-hotspot-bionic
+adoptopenjdk:11-hotspot-focal
 adoptopenjdk:11-hotspot-windowsservercore
 adoptopenjdk:11-hotspot-windowsservercore-1809
 adoptopenjdk:11-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:11-jdk
 adoptopenjdk:11-jdk-hotspot
-adoptopenjdk:11-jdk-hotspot-bionic
+adoptopenjdk:11-jdk-hotspot-focal
 adoptopenjdk:11-jdk-hotspot-windowsservercore
 adoptopenjdk:11-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:11-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:11-jdk-openj9
-adoptopenjdk:11-jdk-openj9-bionic
+adoptopenjdk:11-jdk-openj9-focal
 adoptopenjdk:11-jdk-openj9-windowsservercore
 adoptopenjdk:11-jdk-openj9-windowsservercore-1809
 adoptopenjdk:11-jdk-openj9-windowsservercore-ltsc2016
+adoptopenjdk:11-jre
 adoptopenjdk:11-jre-hotspot
-adoptopenjdk:11-jre-hotspot-bionic
+adoptopenjdk:11-jre-hotspot-focal
 adoptopenjdk:11-jre-hotspot-windowsservercore
 adoptopenjdk:11-jre-hotspot-windowsservercore-1809
 adoptopenjdk:11-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:11-jre-openj9
-adoptopenjdk:11-jre-openj9-bionic
+adoptopenjdk:11-jre-openj9-focal
 adoptopenjdk:11-jre-openj9-windowsservercore
 adoptopenjdk:11-jre-openj9-windowsservercore-1809
 adoptopenjdk:11-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:11-openj9
-adoptopenjdk:11-openj9-bionic
+adoptopenjdk:11-openj9-focal
 adoptopenjdk:11-openj9-windowsservercore
 adoptopenjdk:11-openj9-windowsservercore-1809
 adoptopenjdk:11-openj9-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jdk-hotspot
-adoptopenjdk:11.0.8_10-jdk-hotspot-bionic
-adoptopenjdk:11.0.8_10-jdk-hotspot-windowsservercore
-adoptopenjdk:11.0.8_10-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-bionic
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-windowsservercore
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jdk-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jre-hotspot
-adoptopenjdk:11.0.8_10-jre-hotspot-bionic
-adoptopenjdk:11.0.8_10-jre-hotspot-windowsservercore
-adoptopenjdk:11.0.8_10-jre-hotspot-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-bionic
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-windowsservercore
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:11.0.8_10-jre-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:13-hotspot
-adoptopenjdk:13-hotspot-bionic
-adoptopenjdk:13-hotspot-windowsservercore
-adoptopenjdk:13-hotspot-windowsservercore-1809
-adoptopenjdk:13-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13-jdk-hotspot
-adoptopenjdk:13-jdk-hotspot-bionic
-adoptopenjdk:13-jdk-hotspot-windowsservercore
-adoptopenjdk:13-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:13-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13-jdk-openj9
-adoptopenjdk:13-jdk-openj9-bionic
-adoptopenjdk:13-jdk-openj9-windowsservercore
-adoptopenjdk:13-jdk-openj9-windowsservercore-1809
-adoptopenjdk:13-jdk-openj9-windowsservercore-ltsc2016
-adoptopenjdk:13-jre-hotspot
-adoptopenjdk:13-jre-hotspot-bionic
-adoptopenjdk:13-jre-hotspot-windowsservercore
-adoptopenjdk:13-jre-hotspot-windowsservercore-1809
-adoptopenjdk:13-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13-jre-openj9
-adoptopenjdk:13-jre-openj9-bionic
-adoptopenjdk:13-jre-openj9-windowsservercore
-adoptopenjdk:13-jre-openj9-windowsservercore-1809
-adoptopenjdk:13-jre-openj9-windowsservercore-ltsc2016
-adoptopenjdk:13-openj9
-adoptopenjdk:13-openj9-bionic
-adoptopenjdk:13-openj9-windowsservercore
-adoptopenjdk:13-openj9-windowsservercore-1809
-adoptopenjdk:13-openj9-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jdk-hotspot
-adoptopenjdk:13.0.2_8-jdk-hotspot-bionic
-adoptopenjdk:13.0.2_8-jdk-hotspot-windowsservercore
-adoptopenjdk:13.0.2_8-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-bionic
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-windowsservercore
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jdk-openj9-0.18.0-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jre-hotspot
-adoptopenjdk:13.0.2_8-jre-hotspot-bionic
-adoptopenjdk:13.0.2_8-jre-hotspot-windowsservercore
-adoptopenjdk:13.0.2_8-jre-hotspot-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-bionic
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-windowsservercore
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-windowsservercore-1809
-adoptopenjdk:13.0.2_8-jre-openj9-0.18.0-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jdk-hotspot
+adoptopenjdk:11.0.9_11-jdk-hotspot-focal
+adoptopenjdk:11.0.9_11-jdk-hotspot-windowsservercore
+adoptopenjdk:11.0.9_11-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-focal
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-windowsservercore
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jdk-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jre-hotspot
+adoptopenjdk:11.0.9_11-jre-hotspot-focal
+adoptopenjdk:11.0.9_11-jre-hotspot-windowsservercore
+adoptopenjdk:11.0.9_11-jre-hotspot-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-focal
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-windowsservercore
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:11.0.9_11-jre-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:14
 adoptopenjdk:14-hotspot
-adoptopenjdk:14-hotspot-bionic
+adoptopenjdk:14-hotspot-focal
 adoptopenjdk:14-hotspot-windowsservercore
 adoptopenjdk:14-hotspot-windowsservercore-1809
 adoptopenjdk:14-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:14-jdk
 adoptopenjdk:14-jdk-hotspot
-adoptopenjdk:14-jdk-hotspot-bionic
+adoptopenjdk:14-jdk-hotspot-focal
 adoptopenjdk:14-jdk-hotspot-windowsservercore
 adoptopenjdk:14-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:14-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14-jdk-openj9
-adoptopenjdk:14-jdk-openj9-bionic
+adoptopenjdk:14-jdk-openj9-focal
 adoptopenjdk:14-jdk-openj9-windowsservercore
 adoptopenjdk:14-jdk-openj9-windowsservercore-1809
 adoptopenjdk:14-jdk-openj9-windowsservercore-ltsc2016
+adoptopenjdk:14-jre
 adoptopenjdk:14-jre-hotspot
-adoptopenjdk:14-jre-hotspot-bionic
+adoptopenjdk:14-jre-hotspot-focal
 adoptopenjdk:14-jre-hotspot-windowsservercore
 adoptopenjdk:14-jre-hotspot-windowsservercore-1809
 adoptopenjdk:14-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14-jre-openj9
-adoptopenjdk:14-jre-openj9-bionic
+adoptopenjdk:14-jre-openj9-focal
 adoptopenjdk:14-jre-openj9-windowsservercore
 adoptopenjdk:14-jre-openj9-windowsservercore-1809
 adoptopenjdk:14-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:14-openj9
-adoptopenjdk:14-openj9-bionic
+adoptopenjdk:14-openj9-focal
 adoptopenjdk:14-openj9-windowsservercore
 adoptopenjdk:14-openj9-windowsservercore-1809
 adoptopenjdk:14-openj9-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jdk-hotspot
-adoptopenjdk:14.0.2_12-jdk-hotspot-bionic
+adoptopenjdk:14.0.2_12-jdk-hotspot-focal
 adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore
 adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-bionic
+adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-focal
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jre-hotspot
-adoptopenjdk:14.0.2_12-jre-hotspot-bionic
+adoptopenjdk:14.0.2_12-jre-hotspot-focal
 adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore
 adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-bionic
+adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-focal
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore-1809
 adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore-ltsc2016
+adoptopenjdk:15
 adoptopenjdk:15-hotspot
-adoptopenjdk:15-hotspot-bionic
+adoptopenjdk:15-hotspot-focal
 adoptopenjdk:15-hotspot-windowsservercore
 adoptopenjdk:15-hotspot-windowsservercore-1809
 adoptopenjdk:15-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:15-jdk
 adoptopenjdk:15-jdk-hotspot
-adoptopenjdk:15-jdk-hotspot-bionic
+adoptopenjdk:15-jdk-hotspot-focal
 adoptopenjdk:15-jdk-hotspot-windowsservercore
 adoptopenjdk:15-jdk-hotspot-windowsservercore-1809
 adoptopenjdk:15-jdk-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:15-jdk-openj9
-adoptopenjdk:15-jdk-openj9-bionic
+adoptopenjdk:15-jdk-openj9-focal
 adoptopenjdk:15-jdk-openj9-windowsservercore
 adoptopenjdk:15-jdk-openj9-windowsservercore-1809
 adoptopenjdk:15-jdk-openj9-windowsservercore-ltsc2016
+adoptopenjdk:15-jre
 adoptopenjdk:15-jre-hotspot
-adoptopenjdk:15-jre-hotspot-bionic
+adoptopenjdk:15-jre-hotspot-focal
 adoptopenjdk:15-jre-hotspot-windowsservercore
 adoptopenjdk:15-jre-hotspot-windowsservercore-1809
 adoptopenjdk:15-jre-hotspot-windowsservercore-ltsc2016
 adoptopenjdk:15-jre-openj9
-adoptopenjdk:15-jre-openj9-bionic
+adoptopenjdk:15-jre-openj9-focal
 adoptopenjdk:15-jre-openj9-windowsservercore
 adoptopenjdk:15-jre-openj9-windowsservercore-1809
 adoptopenjdk:15-jre-openj9-windowsservercore-ltsc2016
 adoptopenjdk:15-openj9
-adoptopenjdk:15-openj9-bionic
+adoptopenjdk:15-openj9-focal
 adoptopenjdk:15-openj9-windowsservercore
 adoptopenjdk:15-openj9-windowsservercore-1809
 adoptopenjdk:15-openj9-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jdk-hotspot
-adoptopenjdk:15_36-jdk-hotspot-bionic
-adoptopenjdk:15_36-jdk-hotspot-windowsservercore
-adoptopenjdk:15_36-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:15_36-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jdk-openj9-0.22.0
-adoptopenjdk:15_36-jdk-openj9-0.22.0-bionic
-adoptopenjdk:15_36-jdk-openj9-0.22.0-windowsservercore
-adoptopenjdk:15_36-jdk-openj9-0.22.0-windowsservercore-1809
-adoptopenjdk:15_36-jdk-openj9-0.22.0-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jre-hotspot
-adoptopenjdk:15_36-jre-hotspot-bionic
-adoptopenjdk:15_36-jre-hotspot-windowsservercore
-adoptopenjdk:15_36-jre-hotspot-windowsservercore-1809
-adoptopenjdk:15_36-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:15_36-jre-openj9-0.22.0
-adoptopenjdk:15_36-jre-openj9-0.22.0-bionic
-adoptopenjdk:15_36-jre-openj9-0.22.0-windowsservercore
-adoptopenjdk:15_36-jre-openj9-0.22.0-windowsservercore-1809
-adoptopenjdk:15_36-jre-openj9-0.22.0-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jdk-hotspot
+adoptopenjdk:15.0.1_9-jdk-hotspot-focal
+adoptopenjdk:15.0.1_9-jdk-hotspot-windowsservercore
+adoptopenjdk:15.0.1_9-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-focal
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-windowsservercore
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jdk-openj9-0.23.0-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jre-hotspot
+adoptopenjdk:15.0.1_9-jre-hotspot-focal
+adoptopenjdk:15.0.1_9-jre-hotspot-windowsservercore
+adoptopenjdk:15.0.1_9-jre-hotspot-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-focal
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-windowsservercore
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-windowsservercore-1809
+adoptopenjdk:15.0.1_9-jre-openj9-0.23.0-windowsservercore-ltsc2016
 adoptopenjdk:hotspot
-adoptopenjdk:hotspot-bionic
+adoptopenjdk:hotspot-focal
 adoptopenjdk:hotspot-windowsservercore
 adoptopenjdk:hotspot-windowsservercore-1809
 adoptopenjdk:hotspot-windowsservercore-ltsc2016
+adoptopenjdk:jdk
 adoptopenjdk:latest
 adoptopenjdk:openj9
-adoptopenjdk:openj9-bionic
+adoptopenjdk:openj9-focal
 adoptopenjdk:openj9-windowsservercore
 adoptopenjdk:openj9-windowsservercore-1809
 adoptopenjdk:openj9-windowsservercore-ltsc2016
diff --git a/adoptopenjdk_11-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 69%
rename from adoptopenjdk_11-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_11-hotspot-focal/Dockerfile.hotspot.releases.full
index db96e3c..625fbd7 100644
--- a/adoptopenjdk_11-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='fb27ea52ed901c14c9fe8ad2fc10b338b8cf47d6762571be1fe3fb7c426bab7c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='d00370967e4657e137cc511e81d6accbfdb08dba91e6268abef8219e735fbfc5'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='d206a63cd719b65717f7f20ee3fe49f0b8b2db922986b4811c828db57212699e'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='5c619e9acc182b0e40391c8c378ede120bb4ef7b8f0312d582d7aa1ecc684bd6'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='5619e1437c7cd400169eb7f1c831c2635fdb2776a401147a2fc1841b01f83ed6'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='e5cf6026a37db22133c671e4643e9735f8a9e8b85aa5a30f0dbeac8367d0a6a7'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='6e4cead158037cb7747ca47416474d4f408c9126be5b96f9befd532e0a762b47'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index b1db662..16ebfce 100644
--- a/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (631fcb658a7431d8f01f9c10e1eaf0e8c74ae609fa1aa9a0cf27c2305ab3431d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '631fcb658a7431d8f01f9c10e1eaf0e8c74ae609fa1aa9a0cf27c2305ab3431d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 21a28db..81f3c73 100644
--- a/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '148b487e0dde39ec5c0f32aa2397c17968b6cf6818822cea2b2394dfd0157396') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (631fcb658a7431d8f01f9c10e1eaf0e8c74ae609fa1aa9a0cf27c2305ab3431d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '631fcb658a7431d8f01f9c10e1eaf0e8c74ae609fa1aa9a0cf27c2305ab3431d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 69%
rename from adoptopenjdk_11-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_11-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index 4f42896..d6d157d 100644
--- a/adoptopenjdk_11-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='286c869dbaefda9b470ae71d1250fdecf9f06d8da97c0f7df9021d381d749106'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='ffa627b2d0c6001448bb8f1f24f7c9921dad37e67637f6ed0a9a479e680a3393'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='89231e1667d7cc4202d1a401497bb287d4eb12281c90c17e2570211cc4e901a3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='0af961d70523d95e4b42cc74646653294e8d9eb51e9e7538f8e8c4b61a4d1ac5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='dc0e715c17abcb12bedf77c638e58e67d828d3c4bf24a898f0d4b053caaeb25f'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_s390x_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='aab4b30307da51cdbcd266a35bf21e7cd2c981fc472441bec7a7b316c45fc86c'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_s390x_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='98615b1b369509965a612232622d39b5cefe117d6189179cbad4dcef2ee2f4e1'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz'; \
+         ESUM='2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index 63eb586..1171dce 100644
--- a/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (d9d155ff0d58c2f821a30f88e0e0d7dfc8a4942c7563d277484c1ae77077fb3e) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd9d155ff0d58c2f821a30f88e0e0d7dfc8a4942c7563d277484c1ae77077fb3e') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 8dca7f7..36c9da4 100644
--- a/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_11-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10
+ENV JAVA_VERSION jdk-11.0.9+11
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jre_x64_windows_hotspot_11.0.8_10.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c94202eec5a406bf86352270cb0c9c17cb6c3ffc9c7d78c41e67b181e1d6f151') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_windows_hotspot_11.0.9_11.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (d9d155ff0d58c2f821a30f88e0e0d7dfc8a4942c7563d277484c1ae77077fb3e) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd9d155ff0d58c2f821a30f88e0e0d7dfc8a4942c7563d277484c1ae77077fb3e') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_11-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 85%
rename from adoptopenjdk_11-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_11-jre-openj9-focal/Dockerfile.openj9.releases.full
index fd88c73..fe94f8d 100644
--- a/adoptopenjdk_11-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,26 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='9771cd3e486697c5b7188ea81d1c32ad89cb007499fe8e1173ca491412b5d503'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='2d65c778d9b0116baa832f8c238470052e3c9eca930eeec8a717de1bb8454828'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='256a01e045867dcbbc541a6dd95ed315599f737b278319c4b936ce5a8a464424'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='4e44051683689efe25e00181bc09525aa378aea85e2ab03ab114c942c0abc999'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='91b74f434a3d7000dac788693f0b1e5288bd99c9bc6ef345ba6e165957defcf3'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='7cc4b24e2ac0ed26bf3ec31241bde65b672952bf0df5e1606b263fadcb21b3b7'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 00b380f..b3d0feb 100644
--- a/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 846a7c0..a79d519 100644
--- a/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jre_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'de1caf30e81fbdc0e128e3e3360cd6245b6dd7b0857224604a810dde47061152') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '780cb9f4aa34493d6ce555983957b04514da630901004242c1d8f70ba46cbcf8') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_11-openj9-focal/Dockerfile.openj9.releases.full
similarity index 85%
rename from adoptopenjdk_11-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_11-openj9-focal/Dockerfile.openj9.releases.full
index d36a01c..1736f7b 100644
--- a/adoptopenjdk_11-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,26 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='b4bad13c0d9c2fbb1954fcddae9ccc5a32c609f2b48bf43ecaa5f39915390604'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='5bcaa2075ce5bf634b542c04ea79b9ca505407b6f94d2d8350c712da387120d9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='acef470ed75f6938168c39b4397fc80ef0d4e12adf1b73e359c84233c08d30e3'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='5e89692057fb8dfcb8e215fd3917b721fdb721c1eeea2b14948f4782413846bb'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='ac876b8136b977f2c167909b9698ebf4667d19f4d9eca89516f10882e1f05026'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='9ab79436180d41809f4fca8afe43e778ae2d82c7b50f3653c62d7a2728150836'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz'; \
+         ESUM='812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 247d90b..f00b6db 100644
--- a/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index eb4dd09..7d1c11d 100644
--- a/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_11-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-11.0.8+10_openj9-0.21.0
+ENV JAVA_VERSION jdk-11.0.9+11_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10_openj9-0.21.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.8_10_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7250326e5fad877da447bc1e37dfbfcaca18b10f1acc82ffc557a9421dc068bf') { \
+    wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.9_11_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c4885100b0565a63dc3e21a47c6e344ea863ec533d67664e06494385c5923cb3') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_13-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-hotspot-bionic/Dockerfile.hotspot.releases.full
deleted file mode 100644
index b17482d..0000000
diff --git a/adoptopenjdk_13-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
deleted file mode 100644
index a438c2a..0000000
diff --git a/adoptopenjdk_13-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
deleted file mode 100644
index ceeab95..0000000
diff --git a/adoptopenjdk_13-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
deleted file mode 100644
index b1f58d2..0000000
diff --git a/adoptopenjdk_13-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
deleted file mode 100644
index 0e1691f..0000000
diff --git a/adoptopenjdk_13-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_13-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
deleted file mode 100644
index a6ba70a..0000000
diff --git a/adoptopenjdk_13-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_13-jre-openj9-bionic/Dockerfile.openj9.releases.full
deleted file mode 100644
index b8415da..0000000
diff --git a/adoptopenjdk_13-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_13-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
deleted file mode 100644
index 8769114..0000000
diff --git a/adoptopenjdk_13-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_13-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
deleted file mode 100644
index 5769db2..0000000
diff --git a/adoptopenjdk_13-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_13-openj9-bionic/Dockerfile.openj9.releases.full
deleted file mode 100644
index 59cc004..0000000
diff --git a/adoptopenjdk_13-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_13-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
deleted file mode 100644
index 96e3b6b..0000000
diff --git a/adoptopenjdk_13-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_13-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
deleted file mode 100644
index 89b2f07..0000000
diff --git a/adoptopenjdk_14-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 99%
rename from adoptopenjdk_14-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
index b9cfc0c..93b4243 100644
--- a/adoptopenjdk_14-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_14-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 99%
rename from adoptopenjdk_14-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index 7d8bbb0..c3f04ca 100644
--- a/adoptopenjdk_14-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_14-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 99%
rename from adoptopenjdk_14-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
index 9479f48..77b7893 100644
--- a/adoptopenjdk_14-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_14-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
similarity index 99%
rename from adoptopenjdk_14-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
index 143cfbb..5148412 100644
--- a/adoptopenjdk_14-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
diff --git a/adoptopenjdk_15-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 69%
rename from adoptopenjdk_15-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index f291f7c..88f2f59 100644
--- a/adoptopenjdk_15-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='318f50bae6652d4468ee262ce0fd6569adbc461bea0d1ecce77ce2843efee8d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_aarch64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='09c1ba3636e7899d8b43795d7988bcc4b1e1be2919764d94f6d4a1a855ce774f'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_arm_linux_hotspot_15_36.tar.gz'; \
+         ESUM='f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='6ea692c7e43bee201a56313bd9f4ddcdea43bed1dfe203c49316ac4d08a4cdd3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_ppc64le_linux_hotspot_15_36.tar.gz'; \
+         ESUM='e759661cf8b41cecd61709ce14d2169d607288f2efc62739cb2c690605a5a28b'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='e1e124a29e2bf892d267eb63d00dd136558b4e276bcb6741ea676c995b2fff51'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_s390x_linux_hotspot_15_36.tar.gz'; \
+         ESUM='47e57b1b67627312e34f911c29a0b7970bef734308db1e413fe53376ed894f3a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_s390x_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='230d97a6b16a0735f15013a91f7582a22282ec12bdfaec291ab63274cc075efb'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index b3d622e..2e80f09 100644
--- a/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_15-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (d14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 98f4a11..a1d4740 100644
--- a/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_15-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jre_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (d14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd14250fb3ed06d6421c6b2e04ae266b436138213eea2fe4ddc3640df8064d9bc') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '01bfb5bb0e73ae2a25ef55d727ef13871ac7b8fc69966ee9e817135853d63012') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_15-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_15-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 84%
rename from adoptopenjdk_15-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_15-jre-openj9-focal/Dockerfile.openj9.releases.full
index 9454bc3..07a28eb 100644
--- a/adoptopenjdk_15-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_15-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
+         ;; \
        ppc64el|ppc64le) \
-         ESUM='fef3e6034a861b0bfa14120f064373d866b65f3525b9c791a647010194eb5632'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_ppc64le_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='ea9e8225edb9fee7c425983fd8bb370327867dd06f4c9763834bde9977bfa81f'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='5f5a6a46a432af651d63538997b0850fed9f631ab4a797e29d33347d3052fddc'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_s390x_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='b430f9b59d909867b05cbec1da2c7e49793838fcc5056f01a8203e09a77e5a76'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_s390x_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='3811aea0eeaccd4aa50bbf6a374e31b19f52a22c1f2c8b378e8ea0ac194b8638'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index dc5accf..45f4eb3 100644
--- a/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_15-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 8aea245..9fd7ba7 100644
--- a/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_15-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jre_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '78b7f6950c5afafa99164644f8dc85cd05d653964e828b52ea1916a3e27b7e61') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '921c4f8ec53b91b77f6f30ba182474cf53eb937e2edc944ba9f3f6a4262450ea') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 67%
rename from adoptopenjdk_8-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_8-hotspot-focal/Dockerfile.hotspot.releases.full
index 702b190..39295a5 100644
--- a/adoptopenjdk_8-jre-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='2f9c5be1bf704f1233bcf96b8c02524c14dc4d43dc80c4926856091961b79948'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_aarch64_linux_hotspot_8u265b01.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='4ac2503725b2729ec245dbdb000b2486f9c73ae86860c9525f9ac822ec81f0d6'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_arm_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='4fb3640fae4b9bd4ebf834c775b547ed930cd1b805f4686223994480411aee72'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_ppc64le_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='56cccbff1073aba7637d7d71da2d8469a1db0be994176acaa44055396cefaef9'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='8b76480c809c4fde654ab55d10371c35d70b50069ab1724960509d99ed61065d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_s390x_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='a40e1ff112b7c2115c4525edaf6739276a6f3b96beb3221f70bde32aa6f2ab7d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='9bce39f63d24626da75778f240294fa466a0ed117e32db798164621fe30b0723'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index 7f626b3..247acee 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 1ce974f..cfcaab7 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '3749bfd8dcc4ce3877a5b593f7df8fe05d7294435b62a919be35a003c559e033') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '71b6ca8f866bf604e6d4fbe29884bbfd815ffcf1dd2dbbc82c8f33b9c0485c9d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 67%
rename from adoptopenjdk_8-hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_8-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index e3c718d..2a791f0 100644
--- a/adoptopenjdk_8-hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='87d16dac293d2a9abbb559a277bfaded702f28d1bfdc526f8613bb9cfed84a12'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='dc3405aab81f422b7721f665c76371bd7b03c291eea89cd110a82d8bcf07809a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='7bbb9d76458ee29bc5e2458b32a91b8c032ecffe6cb8500734ca41d2d8f5c9f3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='00f2fdc9b424b7ef27a1df1032ee7ea1e477d677a685936550d85db267f97c0d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='aca50f02d59169cb428d54501846b518edc9fff6a6f428459c72b4faa2b4abb0'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_s390x_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='7832e0cc1200e457abd2b964510a3b1c965c17824ad6728a5b3ab82c66088daa'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='1285da6278f2d38a790a21148d7e683f20de0799c44b937043830ef6b57f58c4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz'; \
+         ESUM='e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index f414d68..1521b2b 100644
--- a/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index 660a88c..b72726c 100644
--- a/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_8-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01
+ENV JAVA_VERSION jdk8u272-b10
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5a41ec5d781429b7364412fcb7a05bfd4dd633d9b5e67ab2cdf878ee5ed4c722') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_windows_hotspot_8u272b10.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '0352a5764514a9fa375d9ec9a487f7e0e1352e1b33988994f6393405a8506974') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 88%
rename from adoptopenjdk_8-jre-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
index ad4e102..be9344e 100644
--- a/adoptopenjdk_8-jre-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,22 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        ppc64el|ppc64le) \
-         ESUM='b1c91e757195b87d51027ea97fece00ac1adb9837b055e5f039dd45511fb3c0a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='57fd112b347255aeb85a9659397333314e1edf7457ddb5f9ffd7384bfc6d6a05'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='ec573cb2361b5fee3944387329d7859889d73c6c8a7d5f7ecf0d95503efda726'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_s390x_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='6e5d0eb867b00395e720e211c02f36308e36f953037f21483eb49ade35587103'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_s390x_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='0da0aad21f02b4f08f717647def8beafcf0116c36b195705416f46a1ab97f4de'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 1e463ce..0cb1597 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index da154b2..469036c 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jre_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6685611c930761f77f9499de8c992d67859887183e72aa67f3724dc81d3e2472') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7a0021f86d6a8f100e6d139e0f5e4c40b8af75809dc82b58b44dbcc479663355') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_8-openj9-focal/Dockerfile.openj9.releases.full
similarity index 88%
rename from adoptopenjdk_8-openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_8-openj9-focal/Dockerfile.openj9.releases.full
index df2b916..d0b7992 100644
--- a/adoptopenjdk_8-openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,22 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        ppc64el|ppc64le) \
-         ESUM='ad78af32749b40f9f1dcc7ba23aa5e0ac0e7b63edd355d56e766a04d7ab3b60c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='71f649a103e2abab58c062adc7cca0a60dca5feba1cb868cdf87bba1e1a9d333'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='54b9dbcf9f221a0c2ed469b3b5828b56b2cf22fbbf61f0b462b4a9db0737f7f7'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_s390x_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='893caadb7d61cfc895f40d35911ce4b3b400443de05f38c1936a91107271a68d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_s390x_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='88ff739005cbb012f3ee73d426bd75810ce7de551d08e555475a261d57e3ecbf'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_linux_openj9_8u265b01_openj9-0.21.0.tar.gz'; \
+         ESUM='ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 2549894..0e82790 100644
--- a/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index a2b57bf..8cc99bb 100644
--- a/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u265-b01_openj9-0.21.0
+ENV JAVA_VERSION jdk8u272-b10_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01_openj9-0.21.0/OpenJDK8U-jdk_x64_windows_openj9_8u265b01_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e766cba0e9712be33a6be2412a8f58cc2daa813512f90e58d7ab2ebceed4357') { \
+    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_windows_openj9_8u272b10_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '41cf00609db1291a16105e5284094638fb05522b43978e33bfd705a492768e40') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_hotspot-bionic/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 70%
rename from adoptopenjdk_hotspot-bionic/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
index 7cd3268..127272e 100644
--- a/adoptopenjdk_hotspot-bionic/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='44c8cd580f6e828f8fbb431a59b3c8f694da8c75adb7c311f7b6b9ed81c19c54'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_aarch64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='d7de37fee91fe098791d48ea2a880cf2789949665d6bc9a232380738f99c16a9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_arm_linux_hotspot_15_36.tar.gz'; \
+         ESUM='bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='537eb289a0fc56915078ff92616574b00b8ad0119543f5e4a817ede0e52c4030'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_ppc64le_linux_hotspot_15_36.tar.gz'; \
+         ESUM='bc5347c011025f9830a420f943f52b97ebf0fc642ebff9a25bf465d0a6f3f3b9'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='3e238ea4924f4dd2a8167c911a99b96ffdfb51e12f3969cffbdc0791a58d0cf2'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_s390x_linux_hotspot_15_36.tar.gz'; \
+         ESUM='d402e322841abc3c5c8b0352f08d54d6b5c25b7d6f81716401da266bcb1d1ff0'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='c198593d1b5188ee3570e2ca33c3bc004aaefbda2c11e68e58ae7296cf5c3982'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz'; \
+         ESUM='61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index e0c0d34..552ff25 100644
--- a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index d288c3c..34171da 100644
--- a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36
+ENV JAVA_VERSION jdk-15.0.1+9
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_windows_hotspot_15_36.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'e2ac92e686e52d8c76a831319ad721547d811d2e2e9b3a8fae47420652beb930') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_windows_hotspot_15.0.1_9.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7254fbe32e77a6cb8c6e36fd1da8ee0744fb323addb0bfda4c32a4d6cf9d22ce') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_openj9-bionic/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
similarity index 84%
rename from adoptopenjdk_openj9-bionic/Dockerfile.openj9.releases.full
rename to adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
index 1b40301..cc73c0e 100644
--- a/adoptopenjdk_openj9-bionic/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -27,22 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
+         ;; \
        ppc64el|ppc64le) \
-         ESUM='88058a977c63382b59b7aaaec08d656490494b2c9575ae787c873de1b2baeaca'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='26b083d7b1bcb31040210c02ce33b4fb28ed5ad92de72a3e681e51e04d6beb5c'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='1cb8366199635c82a58b2619483f84318e9ead5b542b52ffc355fb561adb0f14'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_s390x_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='477da764a43ce89408c2a81d1f56f7df064cd34b360c3fbf8e2028c2668c17a2'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_s390x_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='3f016e23a1fba0b1d29f03415c36d54a8a33480ce1d238fbef09d38c5a69eff7'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_linux_openj9_15_36_openj9-0.22.0.tar.gz'; \
+         ESUM='b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 70d6b68..4e93378 100644
--- a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 8c4a975..093ffeb 100644
--- a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15+36_openj9-0.22.0
+ENV JAVA_VERSION jdk-15.0.1+9_openj9-0.23.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36_openj9-0.22.0/OpenJDK15U-jdk_x64_windows_openj9_15_36_openj9-0.22.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '88dd04dc008ff18e09ad158046a650797ff8e5ce0f1880515e359c49f0fddd4e') { \
+    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.1_9_openj9-0.23.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '6745ab134f86bdb27154800fd0164a6d957c31a78a2cd812234d3c25639b0bf9') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \

@dinogun
Copy link
Contributor Author

dinogun commented Oct 28, 2020

(To be clear, this LGTM and I'm happy to merge it, but I want to make sure you're not changing your supported tags list just to fix this test, and have other reasons for doing so. )

The additional tags should be useful to end users and bring parity to the openjdk images (and most importantly dont break anything existing). So its actually good !

@tianon tianon merged commit 8e9f784 into docker-library:master Oct 28, 2020
@dinogun
Copy link
Contributor Author

dinogun commented Oct 28, 2020

Oh

I was planning to adapt the test to what AdoptOpenJDK provides, but if you prefer this solution, this is fine?
(I just needed some guidance on what assumptions are still OK for the test, but it sounds like building with JDK 8 is the winning ticket? Does that even work across OpenJ9 vs Hotspot? Any idea why javac --release 8 doesn't seem to work here?)

Need to debug this a bit, ideally this should have worked.

@yosifkit yosifkit mentioned this pull request Nov 4, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/adoptopenjdk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dinogun @tianon