diff --git a/pom.xml b/pom.xml
index c9c0fe2..b875f33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,11 +138,11 @@
             </exclusions>
         </dependency>
 
-        <!-- This example uses Derby embedded database. If you are using another database such as Mysql or Oracle, you may omit the following dependencies and replace them with an appropriate database client
+        <!-- This example uses H2 embedded database. If you are using another database such as Mysql or Oracle, you may omit the following dependencies and replace them with an appropriate database client
             dependency for your database platform. -->
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
         </dependency>
 
         <!-- The following dependencies are only needed for automated unit tests, you do not neccesarily need them to run the example. -->
diff --git a/src/main/resources/hapi.properties b/src/main/resources/hapi.properties
index 537f034..4499207 100644
--- a/src/main/resources/hapi.properties
+++ b/src/main/resources/hapi.properties
@@ -31,8 +31,8 @@ logger.name=fhirtest.access
 logger.format=Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] Operation[${operationType} ${operationName} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}] ResponseEncoding[${responseEncodingNoDefault}]
 logger.error_format=ERROR - ${requestVerb} ${requestUrl}
 logger.log_exceptions=true
-datasource.driver=org.apache.derby.jdbc.EmbeddedDriver
-datasource.url=jdbc:derby:directory:target/jpaserver_derby_files;create=true
+datasource.driver=org.h2.Driver
+datasource.url=jdbc:h2:file:target/jpaserver_derby_files
 datasource.username=
 datasource.password=
 server.name=Local Tester
@@ -47,7 +47,7 @@ test.port=
 ###################################################
 # Database Settings
 ###################################################
-hibernate.dialect=ca.uhn.fhir.jpa.util.DerbyTenSevenHapiFhirDialect
+hibernate.dialect=org.hibernate.dialect.H2Dialect
 hibernate.search.model_mapping=ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory
 hibernate.format_sql=false
 hibernate.show_sql=false