diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2cd1b28..aae23c9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -8,8 +8,6 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
-  schedule:
-    - cron: '0 0 * * *'
 
 jobs:
   check-copyright:
@@ -59,7 +57,6 @@ jobs:
         with:
           java-version: ${{ matrix.jdk }}
           distribution: "semeru"
-          cache: maven
       - name: Build with Maven Wrapper
         run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify
 
diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yaml
similarity index 71%
rename from .github/workflows/cleanup-old-runs.yml
rename to .github/workflows/cleanup-old-runs.yaml
index 0ea8903..684e91d 100644
--- a/.github/workflows/cleanup-old-runs.yml
+++ b/.github/workflows/cleanup-old-runs.yaml
@@ -1,7 +1,6 @@
 name: Cleanup Old Workflow Runs
 
 permissions:
-  actions: write
   contents: read
 
 on:
@@ -12,11 +11,13 @@ on:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     steps:
-      - name: Delete old workflow runs (including this workflow)
+      - name: Delete old workflow runs
         uses: Mattraks/delete-workflow-runs@v2
         with:
           token: ${{ github.token }}
           repository: ${{ github.repository }}
           retain_days: 30
-          keep_minimum_runs: 3  # Keep at least 3 recent runs of each workflow
+          keep_minimum_runs: 6
diff --git a/.gitignore b/.gitignore
index ae9971a..20b93f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,9 @@ gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
-# Avoid ignore Gradle wrappper properties
+# Avoid ignore Gradle wrapper properties
 !gradle-wrapper.properties
+!gradle/wrapper/gradle-wrapper.properties
 
 # Cache of project
 .gradletasknamecache
diff --git a/.project b/.project
index d4557b9..499de4a 100644
--- a/.project
+++ b/.project
@@ -5,31 +5,11 @@
 	<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.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -37,11 +17,7 @@
 		</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.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index e479558..e889521 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,13 +1,2 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
-gradle.user.home=
-java.home=
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=false
-show.console.view=false
-show.executions.view=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 9478cb1..8c9943d 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=17
diff --git a/cics-java-liberty-springboot-jdbc-app/.classpath b/cics-java-liberty-springboot-jdbc-app/.classpath
index a0cd34f..37ab3ef 100644
--- a/cics-java-liberty-springboot-jdbc-app/.classpath
+++ b/cics-java-liberty-springboot-jdbc-app/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
@@ -7,6 +8,12 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.buildship.core.prefs
index 258eb47..b1886ad 100644
--- a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.buildship.core.prefs
+++ b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.buildship.core.prefs
@@ -1,13 +1,2 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=..
 eclipse.preferences.version=1
-gradle.user.home=
-java.home=
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=false
-show.console.view=false
-show.executions.view=false
diff --git a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.jdt.core.prefs
index 1dc432c..8c9943d 100644
--- a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.jdt.core.prefs
+++ b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=17
@@ -11,6 +10,5 @@ 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.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
diff --git a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.component
index a41f672..133bb79 100644
--- a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.component
+++ b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="cics-java-liberty-springboot-jdbc-app">
-		<property name="context-root" value="cics-java-liberty-springboot-jdbc-app"/>
+	<wb-module deploy-name="cics-java-liberty-springboot-jdbc">
+		<property name="context-root" value="cics-java-liberty-springboot-jdbc"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
 		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
diff --git a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.project.facet.core.xml b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7859c6b..1bfcd9b 100644
--- a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/cics-java-liberty-springboot-jdbc-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.web" version="6.0"/>
 	<installed facet="jst.java" version="17"/>
 </faceted-project>
diff --git a/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.validation.prefs b/cics-java-liberty-springboot-jdbc-app/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..2e240e7
--- /dev/null
+++ b/cics-java-liberty-springboot-jdbc-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-app/build.gradle b/cics-java-liberty-springboot-jdbc-app/build.gradle
index cd878aa..6b85f7f 100755
--- a/cics-java-liberty-springboot-jdbc-app/build.gradle
+++ b/cics-java-liberty-springboot-jdbc-app/build.gradle
@@ -41,6 +41,17 @@ eclipse
     {
         downloadJavadoc = true
     }
+    wtp
+    {
+        facet
+        {
+            facet name: 'jst.web', version: '6.0'
+        }
+        component
+        {
+            contextPath = 'cics-java-liberty-springboot-jdbc'
+        }
+    }
 }
 
 repositories
@@ -48,16 +59,18 @@ repositories
 	mavenCentral()                
 }
 
-dependencies 
+dependencies
 {
+    // CICS TS Maven BOM (version from gradle.properties)
+    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")
 
 	// Spring Boot web starter dependency
     implementation("org.springframework.boot:spring-boot-starter-web")
 
     // Don't include TomCat in the runtime build, but do put it in WEB-INF so it can be run standalone a well as embedded
-    providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")     
+    providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
-    // Spring JDBC Support    
-    implementation("org.springframework.boot:spring-boot-starter-data-jdbc") 
+    // Spring JDBC Support
+    implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
 }
 
diff --git a/gradle.properties b/gradle.properties
index 2e2acde..c8c2d20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
 java_version = 17
+cics.bom.version=6.1-20250812133513-PH63856
 
 # Gradle daemon improves build performance
 org.gradle.daemon=true
@@ -7,4 +8,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 
 # Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
-# org.gradle.configuration-cache=true
\ No newline at end of file
+# org.gradle.configuration-cache=true
diff --git a/pom.xml b/pom.xml
index 443b03e..63b24cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,21 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <cics.jvmserver>DFHWLP</cics.jvmserver>
+    <cics.bom.version>6.1-20250812133513-PH63856</cics.bom.version>
   </properties>
+
+  <!-- Dependency Management -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.ibm.cics</groupId>
+        <artifactId>com.ibm.cics.ts.bom</artifactId>
+        <version>${cics.bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
    
    <!-- ================================================================ -->
     <!-- Modules                                                          -->