diff --git a/cics-java-liberty-restapp-app/build.gradle b/cics-java-liberty-restapp-app/build.gradle
index c3eaf83..9c09e8b 100644
--- a/cics-java-liberty-restapp-app/build.gradle
+++ b/cics-java-liberty-restapp-app/build.gradle
@@ -10,7 +10,12 @@ plugins
 group = 'com.ibm.cicsdev.restapp'
 archivesBaseName='cics-java-liberty-restapp'
 version = '0.1.0'
-sourceCompatibility = '1.8'
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(java_version)
+    }
+}
 
 // If in Eclipse, add Javadoc to the local project classpath
 eclipse 
diff --git a/cics-java-liberty-restapp-app/pom.xml b/cics-java-liberty-restapp-app/pom.xml
index abd3b53..2784faa 100644
--- a/cics-java-liberty-restapp-app/pom.xml
+++ b/cics-java-liberty-restapp-app/pom.xml
@@ -44,6 +44,13 @@
 
     <build>
         <plugins>
+            <!-- Maven Compiler Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+            </plugin>
+            
             <!-- WAR plugin build-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -53,7 +60,7 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>										
+                    </archive>
                 </configuration>
             </plugin>
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..458c344
--- /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
diff --git a/pom.xml b/pom.xml
index 3e88cc9..87474ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 	
 
 	<properties>
-		<java.version>1.8</java.version>	
+		<java.version>8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -41,10 +41,22 @@
 
 
 	<modules>
-        <module>cics-java-liberty-restapp-app</module>
-        <module>cics-java-liberty-restapp-bundle</module>
-    </modules>
-
-
+	       <module>cics-java-liberty-restapp-app</module>
+	       <module>cics-java-liberty-restapp-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 ffcf230..48bf055 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,10 @@
+// ============================================================================
+// Root Project Configuration
+// ============================================================================
 rootProject.name = 'cics-java-liberty-restapp'
+
+// ============================================================================
+// Subprojects
+// ============================================================================
 include(':cics-java-liberty-restapp-app')
 include(':cics-java-liberty-restapp-bundle')
\ No newline at end of file