diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 77d4356..09e4c2b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -59,10 +59,9 @@ jobs:
         with:
           java-version: ${{ matrix.jdk }}
           distribution: "semeru"
-          cache: maven
-      - name: Build with Maven
-        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify          
-      
+      - name: Build with Maven Wrapper
+        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
+
   build-gradle:
     name: Build Gradle
     
@@ -85,8 +84,8 @@ jobs:
       run: gradle build -Pjava_version=${{ matrix.jdk }}
 
   build-gradlew:
-    name: Build Gradle Wrapper
-
+    name: Build Gradle wrapper
+    
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -99,6 +98,4 @@ jobs:
         java-version: ${{ matrix.jdk }}
         distribution: 'semeru'
     - name: Build with Gradle Wrapper
-      run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}     
-
-# Made with Bob
+      run: ./gradlew build -Pjava_version=${{ matrix.jdk }}
diff --git a/.github/workflows/cleanup-old-runs.yml b/.github/workflows/cleanup-old-runs.yml
index 089e879..0ea8903 100644
--- a/.github/workflows/cleanup-old-runs.yml
+++ b/.github/workflows/cleanup-old-runs.yml
@@ -20,5 +20,3 @@ jobs:
           repository: ${{ github.repository }}
           retain_days: 30
           keep_minimum_runs: 3  # Keep at least 3 recent runs of each workflow
-
-# Made with Bob
\ No newline at end of file
diff --git a/cics-java-liberty-link-app/build.gradle b/cics-java-liberty-link-app/build.gradle
index 58a5209..8395aff 100644
--- a/cics-java-liberty-link-app/build.gradle
+++ b/cics-java-liberty-link-app/build.gradle
@@ -12,8 +12,10 @@ version = '1.0.0'
 
 java
 {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
+	toolchain
+	{
+		languageVersion = JavaLanguageVersion.of(java_version)
+	}
 }
 
 // If in Eclipse, add Javadoc to the local project classpath
diff --git a/cics-java-liberty-link-app/pom.xml b/cics-java-liberty-link-app/pom.xml
index a88dbc0..9f27b43 100644
--- a/cics-java-liberty-link-app/pom.xml
+++ b/cics-java-liberty-link-app/pom.xml
@@ -32,12 +32,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.13.0</version>
         <configuration>
             <annotationProcessorPaths>
                 <annotationProcessorPath>
                     <groupId>com.ibm.cics</groupId>
-                    <artifactId>com.ibm.cics.server.invocation</artifactId>              
+                    <artifactId>com.ibm.cics.server.invocation</artifactId>
                 </annotationProcessorPath>
             </annotationProcessorPaths>
         </configuration>
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..c7bb65b
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,10 @@
+java_version = 8
+
+# 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
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e0c80f2..7e589a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
         com.ibm.cics.server.invocation.CICSProgram annotation for Link to Liberty.</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>8</java.version>
         <cics.jvmserver>DFHWLP</cics.jvmserver>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -38,4 +38,18 @@
         <module>cics-java-liberty-link-app</module>
         <module>cics-java-liberty-link-bundle</module>
     </modules>
+
+    <!-- ================================================================ -->
+    <!-- Build Configuration                                              -->
+    <!-- ================================================================ -->
+    <build>
+        <plugins>
+            <!-- Maven Compiler Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/settings.gradle b/settings.gradle
index 93b433f..b028d48 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,10 @@
+// ============================================================================
+// Root Project Configuration
+// ============================================================================
 rootProject.name = 'cics-java-liberty-link'
+
+// ============================================================================
+// Subprojects
+// ============================================================================
 include(':cics-java-liberty-link-app')
 include(':cics-java-liberty-link-bundle')