diff --git a/archetypes/database-mp/src/main/resources/pom.xml.mustache b/archetypes/database-mp/src/main/resources/pom.xml.mustache
index 3b7a7d28d..55e5722f9 100644
--- a/archetypes/database-mp/src/main/resources/pom.xml.mustache
+++ b/archetypes/database-mp/src/main/resources/pom.xml.mustache
@@ -43,9 +43,28 @@
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.common</groupId>
+            <artifactId>helidon-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <!-- needed to compile persistence.xml -->
+            <groupId>io.helidon.microprofile.server</groupId>
+            <artifactId>helidon-microprofile-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.bundles</groupId>
+            <artifactId>helidon-microprofile</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <!-- dependency>
             <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
+            <scope>runtime</scope>
         </dependency -->
         <dependency>
             <groupId>com.h2database</groupId>
@@ -76,28 +95,12 @@
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
             <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.microprofile.server</groupId>
-            <artifactId>helidon-microprofile-server</artifactId>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-binding</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>io.helidon.microprofile.config</groupId>
-            <artifactId>helidon-microprofile-config</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.microprofile.config</groupId>
-            <artifactId>microprofile-config-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -131,21 +134,45 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.ethlo.persistence.tools</groupId>
-                <artifactId>eclipselink-maven-plugin</artifactId>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.14.0</version>
                 <executions>
                     <execution>
-                        <id>weave</id>
-                        <phase>process-classes</phase>
+                        <id>Generate persistence.xml Java objects</id>
                         <goals>
-                            <goal>weave</goal>
+                            <goal>generate</goal>
                         </goals>
+                        <configuration>
+                            <generatePackage>io.helidon.archetypes.tests.jaxb</generatePackage>
+                            <markGenerated>true</markGenerated>
+                            <schemas>
+                                <schema>
+                                    <dependencyResource>
+                                        <groupId>jakarta.persistence</groupId>
+                                        <artifactId>jakarta.persistence-api</artifactId>
+                                        <resource>javax/persistence/persistence_2_2.xsd</resource>
+                                    </dependencyResource>
+                                </schema>
+                            </schemas>
+                            <strict>false</strict>
+                        </configuration>
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.hibernate.orm.tooling</groupId>
+                <artifactId>hibernate-enhance-maven-plugin</artifactId>
+                <version>5.4.6.Final</version>
+                <executions>
                     <execution>
-                        <id>modelgen</id>
-                        <phase>generate-sources</phase>
+                        <configuration>
+                            <failOnError>true</failOnError>
+                            <enableLazyInitialization>true</enableLazyInitialization>
+                            <enableDirtyTracking>true</enableDirtyTracking>
+                        </configuration>
                         <goals>
-                            <goal>modelgen</goal>
+                            <goal>enhance</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/archetypes/database-mp/src/main/resources/src/main/resources/hibernate.properties b/archetypes/database-mp/src/main/resources/src/main/resources/hibernate.properties
new file mode 100644
index 000000000..5d0d4b0e1
--- /dev/null
+++ b/archetypes/database-mp/src/main/resources/src/main/resources/hibernate.properties
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2020 Oracle and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Byte code for JPA must be generated at compile time.
+# This is a limitation of native image
+hibernate.bytecode.provider=none
+