diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yaml
similarity index 92%
rename from .github/workflows/cleanup-old-runs.yml
rename to .github/workflows/cleanup-old-runs.yaml
index e72e8df..b176fd5 100644
--- a/.github/workflows/cleanup-old-runs.yml
+++ b/.github/workflows/cleanup-old-runs.yaml
@@ -1,17 +1,18 @@
 name: Cleanup Old Workflow Runs
 
+permissions:
+  contents: read
+
 on:
   schedule:
     - cron: '0 0 * * 0'  # Run weekly on Sunday at midnight UTC
   workflow_dispatch:  # Allow manual triggering
 
-permissions:
-  actions: write
-  contents: read
-
 jobs:
   cleanup:
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     steps:
       - name: Delete old workflow runs
         uses: Mattraks/delete-workflow-runs@v2
@@ -20,4 +21,3 @@ jobs:
           repository: ${{ github.repository }}
           retain_days: 30
           keep_minimum_runs: 6
-
diff --git a/.project b/.project
index 9541560..f4e439f 100644
--- a/.project
+++ b/.project
@@ -10,21 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<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.m2e.core.maven2Builder</name>
 			<arguments>
@@ -32,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.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-asynchronous-app/.classpath b/cics-java-liberty-springboot-asynchronous-app/.classpath
index 816f63d..bea4734 100644
--- a/cics-java-liberty-springboot-asynchronous-app/.classpath
+++ b/cics-java-liberty-springboot-asynchronous-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-asynchronous-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.buildship.core.prefs
index 258eb47..b1886ad 100644
--- a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.buildship.core.prefs
+++ b/cics-java-liberty-springboot-asynchronous-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-asynchronous-app/.settings/org.eclipse.wst.common.component b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component
index a3a0305..811df99 100644
--- a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component
+++ b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,7 @@
 	<wb-module deploy-name="cics-java-liberty-springboot-asynchronous-app">
 		<property name="context-root" value="cics-java-liberty-springboot-asynchronous"/>
 		<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-asynchronous-app/build.gradle b/cics-java-liberty-springboot-asynchronous-app/build.gradle
index 343185f..8f9de42 100644
--- a/cics-java-liberty-springboot-asynchronous-app/build.gradle
+++ b/cics-java-liberty-springboot-asynchronous-app/build.gradle
@@ -63,7 +63,7 @@ dependencies
     
     // Use correct BOM version for CICS TS (6.1 is the minimum supported release for this sample)
     // If you are running on a higher CICS TS version, you may replace this with a newer BOM)
-    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')}"))
     
     // JCICS API (version inherited from BOM)
     compileOnly("com.ibm.cics:com.ibm.cics.server")
diff --git a/cics-java-liberty-springboot-asynchronous-app/pom.xml b/cics-java-liberty-springboot-asynchronous-app/pom.xml
index 2d53aad..f9931b1 100644
--- a/cics-java-liberty-springboot-asynchronous-app/pom.xml
+++ b/cics-java-liberty-springboot-asynchronous-app/pom.xml
@@ -31,7 +31,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/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml b/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml
index 67b05e8..d04a6ab 100644
--- a/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml
+++ b/cics-java-liberty-springboot-asynchronous-app/src/main/webapp/WEB-INF/ibm-web-ext.xml
@@ -5,8 +5,5 @@
 	xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-ext_1_0.xsd"
 	version="1.0">
 
-	<context-root uri="cics-java-liberty-springboot-asynchronous" />
-	<enable-directory-browsing value="false"/>
-	<enable-serving-servlets-by-class-name value="false" />
-
+	<context-root uri="cics-java-liberty-springboot-asynchronous"/>
 </web-ext>
diff --git a/gradle.properties b/gradle.properties
index ebe8699..9007fbf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,4 +11,7 @@ org.gradle.java.installations.auto-detect=true
 org.gradle.java.installations.auto-download=true
 
 # Configuration cache disabled due to CICS Bundle Plugin 1.0.8 incompatibility
-# org.gradle.configuration-cache=true
\ No newline at end of file
+# org.gradle.configuration-cache=true
+
+# CICS TS BOM version
+cics.bom.version=6.1-20250812133513-PH63856
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b15dc84..878eb5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,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>
    
    <!-- ================================================================ -->