diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9ce6807e..f2400071 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,6 +38,8 @@ jobs:
         # gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
     - name: Build
       run: ./mvnw -B -q -ff -ntp verify
+    - name: Build With Enhancement
+      run: ./mvnw -Penhanced -B -q -ff -ntp verify
     - name: Extract project Maven version
       id: projectVersion
       run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -DforceStdout -Dexpression=project.version -q)" >>$GITHUB_OUTPUT
diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml
index c9fc18d8..0883addc 100644
--- a/hibernate5/pom.xml
+++ b/hibernate5/pom.xml
@@ -130,4 +130,37 @@ Hibernate (https://hibernate.org) version 5.x data types.
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>enhanced</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.hibernate.orm.tooling</groupId>
+            <artifactId>hibernate-enhance-maven-plugin</artifactId>
+            <version>5.3.20.Final</version>
+            <executions>
+              <execution>
+                <id>enhance</id>
+                <phase>test-compile</phase>
+                <goals>
+                  <goal>enhance</goal>
+                </goals>
+                <configuration>
+                  <base>${build.testOutputDirectory}</base>
+                  <dir>${build.testOutputDirectory}</dir>
+                  <failOnError>true</failOnError>
+                  <enableLazyInitialization>true</enableLazyInitialization>
+                  <enableDirtyTracking>true</enableDirtyTracking>
+                  <enableAssociationManagement>true</enableAssociationManagement>
+                  <enableExtendedEnhancement>false</enableExtendedEnhancement>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/hibernate6/pom.xml b/hibernate6/pom.xml
index a7b04912..42250aeb 100644
--- a/hibernate6/pom.xml
+++ b/hibernate6/pom.xml
@@ -106,4 +106,37 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>enhanced</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.hibernate.orm.tooling</groupId>
+            <artifactId>hibernate-enhance-maven-plugin</artifactId>
+            <version>${hibernate.version}</version>
+            <executions>
+              <execution>
+                <id>enhance</id>
+                <phase>test-compile</phase>
+                <goals>
+                  <goal>enhance</goal>
+                </goals>
+                <configuration>
+                  <base>${build.testOutputDirectory}</base>
+                  <dir>${build.testOutputDirectory}</dir>
+                  <failOnError>true</failOnError>
+                  <enableLazyInitialization>true</enableLazyInitialization>
+                  <enableDirtyTracking>true</enableDirtyTracking>
+                  <enableAssociationManagement>true</enableAssociationManagement>
+                  <enableExtendedEnhancement>false</enableExtendedEnhancement>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>