diff --git a/.classpath b/.classpath
index 7e50894..03ac002 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/.project b/.project
index 0804f56..be52ef5 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.cicsdev.springboot.jdbc.multi</name>
+	<name>cics-java-liberty-springboot-jdbc-multi</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,26 +10,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -37,11 +22,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..62ef348
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/cics-java-liberty-springboot-jdbc-multi-app/.classpath b/cics-java-liberty-springboot-jdbc-multi-app/.classpath
new file mode 100644
index 0000000..c2356c0
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.61/JE.JEE_V10_R0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/cics-java-liberty-springboot-jdbc-multi-app/.project b/cics-java-liberty-springboot-jdbc-multi-app/.project
new file mode 100644
index 0000000..cb4d81a
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.project
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cics-java-liberty-springboot-jdbc-multi-app</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.core.resources.prefs b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..e9441bb
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..62ef348
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.common.component
similarity index 86%
rename from .settings/org.eclipse.wst.common.component
rename to cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.common.component
index 2555221..45ea0af 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="com.ibm.cicsdev.springboot.jdbc.multi">
+	<wb-module deploy-name="cics-java-liberty-springboot-jdbc-multi">
 		<property name="context-root" value="cics-java-liberty-springboot-jdbc-multi"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 59%
rename from .settings/org.eclipse.wst.common.project.facet.core.xml
rename to cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.common.project.facet.core.xml
index cea524a..1bfcd9b 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>
 	<fixed facet="jst.java"/>
 	<fixed facet="jst.web"/>
-	<installed facet="jst.web" version="2.4"/>
-	<installed facet="jst.java" version="1.8"/>
+	<installed facet="jst.web" version="6.0"/>
+	<installed facet="jst.java" version="17"/>
 </faceted-project>
diff --git a/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.validation.prefs b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..2e240e7
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-app/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.3.100.v202407180051
+disabled=06target
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator/global=FF
+vf.version=3
diff --git a/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/.project b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/.project
new file mode 100644
index 0000000..c67a44a
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.cics.bundle.ui.bundlebuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.ibm.cics.bundle.ui.bundlenature</nature>
+	</natures>
+</projectDescription>
diff --git a/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/.settings/org.eclipse.core.resources.prefs b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/META-INF/cics.xml b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/META-INF/cics.xml
new file mode 100644
index 0000000..823313c
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/META-INF/cics.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle"
+          bundleMajorVer="1" bundleMinorVer="0" bundleMicroVer="0"
+          bundleRelease="0" bundleVersion="1"
+          id="cics-java-liberty-springboot-jdbc-multi-bundle">
+    <define name="cics-java-liberty-springboot-jdbc-multi-app"
+            path="cics-java-liberty-springboot-jdbc-multi-app.warbundle"
+            type="http://www.ibm.com/xmlns/prod/cics/bundle/WARBUNDLE"/>
+</manifest>
diff --git a/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/cics-java-liberty-springboot-jdbc-multi-app.warbundle b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/cics-java-liberty-springboot-jdbc-multi-app.warbundle
new file mode 100644
index 0000000..13530ca
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-cicsbundle-eclipse/cics-java-liberty-springboot-jdbc-multi-app.warbundle
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<warbundle jvmserver="DFHWLP" symbolicname="cics-java-liberty-springboot-jdbc-multi-app"/>
diff --git a/cics-java-liberty-springboot-jdbc-multi-cicsbundle/.project b/cics-java-liberty-springboot-jdbc-multi-cicsbundle/.project
new file mode 100644
index 0000000..e831ca6
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-cicsbundle/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cics-java-liberty-springboot-jdbc-multi-cicsbundle</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/cics-java-liberty-springboot-jdbc-multi-cicsbundle/.settings/org.eclipse.core.resources.prefs b/cics-java-liberty-springboot-jdbc-multi-cicsbundle/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-multi-cicsbundle/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8