diff --git a/cics-java-liberty-springboot-transactions-app/build.gradle b/cics-java-liberty-springboot-transactions-app/build.gradle
index 3f4ef39..bebb216 100644
--- a/cics-java-liberty-springboot-transactions-app/build.gradle
+++ b/cics-java-liberty-springboot-transactions-app/build.gradle
@@ -15,8 +15,9 @@ version = '0.1.0'
 // Java Configuration
 // ============================================================================
 java {
-    sourceCompatibility = JavaVersion.toVersion(java_version)
-    targetCompatibility = JavaVersion.toVersion(java_version)
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(java_version)
+    }
 }
 
 // ============================================================================
diff --git a/gradle.properties b/gradle.properties
index ce648b0..eebe627 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,10 @@
-#
-# Values in this file provide defaults to variables used in the 
-# gradle files.
-#
-
-# Normally we don't publish any built artifacts to a repository.
-# But if we do, these are the default values we use to indicate
-# where the files should be placed.
-#
-# These can be over-ridden from the command line 
-# with -Ppublish_repo_releases_url="file://my-folder" for example.
-# 
-# These values only have any effect if the publish goal is used.
-# For example: gradle build publish.
-publish_repo_releases_url = 'default-value-for-publish_repo_releases_url'
-publish_repo_releases_name = 'default-value-for-publish_repo_releases_name'
 java_version = 17
+
+# Gradle daemon improves build performance
+org.gradle.daemon=true
+
+# Enable parallel builds for faster compilation
+org.gradle.parallel=true
+
+# Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
+# org.gradle.configuration-cache=true
diff --git a/pom.xml b/pom.xml
index 90aa10d..3b5a1cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,4 +50,20 @@
     <module>cics-java-liberty-springboot-transactions-cicsbundle</module>
   </modules>
 
+  <!-- ================================================================ -->
+  <!-- Build Configuration                                              -->
+  <!-- ================================================================ -->
+  <build>
+    <plugins>
+      <!-- Maven Compiler Plugin with release parameter -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>