Add java17 images for open-liberty and websphere-liberty

[crpotter]

No description provided.

[github-actions]

Diff for f48c5b5:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0687056..9ebf137 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,7 +2,7 @@
 Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wraschke@us.ibm.com> (@wraschke), Arthur De Magalhaes <arthurdm@ca.ibm.com> (@arthurdm)
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: 2ce0832bf00d3f1011650400b391cb90a2b2e2ea
+GitCommit: 9c399b917088038bb11ac047bea95813803f7111
 
 Tags: 21.0.0.9-full-java8-openj9
 Architectures: amd64, ppc64le, s390x
@@ -34,6 +34,11 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/21.0.0.12/full
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 21.0.0.12-full-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/21.0.0.12/full
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: 21.0.0.12-kernel-slim-java8-openj9
 Architectures: amd64, ppc64le, s390x
 Directory: releases/21.0.0.12/kernel-slim
@@ -44,6 +49,11 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/21.0.0.12/kernel-slim
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 21.0.0.12-kernel-slim-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/21.0.0.12/kernel-slim
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: 22.0.0.1-full-java8-openj9
 Architectures: amd64, ppc64le, s390x
 Directory: releases/22.0.0.1/full
@@ -54,6 +64,11 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/22.0.0.1/full
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 22.0.0.1-full-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.1/full
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: 22.0.0.1-kernel-slim-java8-openj9
 Architectures: amd64, ppc64le, s390x
 Directory: releases/22.0.0.1/kernel-slim
@@ -64,6 +79,11 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/22.0.0.1/kernel-slim
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 22.0.0.1-kernel-slim-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/22.0.0.1/kernel-slim
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: beta
 Architectures: amd64, ppc64le, s390x
 Directory: releases/latest/beta
@@ -84,6 +104,11 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/latest/full
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: full-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/latest/full
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: kernel-slim, kernel-slim-java8-openj9
 Architectures: amd64, ppc64le, s390x
 Directory: releases/latest/kernel-slim
@@ -94,12 +119,17 @@ Architectures: amd64, ppc64le, s390x
 Directory: releases/latest/kernel-slim
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: kernel-slim-java17-openj9
+Architectures: amd64, ppc64le, s390x
+Directory: releases/latest/kernel-slim
+File: Dockerfile.ubuntu.openjdk17
+
 
 # websphere-liberty
 Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wraschke@us.ibm.com> (@wraschke), Arthur De Magalhaes <arthurdm@ca.ibm.com> (@arthurdm)
 Architectures: amd64, ppc64le, s390x
 GitRepo: https://github.com/WASdev/ci.docker.git
-GitCommit: 8d4da49ca83834add6499b53616554b222c98d8e
+GitCommit: 557fd1d774f6a43247206a079aca1d9650406e45
 
 Tags: 21.0.0.9-kernel-java8-ibmjava
 Directory: ga/21.0.0.9/kernel
@@ -117,6 +147,10 @@ Tags: 21.0.0.12-kernel-java11-openj9
 Directory: ga/21.0.0.12/kernel
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 21.0.0.12-kernel-java17-openj9
+Directory: ga/21.0.0.12/kernel
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: 22.0.0.1-kernel-java8-ibmjava
 Directory: ga/22.0.0.1/kernel
 File: Dockerfile.ubuntu.ibmjava8
@@ -125,6 +159,10 @@ Tags: 22.0.0.1-kernel-java11-openj9
 Directory: ga/22.0.0.1/kernel
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 22.0.0.1-kernel-java17-openj9
+Directory: ga/22.0.0.1/kernel
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: kernel
 Directory: ga/latest/kernel
 File: Dockerfile.ubuntu.ibmjava8
@@ -133,6 +171,10 @@ Tags: kernel-java11-openj9
 Directory: ga/latest/kernel
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: kernel-java17-openj9
+Directory: ga/latest/kernel
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: 21.0.0.9-full-java8-ibmjava
 Directory: ga/21.0.0.9/full
 File: Dockerfile.ubuntu.ibmjava8
@@ -149,6 +191,10 @@ Tags: 21.0.0.12-full-java11-openj9
 Directory: ga/21.0.0.12/full
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 21.0.0.12-full-java17-openj9
+Directory: ga/21.0.0.12/full
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: 22.0.0.1-full-java8-ibmjava
 Directory: ga/22.0.0.1/full
 File: Dockerfile.ubuntu.ibmjava8
@@ -157,6 +203,10 @@ Tags: 22.0.0.1-full-java11-openj9
 Directory: ga/22.0.0.1/full
 File: Dockerfile.ubuntu.openjdk11
 
+Tags: 22.0.0.1-full-java17-openj9
+Directory: ga/22.0.0.1/full
+File: Dockerfile.ubuntu.openjdk17
+
 Tags: full, latest
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.ibmjava8
@@ -164,3 +214,7 @@ File: Dockerfile.ubuntu.ibmjava8
 Tags: full-java11-openj9
 Directory: ga/latest/full
 File: Dockerfile.ubuntu.openjdk11
+
+Tags: full-java17-openj9
+Directory: ga/latest/full
+File: Dockerfile.ubuntu.openjdk17
diff --git a/_bashbrew-list b/_bashbrew-list
index ae51311..868d3fa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,20 +4,26 @@ open-liberty:21.0.0.9-kernel-slim-java8-openj9
 open-liberty:21.0.0.9-kernel-slim-java11-openj9
 open-liberty:21.0.0.12-full-java8-openj9
 open-liberty:21.0.0.12-full-java11-openj9
+open-liberty:21.0.0.12-full-java17-openj9
 open-liberty:21.0.0.12-kernel-slim-java8-openj9
 open-liberty:21.0.0.12-kernel-slim-java11-openj9
+open-liberty:21.0.0.12-kernel-slim-java17-openj9
 open-liberty:22.0.0.1-full-java8-openj9
 open-liberty:22.0.0.1-full-java11-openj9
+open-liberty:22.0.0.1-full-java17-openj9
 open-liberty:22.0.0.1-kernel-slim-java8-openj9
 open-liberty:22.0.0.1-kernel-slim-java11-openj9
+open-liberty:22.0.0.1-kernel-slim-java17-openj9
 open-liberty:beta
 open-liberty:beta-java11
 open-liberty:full
 open-liberty:full-java8-openj9
 open-liberty:full-java11-openj9
+open-liberty:full-java17-openj9
 open-liberty:kernel-slim
 open-liberty:kernel-slim-java8-openj9
 open-liberty:kernel-slim-java11-openj9
+open-liberty:kernel-slim-java17-openj9
 open-liberty:latest
 websphere-liberty:21.0.0.9-full-java8-ibmjava
 websphere-liberty:21.0.0.9-full-java11-openj9
@@ -25,14 +31,20 @@ websphere-liberty:21.0.0.9-kernel-java8-ibmjava
 websphere-liberty:21.0.0.9-kernel-java11-openj9
 websphere-liberty:21.0.0.12-full-java8-ibmjava
 websphere-liberty:21.0.0.12-full-java11-openj9
+websphere-liberty:21.0.0.12-full-java17-openj9
 websphere-liberty:21.0.0.12-kernel-java8-ibmjava
 websphere-liberty:21.0.0.12-kernel-java11-openj9
+websphere-liberty:21.0.0.12-kernel-java17-openj9
 websphere-liberty:22.0.0.1-full-java8-ibmjava
 websphere-liberty:22.0.0.1-full-java11-openj9
+websphere-liberty:22.0.0.1-full-java17-openj9
 websphere-liberty:22.0.0.1-kernel-java8-ibmjava
 websphere-liberty:22.0.0.1-kernel-java11-openj9
+websphere-liberty:22.0.0.1-kernel-java17-openj9
 websphere-liberty:full
 websphere-liberty:full-java11-openj9
+websphere-liberty:full-java17-openj9
 websphere-liberty:kernel
 websphere-liberty:kernel-java11-openj9
+websphere-liberty:kernel-java17-openj9
 websphere-liberty:latest
diff --git a/open-liberty_21.0.0.12-full-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_21.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from open-liberty_21.0.0.12-full-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_21.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index f98c00f..ed63952 100644
--- a/open-liberty_21.0.0.12-full-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_21.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-8-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 ARG LIBERTY_VERSION=21.0.0.12
 ARG LIBERTY_SHA=85635806bc4acc7192ea4d542d67462182e8fa3b
 ARG LIBERTY_BUILD_LABEL=cl21.0.0.12920-1900
@@ -8,7 +8,7 @@ ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Leo Christy Jesuraj" \
+LABEL org.opencontainers.image.authors="Chris Potter, Leo Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="Open Liberty" \
       org.opencontainers.image.url="https://openliberty.io/" \
       org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_21.0.0.12-full-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_21.0.0.12-full-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configure.sh
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.12-full-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.12-full-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_21.0.0.12-full-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_21.0.0.12-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from open-liberty_21.0.0.12-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index 2beba80..fda587a 100644
--- a/open-liberty_21.0.0.12-kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-8-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 ARG LIBERTY_VERSION=21.0.0.12
 ARG LIBERTY_SHA=101f7be5f15f14a4a3dabc74dd106be2e743245e
 ARG LIBERTY_BUILD_LABEL=cl21.0.0.12920-1900
@@ -8,7 +8,7 @@ ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Leo Christy Jesuraj" \
+LABEL org.opencontainers.image.authors="Chris Potter, Leo Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="Open Liberty" \
       org.opencontainers.image.url="https://openliberty.io/" \
       org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/features.sh
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/features.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_21.0.0.12-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_22.0.0.1-full-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_22.0.0.1-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from open-liberty_22.0.0.1-full-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_22.0.0.1-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index fee4276..7cbb6f8 100644
--- a/open-liberty_22.0.0.1-full-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_22.0.0.1-full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-8-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 ARG LIBERTY_VERSION=22.0.0.1
 ARG LIBERTY_SHA=9a5acc514c26ad91dadf9a21e5c61a090abf0dc9
 ARG LIBERTY_BUILD_LABEL=cl22.0.0.1920-1900
@@ -8,7 +8,7 @@ ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Leo Christy Jesuraj" \
+LABEL org.opencontainers.image.authors="Chris Potter, Leo Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="Open Liberty" \
       org.opencontainers.image.url="https://openliberty.io/" \
       org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.1-full-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.1-full-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.1-full-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.1-full-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.1-full-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index aef542f..df06c3b 100644
--- a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-8-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 ARG LIBERTY_VERSION=22.0.0.1
 ARG LIBERTY_SHA=21bc82aa555453d10971d0db2ebee483490e2f19
 ARG LIBERTY_BUILD_LABEL=cl22.0.0.1920-1900
@@ -8,7 +8,7 @@ ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Leo Christy Jesuraj" \
+LABEL org.opencontainers.image.authors="Chris Potter, Leo Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="Open Liberty" \
       org.opencontainers.image.url="https://openliberty.io/" \
       org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/features.sh
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/features.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_22.0.0.1-kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_22.0.0.1-full-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from open-liberty_22.0.0.1-full-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
index fee4276..7cbb6f8 100644
--- a/open-liberty_22.0.0.1-full-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-8-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 ARG LIBERTY_VERSION=22.0.0.1
 ARG LIBERTY_SHA=9a5acc514c26ad91dadf9a21e5c61a090abf0dc9
 ARG LIBERTY_BUILD_LABEL=cl22.0.0.1920-1900
@@ -8,7 +8,7 @@ ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Leo Christy Jesuraj" \
+LABEL org.opencontainers.image.authors="Chris Potter, Leo Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="Open Liberty" \
       org.opencontainers.image.url="https://openliberty.io/" \
       org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_full-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_full-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_full-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configure.sh b/open-liberty_full-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configure.sh
copy to open-liberty_full-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_full-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_full-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_full-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_full-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_full-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8 b/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
copy to open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
index aef542f..df06c3b 100644
--- a/open-liberty_kernel-slim-java8-openj9/Dockerfile.ubuntu.openjdk8
+++ b/open-liberty_kernel-slim-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-8-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 ARG LIBERTY_VERSION=22.0.0.1
 ARG LIBERTY_SHA=21bc82aa555453d10971d0db2ebee483490e2f19
 ARG LIBERTY_BUILD_LABEL=cl22.0.0.1920-1900
@@ -8,7 +8,7 @@ ARG LIBERTY_LICENSE_SHA=84f00503d6516c91190de866e78d6010899673b7
 ARG OPENJ9_SCC=true
 ARG VERBOSE=false
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Leo Christy Jesuraj" \
+LABEL org.opencontainers.image.authors="Chris Potter, Leo Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="Open Liberty" \
       org.opencontainers.image.url="https://openliberty.io/" \
       org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/open-liberty_kernel-slim-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to open-liberty_kernel-slim-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sessioncache-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh b/open-liberty_kernel-slim-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/configure.sh
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/configure.sh
diff --git a/open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh b/open-liberty_kernel-slim-java17-openj9/helpers/build/features.sh
similarity index 100%
copy from open-liberty_21.0.0.12-kernel-slim-java11-openj9/helpers/build/features.sh
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/features.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh b/open-liberty_kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh b/open-liberty_kernel-slim-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/populate_scc.sh
copy to open-liberty_kernel-slim-java17-openj9/helpers/build/populate_scc.sh
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh b/open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/runtime/docker-server.sh
copy to open-liberty_kernel-slim-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_21.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_21.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from websphere-liberty_21.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_21.0.0.12-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index 939c4c8..efc3246 100644
--- a/websphere-liberty_21.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_21.0.0.12-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:21.0.0.9-kernel-java11-openj9
+FROM websphere-liberty:21.0.0.12-kernel-java17-openj9
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_21.0.0.12-full-java11-openj9/server.xml b/websphere-liberty_21.0.0.12-full-java17-openj9/server.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-full-java11-openj9/server.xml
copy to websphere-liberty_21.0.0.12-full-java17-openj9/server.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_21.0.0.12-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 97%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index 89a5f17..9524a82 100644
--- a/websphere-liberty_21.0.0.12-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_21.0.0.12-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
@@ -20,7 +20,7 @@ ARG EN_SHA=3e0b8b39a5c8000b0ad1458943454d8ad2e4b4712030cd0f96846a0aa1090078
 ARG NON_IBM_SHA=66d73b0d3e0cb314134e9fee966dbda6c388bf33645583921f63e00851242ff2
 ARG NOTICES_SHA=30a37bfd567f61c63daf4726d95ee3bf6d1c5f2b885678af4d52e44fa2f93e54
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
+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" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/websphere-liberty_21.0.0.12-kernel-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configure.sh
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_21.0.0.12-kernel-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_21.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_22.0.0.1-full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from websphere-liberty_21.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_22.0.0.1-full-java17-openj9/Dockerfile.ubuntu.openjdk17
index 939c4c8..b1fd8f9 100644
--- a/websphere-liberty_21.0.0.9-full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_22.0.0.1-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:21.0.0.9-kernel-java11-openj9
+FROM websphere-liberty:22.0.0.1-kernel-java17-openj9
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_21.0.0.12-full-java11-openj9/server.xml b/websphere-liberty_22.0.0.1-full-java17-openj9/server.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-full-java11-openj9/server.xml
copy to websphere-liberty_22.0.0.1-full-java17-openj9/server.xml
diff --git a/websphere-liberty_22.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_22.0.0.1-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 97%
copy from websphere-liberty_22.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index 767477b..936e538 100644
--- a/websphere-liberty_22.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_22.0.0.1-kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
@@ -20,7 +20,7 @@ ARG EN_SHA=4889b338a814eb953faba1135d105046ae7d7a62eaf75fb05804214b9fd8ef3a
 ARG NON_IBM_SHA=8f56725d48ec762b9b270c3bf34fba5b67472f0e1d8d0326a6a25483d363bc9c
 ARG NOTICES_SHA=73325d908f5c8d24cba975c429c58bf7f631a947ddc206b1081f2c347e30bff1
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
+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" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/websphere-liberty_22.0.0.1-kernel-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configure.sh
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_22.0.0.1-kernel-java17-openj9/helpers/runtime/docker-server.sh
diff --git a/websphere-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 96%
copy from websphere-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_full-java17-openj9/Dockerfile.ubuntu.openjdk17
index 9c03f42..68c24ca 100644
--- a/websphere-liberty_full-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_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:kernel-java11-openj9
+FROM websphere-liberty:kernel-java17-openj9
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/websphere-liberty_21.0.0.12-full-java11-openj9/server.xml b/websphere-liberty_full-java17-openj9/server.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-full-java11-openj9/server.xml
copy to websphere-liberty_full-java17-openj9/server.xml
diff --git a/websphere-liberty_22.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11 b/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
similarity index 97%
copy from websphere-liberty_22.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
copy to websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
index 767477b..936e538 100644
--- a/websphere-liberty_22.0.0.1-kernel-java11-openj9/Dockerfile.ubuntu.openjdk11
+++ b/websphere-liberty_kernel-java17-openj9/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-focal
+FROM ibm-semeru-runtimes:open-17-jre-focal
 
 ARG VERBOSE=false
 ARG OPENJ9_SCC=true
@@ -20,7 +20,7 @@ ARG EN_SHA=4889b338a814eb953faba1135d105046ae7d7a62eaf75fb05804214b9fd8ef3a
 ARG NON_IBM_SHA=8f56725d48ec762b9b270c3bf34fba5b67472f0e1d8d0326a6a25483d363bc9c
 ARG NOTICES_SHA=73325d908f5c8d24cba975c429c58bf7f631a947ddc206b1081f2c347e30bff1
 
-LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
+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" \
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep b/websphere-liberty_kernel-java17-openj9/fixes/.gitkeep
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/fixes/.gitkeep
copy to websphere-liberty_kernel-java17-openj9/fixes/.gitkeep
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-client.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-embedded.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/hazelcast-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-endpoint.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/http-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/http-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/iiop-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/jms-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/jms-ssl-endpoint.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/keystore.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/keystore.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-health-check.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/mp-health-check.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/mp-monitoring.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc-config.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/oidc-config.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/oidc.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-facebook.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-facebook.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-features.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-features.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-github.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-github.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-google.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-google.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-linkedin.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-oauth2.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/sso-oidc.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-oidc.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/sso-twitter.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/sso-twitter.xml
diff --git a/open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
similarity index 100%
copy from open-liberty_21.0.0.12-full-java11-openj9/helpers/build/configuration_snippets/tls.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/tls.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/trustDefault.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/trustDefault.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml b/websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configuration_snippets/truststore.xml
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configuration_snippets/truststore.xml
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configure.sh b/websphere-liberty_kernel-java17-openj9/helpers/build/configure.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/configure.sh
copy to websphere-liberty_kernel-java17-openj9/helpers/build/configure.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh b/websphere-liberty_kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/infinispan-client-setup.sh
copy to websphere-liberty_kernel-java17-openj9/helpers/build/infinispan-client-setup.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh b/websphere-liberty_kernel-java17-openj9/helpers/build/populate_scc.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/build/populate_scc.sh
copy to websphere-liberty_kernel-java17-openj9/helpers/build/populate_scc.sh
diff --git a/websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh b/websphere-liberty_kernel-java17-openj9/helpers/runtime/docker-server.sh
similarity index 100%
copy from websphere-liberty_21.0.0.12-kernel-java11-openj9/helpers/runtime/docker-server.sh
copy to websphere-liberty_kernel-java17-openj9/helpers/runtime/docker-server.sh

Relevant Maintainers:

• open-liberty: @crpotter @wraschke @arthurdm
• websphere-liberty: @crpotter @wraschke @arthurdm