diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8e3afd3..487aad2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,12 +1,13 @@
 name: Build
 
+permissions:
+  contents: read
+
 on:
   push:
     branches: ["main"]
   pull_request:
     branches: ["main"]
-permissions:
-  contents: read
 
 jobs:
   check-copyright:
@@ -99,4 +100,3 @@ jobs:
         distribution: 'semeru'
     - name: Build with Gradle Wrapper
       run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}
-
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 d829b3c..40d4abd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 !src/**/build/
 gradle-app.setting
 !gradle-wrapper.jar
+!gradle-wrapper.properties
 
 # Maven
 target/
diff --git a/.project b/.project
index 098fb41..ebee31b 100644
--- a/.project
+++ b/.project
@@ -5,21 +5,6 @@
 	<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>
@@ -32,10 +17,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 8c9943d..62ef348 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=17
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
diff --git a/cics-java-liberty-springboot-transactions-app/.classpath b/cics-java-liberty-springboot-transactions-app/.classpath
index 816f63d..bea4734 100644
--- a/cics-java-liberty-springboot-transactions-app/.classpath
+++ b/cics-java-liberty-springboot-transactions-app/.classpath
@@ -13,6 +13,11 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<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="output" path="bin/default"/>
 </classpath>
diff --git a/cics-java-liberty-springboot-transactions-app/.project b/cics-java-liberty-springboot-transactions-app/.project
index d3b4142..dced597 100644
--- a/cics-java-liberty-springboot-transactions-app/.project
+++ b/cics-java-liberty-springboot-transactions-app/.project
@@ -2,37 +2,41 @@
 <projectDescription>
 	<name>cics-java-liberty-springboot-transactions-app</name>
 	<comment></comment>
-	<projects/>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
+	<projects>
+	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
-	<linkedResources/>
-	<filteredResources/>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
 </projectDescription>
diff --git a/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component
index 6973e61..b8d0636 100644
--- a/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component
+++ b/cics-java-liberty-springboot-transactions-app/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,7 @@
 	<wb-module deploy-name="cics-java-liberty-springboot-transactions-app">
 		<property name="context-root" value="cics-java-liberty-springboot-transactions"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
 		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
 	</wb-module>
 </project-modules>
diff --git a/cics-java-liberty-springboot-transactions-app/build.gradle b/cics-java-liberty-springboot-transactions-app/build.gradle
index 6f9289f..34e4392 100644
--- a/cics-java-liberty-springboot-transactions-app/build.gradle
+++ b/cics-java-liberty-springboot-transactions-app/build.gradle
@@ -63,7 +63,7 @@ repositories
 dependencies
 {
     // CICS BOM (as of Sept 2024)
-    compileOnly enforcedPlatform('com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856')
+    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")
 
     // Don't include JCICS in the final build (no need for version because we have BOM)
     compileOnly("com.ibm.cics:com.ibm.cics.server")
diff --git a/cics-java-liberty-springboot-transactions-app/pom.xml b/cics-java-liberty-springboot-transactions-app/pom.xml
index 29c11c9..9f5de92 100644
--- a/cics-java-liberty-springboot-transactions-app/pom.xml
+++ b/cics-java-liberty-springboot-transactions-app/pom.xml
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>com.ibm.cics</groupId>
         <artifactId>com.ibm.cics.ts.bom</artifactId>
-        <version>6.1-20250812133513-PH63856</version>
+        <version>${cics.bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/gradle.properties b/gradle.properties
index 0ae2a21..f45f611 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,3 +12,6 @@ org.gradle.java.installations.auto-download=true
 
 # Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
 # org.gradle.configuration-cache=true
+
+# CICS TS BOM version
+cics.bom.version=6.1-20250812133513-PH63856
diff --git a/pom.xml b/pom.xml
index b3fe9e4..6980cce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
     <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cics.jvmserver>DFHWLP</cics.jvmserver>
+    <cics.bom.version>6.1-20250812133513-PH63856</cics.bom.version>
   </properties>
   
   <!-- Dependency Management -->
@@ -33,7 +34,7 @@
       <dependency>
         <groupId>com.ibm.cics</groupId>
         <artifactId>com.ibm.cics.ts.bom</artifactId>
-        <version>6.1-20250812133513-PH63856</version>
+        <version>${cics.bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>