diff --git a/.gitignore b/.gitignore
index 642e292..688aa00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 bin/
 *.war
 *.jar
+.mvn/wrapper/maven-wrapper.jar
 
 # Avoid ignoring Gradle wrapper jar and properties (needed for wrapper to work)
 !gradle-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index eebc3c1..0000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 62ef348..8c9943d 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,11 @@
 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/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs
index 62ef348..8c9943d 100644
--- a/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs
+++ b/cics-java-liberty-springboot-asynchronous-app/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,11 @@
 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/etc/config/liberty/server.xml b/etc/config/liberty/server.xml
index 1e2ed2a..b7ef4eb 100644
--- a/etc/config/liberty/server.xml
+++ b/etc/config/liberty/server.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server description="CICS Liberty JVM server template configuration">
+<server description="Liberty server for CICS Spring Boot asynchronous sample">
 
-	<!-- Enable features -->
-	<featureManager>
-		<feature>cicsts:core-1.0</feature>
-		<feature>servlet-6.0</feature>
-		<feature>concurrent-3.0</feature>
-	</featureManager>
+    <featureManager>
+        <!-- Required for Spring Boot 3.x and Jakarta EE 10 -->
+        <feature>servlet-6.0</feature>
+        <!-- Required for Spring @Async with CICS-enabled threads -->
+        <feature>concurrent-3.0</feature>
+    </featureManager>
 
-    <!-- Default HTTP End Point -->
-    <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="9080" />
-
-    <!-- Reduce z/FS overheads by reducing config and app polling -->
-    <config monitorInterval="5s" updateTrigger="polled" />
-    <applicationMonitor updateTrigger="disabled" dropins="dropins" 
-                        dropinsEnabled="false" pollingRate="5s" />
-                        
 </server>