Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

22.0.0.13 release #13779

Merged
merged 2 commits into from
Dec 21, 2022
Merged

22.0.0.13 release #13779

merged 2 commits into from
Dec 21, 2022

Conversation

crpotter
Copy link
Contributor

Updates to open-liberty and websphere-liberty for the release of 22.0.0.13.

@github-actions
Copy link

Diff for 2e7f6bb: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b622014..840a561 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wras
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
 GitFetch: refs/heads/main
-GitCommit: 4ca86ed310fa25c87fc3b83ad1b5d137b410d81c
+GitCommit: e93293a50a8dd38f6c8d35dd13b3972dfb18761a
 
 Tags: 22.0.0.9-full-java8-openj9
 Architectures: amd64, ppc64le, s390x
@@ -65,6 +65,36 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/22.0.0.12/kernel-slim
 File: Dockerfile.ubuntu.openjdk17
 
+Tags: 22.0.0.13-full-java8-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.13/full
+File: Dockerfile.ubuntu.openjdk8
+
+Tags: 22.0.0.13-full-java11-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.13/full
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 22.0.0.13-full-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.13/full
+File: Dockerfile.ubuntu.openjdk17
+
+Tags: 22.0.0.13-kernel-slim-java8-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.13/kernel-slim
+File: Dockerfile.ubuntu.openjdk8
+
+Tags: 22.0.0.13-kernel-slim-java11-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.13/kernel-slim
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 22.0.0.13-kernel-slim-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.13/kernel-slim
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: beta
 Architectures: amd64, ppc64le, s390x
 Directory: releases/latest/beta
@@ -116,7 +146,7 @@ Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wras
 Architectures: amd64, ppc64le, s390x
 GitRepo: https://github.com/WASdev/ci.docker.git
 GitFetch: refs/heads/main
-GitCommit: 49480ef0802ec8b335b84340962cb1c5b3a7a2b8
+GitCommit: f8d0a6782d41a5606b2668cea9042e57cedece00
 
 Tags: 22.0.0.9-full-java8-ibmjava
 Directory: ga/22.0.0.9/full
@@ -166,6 +196,30 @@ Tags: 22.0.0.12-kernel-java17-openj9
 Directory: ga/22.0.0.12/kernel
 File: Dockerfile.ubuntu.openjdk17
 
+Tags: 22.0.0.13-full-java8-ibmjava
+Directory: ga/22.0.0.13/full
+File: Dockerfile.ubuntu.ibmjava8
+
+Tags: 22.0.0.13-full-java11-openj9
+Directory: ga/22.0.0.13/full
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 22.0.0.13-full-java17-openj9
+Directory: ga/22.0.0.13/full
+File: Dockerfile.ubuntu.openjdk17
+
+Tags: 22.0.0.13-kernel-java8-ibmjava
+Directory: ga/22.0.0.13/kernel
+File: Dockerfile.ubuntu.ibmjava8
+
+Tags: 22.0.0.13-kernel-java11-openj9
+Directory: ga/22.0.0.13/kernel
+File: Dockerfile.ubuntu.openjdk11
+
+Tags: 22.0.0.13-kernel-java17-openj9
+Directory: ga/22.0.0.13/kernel
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: full, latest
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.ibmjava8
diff --git a/_bashbrew-list b/_bashbrew-list
index 8e475d7..76d25ca 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,6 +10,12 @@ open-liberty:22.0.0.12-full-java17-openj9
 open-liberty:22.0.0.12-kernel-slim-java8-openj9
 open-liberty:22.0.0.12-kernel-slim-java11-openj9
 open-liberty:22.0.0.12-kernel-slim-java17-openj9
+open-liberty:22.0.0.13-full-java8-openj9
+open-liberty:22.0.0.13-full-java11-openj9
+open-liberty:22.0.0.13-full-java17-openj9
+open-liberty:22.0.0.13-kernel-slim-java8-openj9
+open-liberty:22.0.0.13-kernel-slim-java11-openj9
+open-liberty:22.0.0.13-kernel-slim-java17-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:beta-java17
@@ -34,6 +40,12 @@ websphere-liberty:22.0.0.12-full-java17-openj9
 websphere-liberty:22.0.0.12-kernel-java8-ibmjava
 websphere-liberty:22.0.0.12-kernel-java11-openj9
 websphere-liberty:22.0.0.12-kernel-java17-openj9
+websphere-liberty:22.0.0.13-full-java8-ibmjava
+websphere-liberty:22.0.0.13-full-java11-openj9
+websphere-liberty:22.0.0.13-full-java17-openj9
+websphere-liberty:22.0.0.13-kernel-java8-ibmjava
+websphere-liberty:22.0.0.13-kernel-java11-openj9
+websphere-liberty:22.0.0.13-kernel-java17-openj9
 websphere-liberty:full
 websphere-liberty:full-java11-openj9
 websphere-liberty:full-java17-openj9
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 482e478..9f08f6f 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -10,6 +10,12 @@ open-liberty:22.0.0.12-full-java17-openj9
 open-liberty:22.0.0.12-kernel-slim-java8-openj9
 open-liberty:22.0.0.12-kernel-slim-java11-openj9
 open-liberty:22.0.0.12-kernel-slim-java17-openj9
+open-liberty:22.0.0.13-full-java8-openj9
+open-liberty:22.0.0.13-full-java11-openj9
+open-liberty:22.0.0.13-full-java17-openj9
+open-liberty:22.0.0.13-kernel-slim-java8-openj9
+open-liberty:22.0.0.13-kernel-slim-java11-openj9
+open-liberty:22.0.0.13-kernel-slim-java17-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:beta-java17
@@ -25,6 +31,9 @@ websphere-liberty:22.0.0.9-kernel-java17-openj9
 websphere-liberty:22.0.0.12-kernel-java8-ibmjava
 websphere-liberty:22.0.0.12-kernel-java11-openj9
 websphere-liberty:22.0.0.12-kernel-java17-openj9
+websphere-liberty:22.0.0.13-kernel-java8-ibmjava
+websphere-liberty:22.0.0.13-kernel-java11-openj9
+websphere-liberty:22.0.0.13-kernel-java17-openj9
 websphere-liberty:kernel
 websphere-liberty:kernel-java11-openj9
 websphere-liberty:kernel-java17-openj9
@@ -34,6 +43,9 @@ websphere-liberty:22.0.0.9-full-java17-openj9
 websphere-liberty:22.0.0.12-full-java8-ibmjava
 websphere-liberty:22.0.0.12-full-java11-openj9
 websphere-liberty:22.0.0.12-full-java17-openj9
+websphere-liberty:22.0.0.13-full-java8-ibmjava
+websphere-liberty:22.0.0.13-full-java11-openj9
+websphere-liberty:22.0.0.13-full-java17-openj9
 websphere-liberty:latest
 websphere-liberty:full-java11-openj9
 websphere-liberty:full-java17-openj9
diff --git a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_22.0.0.13-full-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 97%
copy from open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to open-liberty_22.0.0.13-full-java11-openj9/Dockerfile.ubuntu.openjdk11
index a1cbc7f..91afc14 100644
--- a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_22.0.0.13-full-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-11-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=6e0acca81e0d4fb34a6c5a5a481115898753b11f
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=58866dfb6475322b4bdad97adefa3456b3d061f8
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.13-full-java11-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.13-full-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.13-full-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.13-full-java11-openj9/helpers/runtime/docker-server.sh
similarity index 90%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.13-full-java11-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_22.0.0.13-full-java11-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_22.0.0.9-full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_22.0.0.13-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 97%
copy from open-liberty_22.0.0.9-full-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to open-liberty_22.0.0.13-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index b08f318..b6b23e6 100644
--- a/open-liberty_22.0.0.9-full-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_22.0.0.13-full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-17-jre-focal
-ARG LIBERTY_VERSION=22.0.0.9
-ARG LIBERTY_SHA=df3cdcff0e9e13a0851f1e3309f0e2de18671cdf
-ARG LIBERTY_BUILD_LABEL=cl220920220815-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=58866dfb6475322b4bdad97adefa3456b3d061f8
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.13-full-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.13-full-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.13-full-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.13-full-java17-openj9/helpers/runtime/docker-server.sh
similarity index 90%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.13-full-java17-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_22.0.0.13-full-java17-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_22.0.0.12-full-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_22.0.0.13-full-java8-openj9/Dockerfile.ubuntu.openjdk8
similarity index 97%
copy from open-liberty_22.0.0.12-full-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_22.0.0.13-full-java8-openj9/Dockerfile.ubuntu.openjdk8
index 035ad48..195000e 100644
--- a/open-liberty_22.0.0.12-full-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_22.0.0.13-full-java8-openj9/Dockerfile.ubuntu.openjdk8
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-8-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=6e0acca81e0d4fb34a6c5a5a481115898753b11f
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=58866dfb6475322b4bdad97adefa3456b3d061f8
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.13-full-java8-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.13-full-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.13-full-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.13-full-java8-openj9/helpers/runtime/docker-server.sh
similarity index 90%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.13-full-java8-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_22.0.0.13-full-java8-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 97%
copy from open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
index 7a1cc2f..3173264 100644
--- a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-11-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=b6f7d2150b993361c198b4955d3e0801d1ad1420
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=c215f400783a775cdb2f39886324d8757b70a29f
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/configure.sh
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/features.sh
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/features.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
similarity index 90%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_22.0.0.13-kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_22.0.0.12-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 97%
copy from open-liberty_22.0.0.12-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index d7bce90..41f8744 100644
--- a/open-liberty_22.0.0.12-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-17-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=b6f7d2150b993361c198b4955d3e0801d1ad1420
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=c215f400783a775cdb2f39886324d8757b70a29f
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/features.sh
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/features.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
similarity index 90%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_22.0.0.13-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_22.0.0.12-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
similarity index 97%
copy from open-liberty_22.0.0.12-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
index 11ac015..06e15f5 100644
--- a/open-liberty_22.0.0.12-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-8-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=b6f7d2150b993361c198b4955d3e0801d1ad1420
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=c215f400783a775cdb2f39886324d8757b70a29f
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/configure.sh
diff --git a/open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/features.sh
similarity index 100%
copy from open-liberty_22.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/features.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
similarity index 90%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_22.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_22.0.0.13-kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11 b/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11
index cd0a9ae..f167bfb 100644
--- a/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_beta-java11/Dockerfile.ubuntu.openjdk11
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-11-jre-focal
-ARG LIBERTY_VERSION=22.0.0.13-beta
-ARG LIBERTY_SHA=bfecd77d3190d66f46432cfffbd6f1e2d0ae332c
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=23.0.0.1-beta
+ARG LIBERTY_SHA=6abb63b041df567b6afa91fafddf7b7d3d585241
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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-java11/helpers/runtime/docker-server.sh b/open-liberty_beta-java11/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_beta-java11/helpers/runtime/docker-server.sh
+++ b/open-liberty_beta-java11/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17 b/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17
index dbf3e01..12faf35 100644
--- a/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_beta-java17/Dockerfile.ubuntu.openjdk17
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-17-jre-focal
-ARG LIBERTY_VERSION=22.0.0.13-beta
-ARG LIBERTY_SHA=bfecd77d3190d66f46432cfffbd6f1e2d0ae332c
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=23.0.0.1-beta
+ARG LIBERTY_SHA=6abb63b041df567b6afa91fafddf7b7d3d585241
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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-java17/helpers/runtime/docker-server.sh b/open-liberty_beta-java17/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_beta-java17/helpers/runtime/docker-server.sh
+++ b/open-liberty_beta-java17/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_beta/Dockerfile.ubuntu.openjdk8 b/open-liberty_beta/Dockerfile.ubuntu.openjdk8
index 38babaf..5a2be83 100644
--- a/open-liberty_beta/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_beta/Dockerfile.ubuntu.openjdk8
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-8-jre-focal
-ARG LIBERTY_VERSION=22.0.0.13-beta
-ARG LIBERTY_SHA=bfecd77d3190d66f46432cfffbd6f1e2d0ae332c
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=23.0.0.1-beta
+ARG LIBERTY_SHA=6abb63b041df567b6afa91fafddf7b7d3d585241
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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/helpers/runtime/docker-server.sh b/open-liberty_beta/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_beta/helpers/runtime/docker-server.sh
+++ b/open-liberty_beta/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
index a1cbc7f..91afc14 100644
--- a/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-11-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=6e0acca81e0d4fb34a6c5a5a481115898753b11f
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=58866dfb6475322b4bdad97adefa3456b3d061f8
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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_full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_full-java11-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
index e282946..b6b23e6 100644
--- a/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-17-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=6e0acca81e0d4fb34a6c5a5a481115898753b11f
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=58866dfb6475322b4bdad97adefa3456b3d061f8
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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_full-java17-openj9/helpers/runtime/docker-server.sh b/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11 b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
index 7a1cc2f..3173264 100644
--- a/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/open-liberty_kernel-slim-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-11-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=b6f7d2150b993361c198b4955d3e0801d1ad1420
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=c215f400783a775cdb2f39886324d8757b70a29f
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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
diff --git a/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-slim-java11-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17 b/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index d7bce90..41f8744 100644
--- a/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-17-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=b6f7d2150b993361c198b4955d3e0801d1ad1420
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=c215f400783a775cdb2f39886324d8757b70a29f
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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
diff --git a/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
index 11ac015..06e15f5 100644
--- a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-8-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=b6f7d2150b993361c198b4955d3e0801d1ad1420
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=c215f400783a775cdb2f39886324d8757b70a29f
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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
diff --git a/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
+++ b/open-liberty_kernel-slim-java8-openj9/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/open-liberty_latest/Dockerfile.ubuntu.openjdk8 b/open-liberty_latest/Dockerfile.ubuntu.openjdk8
index 035ad48..195000e 100644
--- a/open-liberty_latest/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_latest/Dockerfile.ubuntu.openjdk8
@@ -1,7 +1,7 @@
 FROM ibm-semeru-runtimes:open-8-jre-focal
-ARG LIBERTY_VERSION=22.0.0.12
-ARG LIBERTY_SHA=6e0acca81e0d4fb34a6c5a5a481115898753b11f
-ARG LIBERTY_BUILD_LABEL=cl221220221107-1900
+ARG LIBERTY_VERSION=22.0.0.13
+ARG LIBERTY_SHA=58866dfb6475322b4bdad97adefa3456b3d061f8
+ARG LIBERTY_BUILD_LABEL=cl221320221205-1900
 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_latest/helpers/runtime/docker-server.sh b/open-liberty_latest/helpers/runtime/docker-server.sh
index cdf4188..865da59 100755
--- a/open-liberty_latest/helpers/runtime/docker-server.sh
+++ b/open-liberty_latest/helpers/runtime/docker-server.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
+function setPasswords() {
+  local -n pass=$1
+  local -n trustpass=$2
+  if [ -z "$pass" ]; then
+    pass=$(openssl rand -base64 32 2>/dev/null)
+    trustpass=$(openssl rand -base64 32 2>/dev/null)
+  fi
+}
 
 function importKeyCert() {
   local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}"
   local CRT_FILE="tls.crt"
   local KEY_FILE="tls.key"
   local CA_FILE="ca.crt"
-  local PASSWORD=$(openssl rand -base64 32 2>/dev/null)
-  local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null)
+  local PASSWORD=
+  local TRUSTSTORE_PASSWORD=
   local TMP_CERT=ca-bundle-temp.crt
   local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/"
   local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount"
@@ -16,6 +24,7 @@ function importKeyCert() {
   # Import the private key and certificate into new keytore
   if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then
     echo "Found mounted TLS certificates, generating keystore"
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     mkdir -p /output/resources/security
     openssl pkcs12 -export \
       -name "defaultKeyStore" \
@@ -42,6 +51,7 @@ function importKeyCert() {
     pushd /tmp/certs >&/dev/null
     cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT}
     csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}'
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     for CERT_FILE in crt-*; do
       keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \
         -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null
@@ -52,9 +62,11 @@ function importKeyCert() {
 
   # Add the keystore password to server configuration
   if [ ! -e $keystorePath ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
   fi
   if [ -e $TRUSTSTORE_FILE ]; then
+    setPasswords PASSWORD TRUSTSTORE_PASSWORD
     sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml
   elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then
     cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml  
diff --git a/websphere-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_22.0.0.13-full-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 96%
copy from websphere-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_22.0.0.13-full-java11-openj9/Dockerfile.ubuntu.openjdk11
index 9c03f42..28f0383 100644
--- a/websphere-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_22.0.0.13-full-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java11-openj9
+FROM websphere-liberty:22.0.0.13-kernel-java11-openj9
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_22.0.0.12-full-java11-openj9/server.xml b/websphere-liberty_22.0.0.13-full-java11-openj9/server.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-full-java11-openj9/server.xml
copy to websphere-liberty_22.0.0.13-full-java11-openj9/server.xml
diff --git a/websphere-liberty_22.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_22.0.0.13-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from websphere-liberty_22.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to websphere-liberty_22.0.0.13-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index 94b2dae..bee138d 100644
--- a/websphere-liberty_22.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/websphere-liberty_22.0.0.13-full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:22.0.0.12-kernel-java17-openj9
+FROM websphere-liberty:22.0.0.13-kernel-java17-openj9
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_22.0.0.12-full-java11-openj9/server.xml b/websphere-liberty_22.0.0.13-full-java17-openj9/server.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-full-java11-openj9/server.xml
copy to websphere-liberty_22.0.0.13-full-java17-openj9/server.xml
diff --git a/websphere-liberty_22.0.0.9-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_22.0.0.13-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 96%
copy from websphere-liberty_22.0.0.9-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
copy to websphere-liberty_22.0.0.13-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index da07000..e93ebb6 100644
--- a/websphere-liberty_22.0.0.9-full-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_22.0.0.13-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:22.0.0.9-kernel-java8-ibmjava
+FROM websphere-liberty:22.0.0.13-kernel-java8-ibmjava
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_22.0.0.12-full-java11-openj9/server.xml b/websphere-liberty_22.0.0.13-full-java8-ibmjava/server.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-full-java11-openj9/server.xml
copy to websphere-liberty_22.0.0.13-full-java8-ibmjava/server.xml
diff --git a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_22.0.0.13-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
similarity index 92%
copy from websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
index 703d213..92838b0 100644
--- a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_22.0.0.13-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -16,21 +16,21 @@ FROM ibm-semeru-runtimes:open-11-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
-ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
-ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
+ARG EN_SHA=5062904442242bf7935fadec638812cdbce614a7d22d5dc267b7b47767a81530
+ARG NON_IBM_SHA=a0a7b4082bb39a2435f7ddc4d383746bf09d05834b545dd3dfa4405f6e4e9ff0
+ARG NOTICES_SHA=7376962045d167dddb46459382b15a4a6811feb29e032420f7f95383dba2a3dc
 
 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="22.0.0.12" \
-      org.opencontainers.image.revision="cl221220221107-1900" \
+      org.opencontainers.image.version="22.0.0.13" \
+      org.opencontainers.image.revision="cl221320221205-1900" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK 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 22.0.0_12
+ENV LIBERTY_VERSION 22.0.0_13
 
 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"="22.0.0.12" \
-      "BuildLabel"="cl221220221107-1900"
+      "ProductVersion"="22.0.0.13" \
+      "BuildLabel"="cl221320221205-1900"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/websphere-liberty_22.0.0.13-kernel-java11-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configure.sh
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_22.0.0.13-kernel-java11-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_22.0.0.13-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 92%
copy from websphere-liberty_22.0.0.12-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index ae73d3e..b0c82b2 100644
--- a/websphere-liberty_22.0.0.12-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/websphere-liberty_22.0.0.13-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -16,21 +16,21 @@ FROM ibm-semeru-runtimes:open-17-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
-ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
-ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
+ARG EN_SHA=5062904442242bf7935fadec638812cdbce614a7d22d5dc267b7b47767a81530
+ARG NON_IBM_SHA=a0a7b4082bb39a2435f7ddc4d383746bf09d05834b545dd3dfa4405f6e4e9ff0
+ARG NOTICES_SHA=7376962045d167dddb46459382b15a4a6811feb29e032420f7f95383dba2a3dc
 
 LABEL org.opencontainers.image.authors="Chris Potter, Christy Jesuraj, Melissa Lee" \
       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="22.0.0.12" \
-      org.opencontainers.image.revision="cl221220221107-1900" \
+      org.opencontainers.image.version="22.0.0.13" \
+      org.opencontainers.image.revision="cl221320221205-1900" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK 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 22.0.0_12
+ENV LIBERTY_VERSION 22.0.0_13
 
 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"="22.0.0.12" \
-      "BuildLabel"="cl221220221107-1900"
+      "ProductVersion"="22.0.0.13" \
+      "BuildLabel"="cl221320221205-1900"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/websphere-liberty_22.0.0.13-kernel-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configure.sh
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_22.0.0.13-kernel-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
similarity index 92%
copy from websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
index de9e990..1e30198 100644
--- a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
+++ b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/Dockerfile.ubuntu.ibmjava8
@@ -16,21 +16,21 @@ FROM ibmjava:8-jre
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
-ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
-ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
+ARG EN_SHA=5062904442242bf7935fadec638812cdbce614a7d22d5dc267b7b47767a81530
+ARG NON_IBM_SHA=a0a7b4082bb39a2435f7ddc4d383746bf09d05834b545dd3dfa4405f6e4e9ff0
+ARG NOTICES_SHA=7376962045d167dddb46459382b15a4a6811feb29e032420f7f95383dba2a3dc
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, 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="22.0.0.12" \
-      org.opencontainers.image.revision="cl221220221107-1900" \
+      org.opencontainers.image.version="22.0.0.13" \
+      org.opencontainers.image.revision="cl221320221205-1900" \
       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 22.0.0_12
+ENV LIBERTY_VERSION 22.0.0_13
 
 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"="22.0.0.12" \
-      "BuildLabel"="cl221220221107-1900"
+      "ProductVersion"="22.0.0.13" \
+      "BuildLabel"="cl221320221205-1900"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/fixes/.gitkeep
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/fixes/.gitkeep
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_22.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/configure.sh
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/configure.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_22.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_22.0.0.13-kernel-java8-ibmjava/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
index 703d213..92838b0 100644
--- a/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
@@ -16,21 +16,21 @@ FROM ibm-semeru-runtimes:open-11-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
-ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
-ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
+ARG EN_SHA=5062904442242bf7935fadec638812cdbce614a7d22d5dc267b7b47767a81530
+ARG NON_IBM_SHA=a0a7b4082bb39a2435f7ddc4d383746bf09d05834b545dd3dfa4405f6e4e9ff0
+ARG NOTICES_SHA=7376962045d167dddb46459382b15a4a6811feb29e032420f7f95383dba2a3dc
 
 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="22.0.0.12" \
-      org.opencontainers.image.revision="cl221220221107-1900" \
+      org.opencontainers.image.version="22.0.0.13" \
+      org.opencontainers.image.revision="cl221320221205-1900" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK 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 22.0.0_12
+ENV LIBERTY_VERSION 22.0.0_13
 
 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"="22.0.0.12" \
-      "BuildLabel"="cl221220221107-1900"
+      "ProductVersion"="22.0.0.13" \
+      "BuildLabel"="cl221320221205-1900"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17 b/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index ae73d3e..b0c82b2 100644
--- a/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
+++ b/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -16,21 +16,21 @@ FROM ibm-semeru-runtimes:open-17-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
-ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
-ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
-ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
+ARG EN_SHA=5062904442242bf7935fadec638812cdbce614a7d22d5dc267b7b47767a81530
+ARG NON_IBM_SHA=a0a7b4082bb39a2435f7ddc4d383746bf09d05834b545dd3dfa4405f6e4e9ff0
+ARG NOTICES_SHA=7376962045d167dddb46459382b15a4a6811feb29e032420f7f95383dba2a3dc
 
 LABEL org.opencontainers.image.authors="Chris Potter, Christy Jesuraj, Melissa Lee" \
       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="22.0.0.12" \
-      org.opencontainers.image.revision="cl221220221107-1900" \
+      org.opencontainers.image.version="22.0.0.13" \
+      org.opencontainers.image.revision="cl221320221205-1900" \
       org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK 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 22.0.0_12
+ENV LIBERTY_VERSION 22.0.0_13
 
 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"="22.0.0.12" \
-      "BuildLabel"="cl221220221107-1900"
+      "ProductVersion"="22.0.0.13" \
+      "BuildLabel"="cl221320221205-1900"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \
diff --git a/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8 b/websphere-liberty_kernel/Dockerfile.ubuntu.ibmjava8
index de9e990..1e30198 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=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
-ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
-ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
+ARG EN_SHA=5062904442242bf7935fadec638812cdbce614a7d22d5dc267b7b47767a81530
+ARG NON_IBM_SHA=a0a7b4082bb39a2435f7ddc4d383746bf09d05834b545dd3dfa4405f6e4e9ff0
+ARG NOTICES_SHA=7376962045d167dddb46459382b15a4a6811feb29e032420f7f95383dba2a3dc
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, 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="22.0.0.12" \
-      org.opencontainers.image.revision="cl221220221107-1900" \
+      org.opencontainers.image.version="22.0.0.13" \
+      org.opencontainers.image.revision="cl221320221205-1900" \
       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 22.0.0_12
+ENV LIBERTY_VERSION 22.0.0_13
 
 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"="22.0.0.12" \
-      "BuildLabel"="cl221220221107-1900"
+      "ProductVersion"="22.0.0.13" \
+      "BuildLabel"="cl221320221205-1900"
 
 # Set Path Shortcuts
 ENV LOG_DIR=/logs \

Relevant Maintainers:

@tianon tianon merged commit 6727d88 into docker-library:master Dec 21, 2022
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 @tianon