diff --git a/.env.cluster b/.env.cluster
index 0c501267..9ed564ae 100644
--- a/.env.cluster
+++ b/.env.cluster
@@ -19,11 +19,10 @@ OPENHIM_MONGO_ATNAURL=mongodb://mongo-1:27017,mongo-2:27017,mongo-3:27017/openhi
 
 # FHIR Datastore - HAPI FHIR
 HAPI_FHIR_INSTANCES=3
-# (pool size * instances) should be less than 100
-HF_MAX_POOL_SIZE=30
 REPMGR_PARTNER_NODES=postgres-1,postgres-2,postgres-3
 POSTGRES_REPLICA_SET=postgres-1:5432,postgres-2:5432,postgres-3:5432
 HAPI_DB_SET=pgpool-1:5432,pgpool-2:5432,pgpool-3:5432
+HF_POSTGRES_MEMORY_LIMIT=8G
 
 # Sante Datastore - Sante MPI
 SANTEMPI_REPMGR_PARTNER_NODES=santempi-psql-1,santempi-psql-2,santempi-psql-3
diff --git a/config.yaml b/config.yaml
index 04c40d90..a5021df1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,5 +1,5 @@
 projectName: platform
-image: jembi/platform:2.5.0
+image: jembi/platform:2.5.1
 logPath: /tmp/logs
 
 packages:
diff --git a/fhir-datastore-hapi-fhir/config/custom_postgresql.conf b/fhir-datastore-hapi-fhir/config/custom_postgresql.conf
index f4543c51..ac7b9f99 100644
--- a/fhir-datastore-hapi-fhir/config/custom_postgresql.conf
+++ b/fhir-datastore-hapi-fhir/config/custom_postgresql.conf
@@ -1,2 +1,12 @@
 max_connections = 250
-shared_buffers = 768MB
+shared_buffers = 2GB
+effective_cache_size = 6GB
+wal_buffers = 16MB
+default_statistics_target = 500
+effective_io_concurrency = 2
+huge_pages = off
+min_wal_size = 4GB
+max_wal_size = 16GB
+max_parallel_workers_per_gather = 4
+max_parallel_maintenance_workers = 4
+maintenance_work_mem = 1GB
diff --git a/fhir-datastore-hapi-fhir/package-metadata.json b/fhir-datastore-hapi-fhir/package-metadata.json
index 040bbe71..87d8ef61 100644
--- a/fhir-datastore-hapi-fhir/package-metadata.json
+++ b/fhir-datastore-hapi-fhir/package-metadata.json
@@ -3,7 +3,7 @@
   "name": "Fhir Datastore Package - HAPI-FHIR",
   "description": "A FHIR compliant server for the platform",
   "type": "infrastructure",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "dependencies": [],
   "environmentVariables": {
     "REPMGR_PRIMARY_HOST": "postgres-1",