diff --git a/pom.xml b/pom.xml
index 7731908..e8e5d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-		  <version>5.7.0-PRE8-SNAPSHOT</version>
+		  <version>5.7.0-PRE9-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 17b1dfb..9313f4f 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -5,7 +5,7 @@ spring:
     baselineOnMigrate: true
   datasource:
     url: 'jdbc:h2:file:./target/database/h2'
-    #url: jdbc:h2:mem:test_mem
+#    url: jdbc:h2:mem:test_mem
     username: sa
     password: null
     driverClassName: org.h2.Driver
@@ -18,6 +18,7 @@ spring:
     properties:
       hibernate.format_sql: false
       hibernate.show_sql: false
+      hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect
 #      hibernate.dialect: org.hibernate.dialect.h2dialect
 #      hibernate.hbm2ddl.auto: update
 #      hibernate.jdbc.batch_size: 20
@@ -26,8 +27,12 @@ spring:
 #      hibernate.cache.use_structured_entries: false
 #      hibernate.cache.use_minimal_puts: false
 ###    These settings will enable fulltext search with lucene
-#      hibernate.search.enabled: true
+      hibernate.search.enabled: true
+#      hibernate.search.automatic_indexing.strategy: session
+#      hibernate.search.automatic_indexing.synchronization.strategy: sync
+      hibernate.search.backend.type: elasticsearch
 #      hibernate.search.backend.type: lucene
+      hibernate.search.backedn.analysis.configurer: ca.uhn.fhir.jpa.search.elastic.HapiElasticsearchAnalysisConfigurer
 #      hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer
 #      hibernate.search.backend.directory.type: local-filesystem
 #      hibernate.search.backend.directory.root: target/lucenefiles
@@ -153,21 +158,21 @@ hapi:
 #        startTlsEnable:
 #        startTlsRequired:
 #        quitWait:
-#    lastn_enabled: true
-#    store_resource_in_lucene_index_enabled: true
+    lastn_enabled: true
+    store_resource_in_lucene_index_enabled: true
 ###  This is configuration for normalized quantity serach level default is 0
 ###   0: NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED - default
 ###   1: NORMALIZED_QUANTITY_STORAGE_SUPPORTED
 ###   2: NORMALIZED_QUANTITY_SEARCH_SUPPORTED
 #    normalized_quantity_search_level: 2
-#elasticsearch:
-#  debug:
-#    pretty_print_json_log: false
-#    refresh_after_write: false
-#  enabled: false
-#  password: SomePassword
-#  required_index_status: YELLOW
-#  rest_url: 'localhost:9200'
-#  protocol: 'http'
-#  schema_management_strategy: CREATE
-#  username: SomeUsername
+elasticsearch:
+  debug:
+    pretty_print_json_log: true
+    refresh_after_write: false
+  enabled: true
+  password: smilecdr
+  required_index_status: YELLOW
+  rest_url: 'localhost:19200'
+  protocol: 'http'
+  schema_management_strategy: CREATE
+  username: elastic