diff --git a/docker-compose.yml b/docker-compose.yml
index 2453220..a53141d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,17 +6,16 @@ services:
     restart: on-failure
     ports:
       - "8080:8080"
-  db:
-    image: postgres:latest
-    container_name: postgres
+  hapi-fhir-mysql:
+    image: mysql:latest
+    container_name: hapi-fhir-mysql
     restart: always
     environment:
-      POSTGRES_PASSWORD: 'admin'
-      POSTGRES_USER: 'admin'
-      POSTGRES_DB: 'fhir'
-    ports:
-      - 5000:5432
+      MYSQL_DATABASE: 'hapi'
+      MYSQL_USER: 'admin'
+      MYSQL_PASSWORD: 'admin'
+      MYSQL_ROOT_PASSWORD: 'admin'
     volumes:
-      - fhirData:/var/lib/postgresql/data
+      - hapi-fhir-mysql:/var/lib/mysql
 volumes:
-  fhirData:
+  hapi-fhir-mysql:
diff --git a/es/docker-compose.yml b/es/docker-compose.yml
deleted file mode 100644
index 21e2f16..0000000
--- a/es/docker-compose.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: "3.0"
-services:
-  elasticsearch:
-    container_name: es-container
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.11.0
-    environment:
-      - xpack.security.enabled=false
-      - "discovery.type=single-node"
-    networks:
-      - es-net
-    ports:
-      - 9200:9200
-  kibana:
-    container_name: kb-container
-    image: docker.elastic.co/kibana/kibana:7.11.0
-    environment:
-      - ELASTICSEARCH_HOSTS=http://es-container:9200
-    networks:
-      - es-net
-    depends_on:
-      - elasticsearch
-    ports:
-      - 5601:5601
-networks:
-  es-net:
-    driver: bridge
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2cf540c..4471c2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.20</version>
+            <version>42.2.9</version>
         </dependency>
 
         <!-- Needed for Email subscriptions -->
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index d87c2cf..ea9bfa3 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,9 +1,10 @@
 spring:
   datasource:
-    url: 'jdbc:postgresql://db:5432/fhir'
-    username: admin
-    password: admin
-    driverClassName: org.postgresql.Driver
+    url: 'jdbc:h2:file:./target/database/h2'
+    #url: jdbc:h2:mem:test_mem
+    username: sa
+    password: null
+    driverClassName: org.h2.Driver
     max-active: 15
 
     # database connection pool size
@@ -13,7 +14,7 @@ spring:
     properties:
       hibernate.format_sql: false
       hibernate.show_sql: false
-      hibernate.dialect: org.hibernate.dialect.PostgreSQL95Dialect
+#      hibernate.dialect: org.hibernate.dialect.h2dialect
 #      hibernate.hbm2ddl.auto: update
 #      hibernate.jdbc.batch_size: 20
 #      hibernate.cache.use_query_cache: false
@@ -21,12 +22,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.backend.type: lucene
-      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
-      hibernate.search.backend.lucene_version: lucene_current
+#      hibernate.search.enabled: true
+#      hibernate.search.backend.type: lucene
+#      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
+#      hibernate.search.backend.lucene_version: lucene_current
   batch:
     job:
       enabled: false
@@ -94,19 +95,19 @@ hapi:
     search-coord-max-pool-size: 100
     search-coord-queue-capacity: 200
 
-    logger:
-      error_format: 'ERROR - ${requestVerb} ${requestUrl}'
-      format: >-
-        Path[${servletPath}] Source[${requestHeader.x-forwarded-for}]
-        Operation[${operationType} ${operationName} ${idOrResourceName}]
-        UA[${requestHeader.user-agent}] Params[${requestParameters}]
-        ResponseEncoding[${responseEncodingNoDefault}]
-      log_exceptions: true
-      name: fhirtest.access
-    max_binary_size: 104857600
-    max_page_size: 200
-    retain_cached_searches_mins: 60
-    reuse_cached_search_results_millis: 30000
+#    logger:
+#      error_format: 'ERROR - ${requestVerb} ${requestUrl}'
+#      format: >-
+#        Path[${servletPath}] Source[${requestHeader.x-forwarded-for}]
+#        Operation[${operationType} ${operationName} ${idOrResourceName}]
+#        UA[${requestHeader.user-agent}] Params[${requestParameters}]
+#        ResponseEncoding[${responseEncodingNoDefault}]
+#      log_exceptions: true
+#      name: fhirtest.access
+#    max_binary_size: 104857600
+#    max_page_size: 200
+#    retain_cached_searches_mins: 60
+#    reuse_cached_search_results_millis: 60000
     tester:
         home:
           name: Local Tester