diff --git a/.platform/nginx/conf.d/elasticbeanstalk/001_custom.conf b/.platform/nginx/conf.d/elasticbeanstalk/001_custom.conf
index 272db21dd0..aafee53310 100644
--- a/.platform/nginx/conf.d/elasticbeanstalk/001_custom.conf
+++ b/.platform/nginx/conf.d/elasticbeanstalk/001_custom.conf
@@ -3,6 +3,6 @@
 # Global directive for upload size
 client_max_body_size 100M;
 client_body_timeout 300s;        # allow up to 2 minutes for upload
-proxy_connect_timeout 60s;
-proxy_send_timeout 240s;
-proxy_read_timeout 240s;
+proxy_connect_timeout 600s;
+proxy_send_timeout 600s;
+proxy_read_timeout 600s;
diff --git a/matchbox-server/Dockerfile b/matchbox-server/Dockerfile
index 4a9ccb78c6..0bbe5afd9b 100644
--- a/matchbox-server/Dockerfile
+++ b/matchbox-server/Dockerfile
@@ -22,5 +22,5 @@ COPY with-ca/ca.on.oh-ereferral-econsult-0.12.0-alpha1.0.7-snapshots.tgz igs
 
 USER matchbox
 
-ENTRYPOINT ["java", "-Xmx8192M", "-Dfhir.settings.path=config/fhir-settings.json", "-Dspring.config.additional-location=file:config/application.yaml", "-jar", "matchbox.jar"]
+ENTRYPOINT ["java", "-Xms14g", "-Xmx14g", "-Dfhir.settings.path=config/fhir-settings.json", "-Dspring.config.additional-location=file:config/application.yaml", "-jar", "matchbox.jar"]
 
diff --git a/matchbox-server/with-ca/application.yaml b/matchbox-server/with-ca/application.yaml
index 0c566e46fb..4b097ec260 100644
--- a/matchbox-server/with-ca/application.yaml
+++ b/matchbox-server/with-ca/application.yaml
@@ -1,6 +1,12 @@
 server:
   servlet:
     context-path: /matchboxv3
+spring:
+  datasource:
+    url: "jdbc:postgresql://ps-ca-hapi-fhir-db-dev.ccq3yll5qome.ca-central-1.rds.amazonaws.com:5432/matchbox-v4"
+    username: matchbox
+    password: matchbox
+    driverClassName: org.postgresql.Driver
   jpa:
     properties:
       hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
@@ -8,7 +14,7 @@ matchbox:
   fhir:
     context:
       fhirVersion: 4.0.1
-      txServer: https://tx.fhir.org
+      txServer: https://terminologystandardsservice.ca/tx/fhir
       txServerCache: false
       onlyOneEngine: false
       suppressWarnInfo:
@@ -65,7 +71,7 @@ matchbox:
       httpReadOnly: true
 hapi:
   fhir:
-    server_address: https://matchbox.apibox.ca/matchboxv3/fhir
+    server_address: https://dev-matchbox.apibox.ca/matchboxv3/fhir
     staticLocation: file:/apps/
     implementationguides:
       fhir_r4_core:
@@ -87,18 +93,18 @@ hapi:
       hl7-terminology-r4:
         name: hl7.terminology.r4
         version: 6.0.2
-      ips110:
-        name: hl7.fhir.uv.ips
-        version: 1.1.0
+#      ips110:
+#        name: hl7.fhir.uv.ips
+#        version: 1.1.0
       ips200bt:
         name: hl7.fhir.uv.ips
         version: 2.0.0-ballot
       mhd422:
         name: ihe.iti.mhd
         version: 4.2.2
-      mhd410:
-        name: ihe.iti.mhd
-        version: 4.1.0
+#      mhd410:
+#        name: ihe.iti.mhd
+#        version: 4.1.0
       pixm300:
         name: ihe.iti.pixm
         version: 3.0.0