Skip to content

21.0.0.3 release #9824

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
Merged
merged 2 commits into from
Mar 20, 2021
Merged

21.0.0.3 release #9824

merged 2 commits into from
Mar 20, 2021

Conversation

crpotter
Copy link
Contributor

Updates for the releases of both websphere-liberty and open-liberty 21.0.0.3.

@github-actions
Copy link

Diff for 276f674: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8b1b7d2..9a9a7af 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,12 +2,7 @@
 Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wraschke@us.ibm.com> (@wraschke), Arthur De Magalhaes <arthurdm@ca.ibm.com> (@arthurdm)
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: ce388adb04648887154867bba1ca0a6986fa635a
-
-Tags: 20.0.0.9-kernel-java8-openj9
-Architectures: amd64, ppc64le, s390x
-Directory: releases/20.0.0.9/kernel
-File: Dockerfile.ubuntu.adoptopenjdk8
+GitCommit: b1dbcedaacc014f39de1123c5432e33836c5430a
 
 Tags: 20.0.0.12-full-java8-openj9
 Architectures: amd64, ppc64le, s390x
@@ -29,24 +24,24 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/20.0.0.12/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.2-full-java8-openj9
+Tags: 21.0.0.3-full-java8-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.2/full
+Directory: releases/21.0.0.3/full
 File: Dockerfile.ubuntu.adoptopenjdk8
 
-Tags: 21.0.0.2-full-java11-openj9
+Tags: 21.0.0.3-full-java11-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.2/full
+Directory: releases/21.0.0.3/full
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.2-kernel-slim-java8-openj9
+Tags: 21.0.0.3-kernel-slim-java8-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.2/kernel-slim
+Directory: releases/21.0.0.3/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk8
 
-Tags: 21.0.0.2-kernel-slim-java11-openj9
+Tags: 21.0.0.3-kernel-slim-java11-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: releases/21.0.0.2/kernel-slim
+Directory: releases/21.0.0.3/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 Tags: beta
@@ -79,21 +74,12 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/latest/kernel-slim
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 20.0.0.9-full-java8-openj9
-Architectures: amd64, ppc64le, s390x
-Directory: releases/20.0.0.9/full
-File: Dockerfile.ubuntu.adoptopenjdk8
-
 
 # websphere-liberty
 Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wraschke@us.ibm.com> (@wraschke), Arthur De Magalhaes <arthurdm@ca.ibm.com> (@arthurdm)
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/WASdev/ci.docker.git
-GitCommit: 57924976c86e94651b23d0f5cd5673947085a8e1
-
-Tags: 20.0.0.9-kernel-java8-ibmjava
-Directory: ga/20.0.0.9/kernel
-File: Dockerfile.ubuntu.ibmjava8
+GitCommit: 63fced9324fd5f4f488fdaeb54c05fb9fd2e1428
 
 Tags: 20.0.0.12-kernel-java8-ibmjava
 Directory: ga/20.0.0.12/kernel
@@ -104,13 +90,13 @@ Architectures: amd64, ppc64le, s390x
 Directory: ga/20.0.0.12/kernel
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.2-kernel-java8-ibmjava
-Directory: ga/21.0.0.2/kernel
+Tags: 21.0.0.3-kernel-java8-ibmjava
+Directory: ga/21.0.0.3/kernel
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: 21.0.0.2-kernel-java11-openj9
+Tags: 21.0.0.3-kernel-java11-openj9
 Architectures: amd64, ppc64le, s390x
-Directory: ga/21.0.0.2/kernel
+Directory: ga/21.0.0.3/kernel
 File: Dockerfile.ubuntu.adoptopenjdk11
 
 Tags: kernel
@@ -122,10 +108,6 @@ Architectures: amd64, ppc64le, s390x
 Directory: ga/latest/kernel
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 20.0.0.9-full-java8-ibmjava
-Directory: ga/20.0.0.9/full
-File: Dockerfile.ubuntu.ibmjava8
-
 Tags: 20.0.0.12-full-java8-ibmjava
 Directory: ga/20.0.0.12/full
 File: Dockerfile.ubuntu.ibmjava8
@@ -135,15 +117,15 @@ Architectures: amd64, ppc64le, s390x
 Directory: ga/20.0.0.12/full
 File: Dockerfile.ubuntu.adoptopenjdk11
 
-Tags: 21.0.0.2-full-java8-ibmjava
-Directory: ga/21.0.0.2/full
+Tags: 21.0.0.3-full-java8-ibmjava
+Directory: ga/21.0.0.3/full
 File: Dockerfile.ubuntu.ibmjava8
 
 Tags: full, latest
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.ibmjava8
 
-Tags: full-java11-openj9, 21.0.0.2-full-java11-openj9
+Tags: full-java11-openj9, 21.0.0.3-full-java11-openj9
 Architectures: amd64, ppc64le, s390x
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.adoptopenjdk11
diff --git a/_bashbrew-list b/_bashbrew-list
index 595cfef..778d92e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,13 +1,11 @@
-open-liberty:20.0.0.9-full-java8-openj9
-open-liberty:20.0.0.9-kernel-java8-openj9
 open-liberty:20.0.0.12-full-java8-openj9
 open-liberty:20.0.0.12-full-java11-openj9
 open-liberty:20.0.0.12-kernel-slim-java8-openj9
 open-liberty:20.0.0.12-kernel-slim-java11-openj9
-open-liberty:21.0.0.2-full-java8-openj9
-open-liberty:21.0.0.2-full-java11-openj9
-open-liberty:21.0.0.2-kernel-slim-java8-openj9
-open-liberty:21.0.0.2-kernel-slim-java11-openj9
+open-liberty:21.0.0.3-full-java8-openj9
+open-liberty:21.0.0.3-full-java11-openj9
+open-liberty:21.0.0.3-kernel-slim-java8-openj9
+open-liberty:21.0.0.3-kernel-slim-java11-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:full
@@ -17,16 +15,14 @@ open-liberty:kernel-slim
 open-liberty:kernel-slim-java8-openj9
 open-liberty:kernel-slim-java11-openj9
 open-liberty:latest
-websphere-liberty:20.0.0.9-full-java8-ibmjava
-websphere-liberty:20.0.0.9-kernel-java8-ibmjava
 websphere-liberty:20.0.0.12-full-java8-ibmjava
 websphere-liberty:20.0.0.12-full-java11-openj9
 websphere-liberty:20.0.0.12-kernel-java8-ibmjava
 websphere-liberty:20.0.0.12-kernel-java11-openj9
-websphere-liberty:21.0.0.2-full-java8-ibmjava
-websphere-liberty:21.0.0.2-full-java11-openj9
-websphere-liberty:21.0.0.2-kernel-java8-ibmjava
-websphere-liberty:21.0.0.2-kernel-java11-openj9
+websphere-liberty:21.0.0.3-full-java8-ibmjava
+websphere-liberty:21.0.0.3-full-java11-openj9
+websphere-liberty:21.0.0.3-kernel-java8-ibmjava
+websphere-liberty:21.0.0.3-kernel-java11-openj9
 websphere-liberty:full
 websphere-liberty:full-java11-openj9
 websphere-liberty:kernel
diff --git a/open-liberty_20.0.0.9-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_20.0.0.9-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
deleted file mode 100644
index a0c3000..0000000
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_20.0.0.9-kernel-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
deleted file mode 100644
index baece35..0000000
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configure.sh b/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configure.sh
deleted file mode 100755
index 1038c5e..0000000
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
deleted file mode 100644
index cd9528c..0000000
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
deleted file mode 100644
index cfda62e..0000000
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
deleted file mode 100644
index 08c36e2..0000000
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
deleted file mode 100755
index 5c49ae8..0000000
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
deleted file mode 100755
index 39942eb..0000000
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
deleted file mode 100755
index cdf4188..0000000
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_21.0.0.3-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 97%
rename from open-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to open-liberty_21.0.0.3-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index b6c51d6..23eb456 100644
--- a/open-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_21.0.0.3-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=e12752af11badd166a8e9f35d80471b0d931e889
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/fixes/.gitkeep b/open-liberty_21.0.0.3-full-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.3-full-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.3-full-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_20.0.0.9-kernel-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.3-full-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_20.0.0.9-kernel-java8-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.3-full-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_21.0.0.3-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
similarity index 97%
rename from open-liberty_21.0.0.2-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
rename to open-liberty_21.0.0.3-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index ef5498f..ef0c8d3 100644
--- a/open-liberty_21.0.0.2-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_21.0.0.3-full-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=e12752af11badd166a8e9f35d80471b0d931e889
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/fixes/.gitkeep b/open-liberty_21.0.0.3-full-java8-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.3-full-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.3-full-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.2-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.3-full-java8-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java11-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.3-full-java8-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 95%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 176412f..a04e9ea 100644
--- a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=c9eef099515b0b083103338c5743daa43bfe5440
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -81,7 +81,7 @@ RUN mkdir /logs \
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
-    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea \
     && chown -R 1001:0 /opt/ol/wlp/output \
     && chmod -R g+rwx /opt/ol/wlp/output
 
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/fixes/.gitkeep b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/features.sh
similarity index 92%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/features.sh
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/features.sh
index ee52c10..17d4381 100755
--- a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/features.sh
+++ b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/features.sh
@@ -31,5 +31,5 @@ fi
 
 # Install necessary features using featureUtility
 featureUtility installServerFeatures --acceptLicense defaultServer --noCache
-find /opt/ol/wlp/lib /opt/ol/wlp/bin -perm -g=w -print0 | xargs -0 -r chmod -R g+rw
+find /opt/ol/wlp/lib /opt/ol/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw
 
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.3-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
similarity index 95%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 18f8365..f86da94 100644
--- a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=c9eef099515b0b083103338c5743daa43bfe5440
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -81,7 +81,7 @@ RUN mkdir /logs \
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
-    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea \
     && chown -R 1001:0 /opt/ol/wlp/output \
     && chmod -R g+rwx /opt/ol/wlp/output
 
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/fixes/.gitkeep b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/fixes/.gitkeep
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configure.sh
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configure.sh
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/features.sh b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/features.sh
similarity index 92%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/features.sh
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/features.sh
index ee52c10..17d4381 100755
--- a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/features.sh
+++ b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/features.sh
@@ -31,5 +31,5 @@ fi
 
 # Install necessary features using featureUtility
 featureUtility installServerFeatures --acceptLicense defaultServer --noCache
-find /opt/ol/wlp/lib /opt/ol/wlp/bin -perm -g=w -print0 | xargs -0 -r chmod -R g+rw
+find /opt/ol/wlp/lib /opt/ol/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw
 
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
rename to open-liberty_21.0.0.3-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11
index a9357b2..54a6eff 100644
--- a/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_beta-java11/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.3-beta
-ARG LIBERTY_SHA=bbeaa17c1000b08b5f3772ce974014f6f7c2ba48
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.4-beta
+ARG LIBERTY_SHA=072e005dd579196873a40ad0583cb5b4845de116
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
diff --git a/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8
index 851e26b..4843ba8 100644
--- a/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_beta/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.3-beta
-ARG LIBERTY_SHA=bbeaa17c1000b08b5f3772ce974014f6f7c2ba48
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.4-beta
+ARG LIBERTY_SHA=072e005dd579196873a40ad0583cb5b4845de116
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/beta/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
diff --git a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index b6c51d6..23eb456 100644
--- a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=e12752af11badd166a8e9f35d80471b0d931e889
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
diff --git a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 176412f..a04e9ea 100644
--- a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:11-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=c9eef099515b0b083103338c5743daa43bfe5440
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -81,7 +81,7 @@ RUN mkdir /logs \
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
-    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea \
     && chown -R 1001:0 /opt/ol/wlp/output \
     && chmod -R g+rwx /opt/ol/wlp/output
 
diff --git a/open-liberty_kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_kernel-slim-java11-openj9/helpers/build/features.sh
index ee52c10..17d4381 100755
--- a/open-liberty_kernel-slim-java11-openj9/helpers/build/features.sh
+++ b/open-liberty_kernel-slim-java11-openj9/helpers/build/features.sh
@@ -31,5 +31,5 @@ fi
 
 # Install necessary features using featureUtility
 featureUtility installServerFeatures --acceptLicense defaultServer --noCache
-find /opt/ol/wlp/lib /opt/ol/wlp/bin -perm -g=w -print0 | xargs -0 -r chmod -R g+rw
+find /opt/ol/wlp/lib /opt/ol/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw
 
diff --git a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
index 18f8365..f86da94 100644
--- a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=31206d5063125ab56b466e792b42092671147d62
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=c9eef099515b0b083103338c5743daa43bfe5440
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
@@ -81,7 +81,7 @@ RUN mkdir /logs \
 
 # Create a new SCC layer
 RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
-    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
+    && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache /output/workarea \
     && chown -R 1001:0 /opt/ol/wlp/output \
     && chmod -R g+rwx /opt/ol/wlp/output
 
diff --git a/open-liberty_kernel-slim-java8-openj9/helpers/build/features.sh b/open-liberty_kernel-slim-java8-openj9/helpers/build/features.sh
index ee52c10..17d4381 100755
--- a/open-liberty_kernel-slim-java8-openj9/helpers/build/features.sh
+++ b/open-liberty_kernel-slim-java8-openj9/helpers/build/features.sh
@@ -31,5 +31,5 @@ fi
 
 # Install necessary features using featureUtility
 featureUtility installServerFeatures --acceptLicense defaultServer --noCache
-find /opt/ol/wlp/lib /opt/ol/wlp/bin -perm -g=w -print0 | xargs -0 -r chmod -R g+rw
+find /opt/ol/wlp/lib /opt/ol/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw
 
diff --git a/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8 b/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
index ef5498f..ef0c8d3 100644
--- a/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
+++ b/open-liberty_latest/Dockerfile.ubuntu.adoptopenjdk8
@@ -1,7 +1,7 @@
 FROM adoptopenjdk:8-jre-openj9
-ARG LIBERTY_VERSION=21.0.0.2
-ARG LIBERTY_SHA=3f3d248227d8708da40447352d249c0d2b856fcc
-ARG LIBERTY_BUILD_LABEL=cl210220210209-1100
+ARG LIBERTY_VERSION=21.0.0.3
+ARG LIBERTY_SHA=e12752af11badd166a8e9f35d80471b0d931e889
+ARG LIBERTY_BUILD_LABEL=cl210320210309-1101
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 ARG LIBERTY_LICENSE_URL=https://raw.githubusercontent.com/OpenLiberty/open-liberty/master/LICENSE
 ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
diff --git a/websphere-liberty_20.0.0.9-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_20.0.0.9-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
deleted file mode 100644
index 7ee05ec..0000000
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
deleted file mode 100644
index 989d210..0000000
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configure.sh b/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configure.sh
deleted file mode 100755
index 34bfdc5..0000000
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/licenses/en.html b/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/licenses/en.html
deleted file mode 100644
index cc08280..0000000
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/licenses/non_ibm_license.html b/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/licenses/non_ibm_license.html
deleted file mode 100644
index 30d6cf2..0000000
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/licenses/notices.html b/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/licenses/notices.html
deleted file mode 100644
index 5e90e34..0000000
diff --git a/websphere-liberty_21.0.0.2-full-java8-ibmjava/server.xml b/websphere-liberty_21.0.0.2-full-java8-ibmjava/server.xml
deleted file mode 100644
index 9d0b33f..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/fixes/.gitkeep b/websphere-liberty_21.0.0.2-kernel-java11-openj9/fixes/.gitkeep
deleted file mode 100644
index a282fd2..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
deleted file mode 100644
index 61dddfc..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
deleted file mode 100644
index 4dd8f80..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
deleted file mode 100644
index db8dc6a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
deleted file mode 100644
index 5f6c605..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
deleted file mode 100644
index 2a2388a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
deleted file mode 100644
index a5b7d8a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
deleted file mode 100644
index f8fea3c..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
deleted file mode 100644
index e2ec72d..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
deleted file mode 100644
index a99b071..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
deleted file mode 100644
index d32a77c..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
deleted file mode 100644
index 874559d..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
deleted file mode 100644
index 4f5b0ce..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
deleted file mode 100644
index 0c2d8aa..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
deleted file mode 100644
index a26c00a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
deleted file mode 100644
index 1e96a50..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
deleted file mode 100644
index 50b4014..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
deleted file mode 100644
index f608d5c..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
deleted file mode 100644
index 783ce2d..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
deleted file mode 100644
index aedffbb..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
deleted file mode 100644
index 9d68389..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/fixes/.gitkeep b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/fixes/.gitkeep
deleted file mode 100644
index a282fd2..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
deleted file mode 100644
index 61dddfc..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
deleted file mode 100644
index 4dd8f80..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
deleted file mode 100644
index db8dc6a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
deleted file mode 100644
index 5f6c605..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
deleted file mode 100644
index 2a2388a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
deleted file mode 100644
index a5b7d8a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
deleted file mode 100644
index f8fea3c..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
deleted file mode 100644
index e2ec72d..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
deleted file mode 100644
index a99b071..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
deleted file mode 100644
index d32a77c..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
deleted file mode 100644
index d4872b5..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
deleted file mode 100644
index 874559d..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
deleted file mode 100644
index 4f5b0ce..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
deleted file mode 100644
index 976afbe..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
deleted file mode 100644
index f044723..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
deleted file mode 100644
index 0c2d8aa..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
deleted file mode 100644
index a26c00a..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
deleted file mode 100644
index 1e96a50..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
deleted file mode 100644
index 50b4014..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
deleted file mode 100644
index f608d5c..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
deleted file mode 100644
index 783ce2d..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
deleted file mode 100644
index 5304653..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
deleted file mode 100644
index aedffbb..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
deleted file mode 100644
index 9d68389..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
deleted file mode 100644
index 396987f..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
deleted file mode 100644
index 3a32393..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
deleted file mode 100755
index cf54d05..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/populate_scc.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/populate_scc.sh
deleted file mode 100755
index b7ea6f2..0000000
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
deleted file mode 100755
index 1b69519..0000000
diff --git a/websphere-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/websphere-liberty_21.0.0.3-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 100%
rename from websphere-liberty_21.0.0.2-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to websphere-liberty_21.0.0.3-full-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
diff --git a/websphere-liberty_20.0.0.9-full-java8-ibmjava/server.xml b/websphere-liberty_21.0.0.3-full-java11-openj9/server.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-full-java8-ibmjava/server.xml
rename to websphere-liberty_21.0.0.3-full-java11-openj9/server.xml
diff --git a/websphere-liberty_21.0.0.2-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_21.0.0.3-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 96%
rename from websphere-liberty_21.0.0.2-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
rename to websphere-liberty_21.0.0.3-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 71ef1d9..c1acb0a 100644
--- a/websphere-liberty_21.0.0.2-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_21.0.0.3-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:21.0.0.2-kernel-java8-ibmjava
+FROM websphere-liberty:21.0.0.3-kernel-java8-ibmjava
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_21.0.0.2-full-java11-openj9/server.xml b/websphere-liberty_21.0.0.3-full-java8-ibmjava/server.xml
similarity index 100%
rename from websphere-liberty_21.0.0.2-full-java11-openj9/server.xml
rename to websphere-liberty_21.0.0.3-full-java8-ibmjava/server.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/websphere-liberty_21.0.0.3-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
similarity index 92%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 4ba954f..8d4eb3c 100644
--- a/websphere-liberty_21.0.0.2-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/websphere-liberty_21.0.0.3-kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -16,21 +16,21 @@ FROM adoptopenjdk:11-jre-openj9
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
-ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
-ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
+ARG EN_SHA=1ada8dde94633b139876c01b15c2f47011108bbd38e9d498abe73c7f3682b22f
+ARG NON_IBM_SHA=a495097ac17101fa55a3b763225b4b814c7d2b3019e55922e095f31351790ed8
+ARG NOTICES_SHA=c50d7a288214bf29b9e1f01d10f9f43dce85c73829cc2030a7f398ff9bc0b075
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
       org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
-      org.opencontainers.image.version="21.0.0.2" \
-      org.opencontainers.image.revision="cl210220210209-1100" \
+      org.opencontainers.image.version="21.0.0.3" \
+      org.opencontainers.image.revision="cl210320210309-1101" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with AdoptOpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/WASdev/ci.docker#building-an-application-image" \
       org.opencontainers.image.title="IBM WebSphere Liberty"
 
 # Install WebSphere Liberty
-ENV LIBERTY_VERSION 21.0.0_02
+ENV LIBERTY_VERSION 21.0.0_03
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,8 @@ ENV PATH=/opt/ibm/wlp/bin:/opt/ibm/helpers/build:$PATH
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
       "ProductName"="WebSphere Application Server Liberty" \
-      "ProductVersion"="21.0.0.2" \
-      "BuildLabel"="cl210220210209-1100"
+      "ProductVersion"="21.0.0.3" \
+      "BuildLabel"="cl210320210309-1101"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/fixes/.gitkeep b/websphere-liberty_21.0.0.3-kernel-java11-openj9/fixes/.gitkeep
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/fixes/.gitkeep
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from open-liberty_21.0.0.2-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from open-liberty_21.0.0.2-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configure.sh
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/populate_scc.sh b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/populate_scc.sh
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/runtime/docker-server.sh b/websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
rename to websphere-liberty_21.0.0.3-kernel-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 92%
rename from websphere-liberty_21.0.0.2-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index 7b10433..3d0ae80 100644
--- a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -16,21 +16,21 @@ FROM ibmjava:8-jre
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
-ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
-ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
+ARG EN_SHA=1ada8dde94633b139876c01b15c2f47011108bbd38e9d498abe73c7f3682b22f
+ARG NON_IBM_SHA=a495097ac17101fa55a3b763225b4b814c7d2b3019e55922e095f31351790ed8
+ARG NOTICES_SHA=c50d7a288214bf29b9e1f01d10f9f43dce85c73829cc2030a7f398ff9bc0b075
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
       org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
-      org.opencontainers.image.version="21.0.0.2" \
-      org.opencontainers.image.revision="cl210220210209-1100" \
+      org.opencontainers.image.version="21.0.0.3" \
+      org.opencontainers.image.revision="cl210320210309-1101" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Ubuntu as the base OS.  For more information on this image please see https://github.com/WASdev/ci.docker#building-an-application-image" \
       org.opencontainers.image.title="IBM WebSphere Liberty"
 
 # Install WebSphere Liberty
-ENV LIBERTY_VERSION 21.0.0_02
+ENV LIBERTY_VERSION 21.0.0_03
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,8 @@ ENV PATH=/opt/ibm/wlp/bin:/opt/ibm/helpers/build:$PATH
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
       "ProductName"="WebSphere Application Server Liberty" \
-      "ProductVersion"="21.0.0.2" \
-      "BuildLabel"="cl210220210209-1100"
+      "ProductVersion"="21.0.0.3" \
+      "BuildLabel"="cl210320210309-1101"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/fixes/.gitkeep b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/fixes/.gitkeep
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/fixes/.gitkeep
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/fixes/.gitkeep
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
similarity index 100%
rename from websphere-liberty_20.0.0.9-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configure.sh b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configure.sh
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java8-ibmjava/helpers/build/configure.sh
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/configure.sh
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/populate_scc.sh
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/build/populate_scc.sh
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
similarity index 100%
rename from websphere-liberty_21.0.0.2-kernel-java11-openj9/helpers/runtime/docker-server.sh
rename to websphere-liberty_21.0.0.3-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11 b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
index 4ba954f..8d4eb3c 100644
--- a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
+++ b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.adoptopenjdk11
@@ -16,21 +16,21 @@ FROM adoptopenjdk:11-jre-openj9
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
-ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
-ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
+ARG EN_SHA=1ada8dde94633b139876c01b15c2f47011108bbd38e9d498abe73c7f3682b22f
+ARG NON_IBM_SHA=a495097ac17101fa55a3b763225b4b814c7d2b3019e55922e095f31351790ed8
+ARG NOTICES_SHA=c50d7a288214bf29b9e1f01d10f9f43dce85c73829cc2030a7f398ff9bc0b075
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
       org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
-      org.opencontainers.image.version="21.0.0.2" \
-      org.opencontainers.image.revision="cl210220210209-1100" \
+      org.opencontainers.image.version="21.0.0.3" \
+      org.opencontainers.image.revision="cl210320210309-1101" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with AdoptOpenJDK with OpenJ9 and Ubuntu as the base OS.  For more information on this image please see https://github.com/WASdev/ci.docker#building-an-application-image" \
       org.opencontainers.image.title="IBM WebSphere Liberty"
 
 # Install WebSphere Liberty
-ENV LIBERTY_VERSION 21.0.0_02
+ENV LIBERTY_VERSION 21.0.0_03
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,8 @@ ENV PATH=/opt/ibm/wlp/bin:/opt/ibm/helpers/build:$PATH
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
       "ProductName"="WebSphere Application Server Liberty" \
-      "ProductVersion"="21.0.0.2" \
-      "BuildLabel"="cl210220210209-1100"
+      "ProductVersion"="21.0.0.3" \
+      "BuildLabel"="cl210320210309-1101"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
index 7b10433..3d0ae80 100644
--- a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
@@ -16,21 +16,21 @@ FROM ibmjava:8-jre
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=ad2a4f13dd58fe7735d749651b9cd07f6d9f07bf0abe637640f3fb3a7956e25e
-ARG NON_IBM_SHA=1505b50145f790fd4537b678134b46412dcbf130641cbd9a4e539eb41d4bb481
-ARG NOTICES_SHA=1b88caf341b053446b5ba92a75d9f1ee3cf040ae0f13a279fa2dbaec4360b6f7
+ARG EN_SHA=1ada8dde94633b139876c01b15c2f47011108bbd38e9d498abe73c7f3682b22f
+ARG NON_IBM_SHA=a495097ac17101fa55a3b763225b4b814c7d2b3019e55922e095f31351790ed8
+ARG NOTICES_SHA=c50d7a288214bf29b9e1f01d10f9f43dce85c73829cc2030a7f398ff9bc0b075
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
       org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \
-      org.opencontainers.image.version="21.0.0.2" \
-      org.opencontainers.image.revision="cl210220210209-1100" \
+      org.opencontainers.image.version="21.0.0.3" \
+      org.opencontainers.image.revision="cl210320210309-1101" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Ubuntu as the base OS.  For more information on this image please see https://github.com/WASdev/ci.docker#building-an-application-image" \
       org.opencontainers.image.title="IBM WebSphere Liberty"
 
 # Install WebSphere Liberty
-ENV LIBERTY_VERSION 21.0.0_02
+ENV LIBERTY_VERSION 21.0.0_03
 
 ARG LIBERTY_URL
 ARG DOWNLOAD_OPTIONS=""
@@ -62,8 +62,8 @@ ENV PATH=/opt/ibm/wlp/bin:/opt/ibm/helpers/build:$PATH
 # Add labels for consumption by IBM Product Insights
 LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \
       "ProductName"="WebSphere Application Server Liberty" \
-      "ProductVersion"="21.0.0.2" \
-      "BuildLabel"="cl210220210209-1100"
+      "ProductVersion"="21.0.0.3" \
+      "BuildLabel"="cl210320210309-1101"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \

@yosifkit yosifkit merged commit 16b933a into docker-library:master Mar 20, 2021
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/open-liberty library/websphere-liberty
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@crpotter @yosifkit