diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cb7505f..5eceb3e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,14 +1,14 @@
 name: Build
 
+permissions:
+  contents: read
+
 on:
   push:
     branches: ["main"]
   pull_request:
     branches: ["main"]
 
-permissions:
-  contents: read
-
 jobs:
   check-copyright:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/cleanup-old-runs.yaml b/.github/workflows/cleanup-old-runs.yaml
index 384754d..496882e 100644
--- a/.github/workflows/cleanup-old-runs.yaml
+++ b/.github/workflows/cleanup-old-runs.yaml
@@ -1,5 +1,8 @@
 name: Cleanup old workflow runs
 
+permissions:
+  contents: read
+
 on:
   schedule:
     - cron: '0 0 * * 0'  # Run weekly on Sunday at midnight UTC
diff --git a/.gitignore b/.gitignore
index a2b657a..1906643 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .gradle/
 **/build/
 !gradle/wrapper/gradle-wrapper.jar
+!gradle/wrapper/gradle-wrapper.properties
 
 # Maven
 target/
diff --git a/.project b/.project
index 432c905..b9d11da 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-jms-app/.classpath b/cics-java-liberty-springboot-jms-app/.classpath
index 816f63d..bea4734 100644
--- a/cics-java-liberty-springboot-jms-app/.classpath
+++ b/cics-java-liberty-springboot-jms-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-jms-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-jms-app/.settings/org.eclipse.wst.common.component
index 76c33bb..312359b 100644
--- a/cics-java-liberty-springboot-jms-app/.settings/org.eclipse.wst.common.component
+++ b/cics-java-liberty-springboot-jms-app/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="cics-java-liberty-springboot-jms">
-		<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+	<wb-module deploy-name="cics-java-liberty-springboot-jms-app">
 		<property name="context-root" value="cics-java-liberty-springboot-jms"/>
-		<property name="java-output-path" value="/bin/default"/>
+		<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-jms-app/build.gradle b/cics-java-liberty-springboot-jms-app/build.gradle
index e4a4af3..f8b750e 100644
--- a/cics-java-liberty-springboot-jms-app/build.gradle
+++ b/cics-java-liberty-springboot-jms-app/build.gradle
@@ -67,9 +67,7 @@ dependencies
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
 	// CICS TS V6.1 Maven BOM (as of Sept 2024)
-	def bom = "com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856"
-
-    compileOnly enforcedPlatform(bom)
+	   compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:${project.property('cics.bom.version')}")
     
     // Don't include JCICS components 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-jms-app/pom.xml b/cics-java-liberty-springboot-jms-app/pom.xml
index 31d0cc2..0dc35e0 100644
--- a/cics-java-liberty-springboot-jms-app/pom.xml
+++ b/cics-java-liberty-springboot-jms-app/pom.xml
@@ -27,7 +27,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 68a1171..6fee7b5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,3 +12,6 @@ org.gradle.java.installations.auto-download=true
 
 # Configuration cache disabled due to CICS Bundle Plugin 1.0.8 incompatibility
 # 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 7474043..9f17693 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>
   
   <!-- ================================================================ -->
@@ -35,7 +36,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>