diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6cd9dfc..92d990d 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:
@@ -66,7 +64,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=8 verify
 
diff --git a/.github/workflows/cleanup-old-runs.yaml b/.github/workflows/cleanup-old-runs.yaml
new file mode 100644
index 0000000..496882e
--- /dev/null
+++ b/.github/workflows/cleanup-old-runs.yaml
@@ -0,0 +1,23 @@
+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
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Delete old workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 30
+          keep_minimum_runs: 6
diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yml
deleted file mode 100644
index 8847b2c..0000000
--- a/.github/workflows/cleanup-old-runs.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Cleanup Old Workflow Runs
-
-permissions:
-  actions: write
-  contents: read
-
-on:
-  schedule:
-    - cron: '0 0 * * 0'  # Run weekly on Sunday
-  workflow_dispatch:  # Allow manual trigger
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Delete old workflow runs (including this workflow)
-        uses: Mattraks/delete-workflow-runs@v2
-        with:
-          token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          retain_days: 30
-          keep_minimum_runs: 6  # Keep at least 6 recent runs of each workflow
-
-# Made with Bob
diff --git a/.project b/.project
index 0fe233f..adc5638 100644
--- a/.project
+++ b/.project
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-liberty-restapp</name>
-	<comment>Project cics-java-liberty-restapp created by Buildship.</comment>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
@@ -10,16 +10,6 @@
 			<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>
@@ -27,10 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</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/.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/cics-java-liberty-restapp-app/.classpath b/cics-java-liberty-restapp-app/.classpath
index 7430eb8..ae8ae69 100644
--- a/cics-java-liberty-restapp-app/.classpath
+++ b/cics-java-liberty-restapp-app/.classpath
@@ -1,21 +1,16 @@
 <?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="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.61/JE.JEE_V8_R0">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
 		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs
index 258eb47..b1886ad 100644
--- a/cics-java-liberty-restapp-app/.settings/org.eclipse.buildship.core.prefs
+++ b/cics-java-liberty-restapp-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-restapp-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs
index e9d28d2..1d3fc37 100644
--- a/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs
+++ b/cics-java-liberty-restapp-app/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,8 @@
 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=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
-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
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml b/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml
index cea524a..0568c47 100644
--- a/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/cics-java-liberty-restapp-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="4.0"/>
 	<installed facet="jst.java" version="1.8"/>
 </faceted-project>
diff --git a/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.validation.prefs b/cics-java-liberty-restapp-app/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..2e240e7
--- /dev/null
+++ b/cics-java-liberty-restapp-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-restapp-app/build.gradle b/cics-java-liberty-restapp-app/build.gradle
index 2ae49d1..33d7401 100644
--- a/cics-java-liberty-restapp-app/build.gradle
+++ b/cics-java-liberty-restapp-app/build.gradle
@@ -28,6 +28,18 @@ eclipse
     {
         downloadJavadoc = true
     }
+    // Ensures Gradle Refresh sets the WTP context-root and web facet version correctly.
+    wtp
+    {
+        facet
+        {
+            facet name: 'jst.web', version: '4.0'
+        }
+        component
+        {
+            contextPath = 'cics-java-liberty-restapp'
+        }
+    }
 }
 
 
@@ -40,7 +52,7 @@ repositories
 dependencies 
 {      
     // CICS TS V5.5 Maven BOM
-    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20250513205735-PH63882")
+    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-restapp-app/pom.xml b/cics-java-liberty-restapp-app/pom.xml
index 1020b55..c6b1960 100644
--- a/cics-java-liberty-restapp-app/pom.xml
+++ b/cics-java-liberty-restapp-app/pom.xml
@@ -15,6 +15,19 @@
 
     <name>CICS Enterprise Java Program - Application</name>
 
+    <!-- CICS TS V5.5 BOM repeated here to allow standalone build of this module -->
+    <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>
+
     <dependencies>
         <!-- Compile against, but don't include JCICS in the final build (version 
             and scope are from BOM) -->
@@ -43,6 +56,7 @@
     </dependencies>
 
     <build>
+        <finalName>cics-java-liberty-restapp</finalName>
         <plugins>
         	<!-- WAR plugin build-->
         	<plugin>
diff --git a/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml b/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml
index a735606..af27891 100644
--- a/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml
+++ b/cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml
@@ -4,9 +4,5 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	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-restapp" />
-	<enable-directory-browsing value="false"/>
-	<enable-serving-servlets-by-class-name value="false" />
-
+	<context-root uri="cics-java-liberty-restapp"/>
 </web-ext>
diff --git a/etc/config/server.xml b/etc/config/liberty/server.xml
similarity index 100%
rename from etc/config/server.xml
rename to etc/config/liberty/server.xml
diff --git a/gradle.properties b/gradle.properties
index f0cb1ff..37ac299 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,9 @@
 java_version = 8
 
+# CICS TS BOM version — dot-notation aligns with Maven property <cics.bom.version>
+# Referenced in build.gradle as: ${project.property('cics.bom.version')}
+cics.bom.version=5.5-20250513205735-PH63882
+
 # Gradle daemon improves build performance
 org.gradle.daemon=true
 
diff --git a/pom.xml b/pom.xml
index 06bb267..40b6d79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
 		<java.version>8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cics.jvmserver>DFHWLP</cics.jvmserver>
+		<cics.bom.version>5.5-20250513205735-PH63882</cics.bom.version>
 	</properties>
 
 	<!-- CICS TS V5.5 BOM (as of May 2020) -->
@@ -29,7 +30,7 @@
 			<dependency>
 				<groupId>com.ibm.cics</groupId>
 				<artifactId>com.ibm.cics.ts.bom</artifactId>
-				<version>5.5-20250513205735-PH63882</version>
+				<version>${cics.bom.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>