diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index dabfbf3..8e3afd3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -100,4 +100,3 @@ jobs:
     - name: Build with Gradle Wrapper
       run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}
 
-
diff --git a/cics-java-liberty-springboot-transactions-app/build.gradle b/cics-java-liberty-springboot-transactions-app/build.gradle
index b605b9f..6f9289f 100644
--- a/cics-java-liberty-springboot-transactions-app/build.gradle
+++ b/cics-java-liberty-springboot-transactions-app/build.gradle
@@ -1,7 +1,7 @@
 plugins
 {
 	id 'org.springframework.boot' version '3.5.16'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'io.spring.dependency-management' version '1.1.7'
 	id 'java'
 	id 'eclipse'
 	id 'war'
@@ -15,7 +15,8 @@ version = '0.1.0'
 // Java Configuration
 // ============================================================================
 java {
-    toolchain {
+    toolchain
+    {
         languageVersion = JavaLanguageVersion.of(java_version)
     }
 }
@@ -23,8 +24,9 @@ java {
 // ============================================================================
 // WAR Configuration
 // ============================================================================
-war {
-    archiveFileName = "cics-java-liberty-springboot-transactions-app-${version}.war"
+war
+{
+    archiveFileName = 'cics-java-liberty-springboot-transactions.war'
 }
 
 // Two versions of the WAR would be built, one for embedding into servers like Liberty (plain)
@@ -54,18 +56,18 @@ eclipse
 
 repositories
 {
-	mavenCentral()
+    mavenCentral()
 }
 
 
 dependencies
-{    
+{
     // CICS BOM (as of Sept 2024)
     compileOnly enforcedPlatform('com.ibm.cics:com.ibm.cics.ts.bom:6.1-20250812133513-PH63856')
-    
+
     // Don't include JCICS in the final build (no need for version because we have BOM)
-    compileOnly("com.ibm.cics:com.ibm.cics.server")   
-    
+    compileOnly("com.ibm.cics:com.ibm.cics.server")
+
     // Spring Boot web support
     implementation ("org.springframework.boot:spring-boot-starter-web")
     
diff --git a/cics-java-liberty-springboot-transactions-app/pom.xml b/cics-java-liberty-springboot-transactions-app/pom.xml
index aca6bd7..29c11c9 100644
--- a/cics-java-liberty-springboot-transactions-app/pom.xml
+++ b/cics-java-liberty-springboot-transactions-app/pom.xml
@@ -73,6 +73,7 @@
   <!-- Package as an executable war (default jar) -->
   <packaging>war</packaging>
   <build>
+    <finalName>cics-java-liberty-springboot-transactions</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/cics-java-liberty-springboot-transactions-cicsbundle/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-springboot-transactions-cicsbundle/.settings/org.eclipse.buildship.core.prefs
index a0ffefc..b1886ad 100644
--- a/cics-java-liberty-springboot-transactions-cicsbundle/.settings/org.eclipse.buildship.core.prefs
+++ b/cics-java-liberty-springboot-transactions-cicsbundle/.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
\ No newline at end of file
diff --git a/cics-java-liberty-springboot-transactions-cicsbundle/build.gradle b/cics-java-liberty-springboot-transactions-cicsbundle/build.gradle
index 722f3a7..e214755 100644
--- a/cics-java-liberty-springboot-transactions-cicsbundle/build.gradle
+++ b/cics-java-liberty-springboot-transactions-cicsbundle/build.gradle
@@ -1,7 +1,8 @@
 // ============================================================================
 // Plugins
 // ============================================================================
-plugins {
+plugins
+{
     id 'com.ibm.cics.bundle' version '1.0.8'
 }
 
@@ -14,7 +15,8 @@ version = '1.0.0'
 // ============================================================================
 // Dependencies
 // ============================================================================
-dependencies {
+dependencies
+{
     // Application WAR from sibling project
     cicsBundlePart project(path: ':cics-java-liberty-springboot-transactions-app', configuration: 'archives')
 }
@@ -22,10 +24,10 @@ dependencies {
 // ============================================================================
 // CICS Bundle Configuration
 // ============================================================================
-cicsBundle {
-    build {
+cicsBundle
+{
+    build
+    {
         defaultJVMServer = project.findProperty('cics.jvmserver') ?: 'DFHWLP'
     }
 }
-
-
diff --git a/cics-java-liberty-springboot-transactions-cicsbundle/pom.xml b/cics-java-liberty-springboot-transactions-cicsbundle/pom.xml
index b3dcce5..a357077 100644
--- a/cics-java-liberty-springboot-transactions-cicsbundle/pom.xml
+++ b/cics-java-liberty-springboot-transactions-cicsbundle/pom.xml
@@ -51,7 +51,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
-
-
diff --git a/gradle.properties b/gradle.properties
index eebe627..0ae2a21 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,5 +6,9 @@ org.gradle.daemon=true
 # Enable parallel builds for faster compilation
 org.gradle.parallel=true
 
+# Enable toolchain auto-provisioning to download JDKs if not found locally
+org.gradle.java.installations.auto-detect=true
+org.gradle.java.installations.auto-download=true
+
 # Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
 # org.gradle.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aaaabb3..03b32a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 9689704..84629da 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,12 @@
+// ============================================================================
+// Toolchain Configuration
+// ============================================================================
+// Configure toolchain resolver for auto-provisioning of JDKs
+plugins
+{
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 // ============================================================================
 // Root Project Configuration
 // ============================================================================
@@ -7,4 +16,4 @@ rootProject.name = 'cics-java-liberty-springboot-transactions'
 // Subprojects
 // ============================================================================
 include(':cics-java-liberty-springboot-transactions-app')
-include(':cics-java-liberty-springboot-transactions-cicsbundle')
\ No newline at end of file
+include(':cics-java-liberty-springboot-transactions-cicsbundle')