diff --git a/jpa/eclipselink/pom.xml b/jpa/eclipselink/pom.xml
index 75ed74e6..d609df51 100644
--- a/jpa/eclipselink/pom.xml
+++ b/jpa/eclipselink/pom.xml
@@ -16,7 +16,7 @@
 	<name>Spring Data JPA - EclipseLink setup example</name>
 
 	<properties>
-		<eclipselink.version>2.7.4</eclipselink.version>
+		<eclipselink.version>2.7.6</eclipselink.version>
 	</properties>
 
 	<dependencies>
@@ -133,7 +133,7 @@
 							</dependency>
 						</dependencies>
 						<configuration>
-							<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring-framework.version}/spring-instrument-${spring-framework.version}.jar</argLine>
+							<argLine>${jvm.enable-preview} -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring-framework.version}/spring-instrument-${spring-framework.version}.jar</argLine>
 						</configuration>
 					</plugin>
 					<plugin>
diff --git a/pom.xml b/pom.xml
index e98f6d45..f3bf1690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
 
 	<properties>
 		<apt.version>1.1.3</apt.version>
+		<jvm.enable-preview></jvm.enable-preview>
 	</properties>
 
 	<profiles>
@@ -114,20 +115,34 @@
 				<jdk>[13,)</jdk>
 			</activation>
 
+			<properties>
+				<jvm.enable-preview>--enable-preview</jvm.enable-preview>
+			</properties>
+
 			<build>
 				<plugins>
+					<plugin>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<configuration>
+							<release>13</release>
+							<compilerArgs>
+								${jvm.enable-preview}
+							</compilerArgs>
+						</configuration>
+					</plugin>
 					<plugin>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
-							<argLine>--enable-preview</argLine>
+							<argLine>${jvm.enable-preview}</argLine>
 						</configuration>
 					</plugin>
 					<plugin>
 						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
-							<argLine>--enable-preview</argLine>
+							<argLine>${jvm.enable-preview}</argLine>
 						</configuration>
 					</plugin>
+
 				</plugins>
 			</build>
 		</profile>
@@ -145,9 +160,6 @@
 						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
 							<release>13</release>
-							<compilerArgs>
-								--enable-preview
-							</compilerArgs>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -167,9 +179,6 @@
 						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
 							<release>14</release>
-							<compilerArgs>
-								--enable-preview
-							</compilerArgs>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -189,9 +198,6 @@
 						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
 							<release>15</release>
-							<compilerArgs>
-								--enable-preview
-							</compilerArgs>
 						</configuration>
 					</plugin>
 				</plugins>