diff --git a/scripts/ubiquity-postgresql/Dockerfile b/scripts/ubiquity-postgresql/Dockerfile
index 45e156e6..43fa3ddc 100644
--- a/scripts/ubiquity-postgresql/Dockerfile
+++ b/scripts/ubiquity-postgresql/Dockerfile
@@ -3,7 +3,8 @@ FROM postgres:9.6
 ENV UBIQUITY_DB_CERT_PRIVATE="/var/lib/postgresql/ssl/private/ubiquity-db.key" \
     UBIQUITY_DB_CERT_PUBLIC="/var/lib/postgresql/ssl/private/ubiquity-db.crt" \
     UBIQUITY_DB_PROVIDED_CERT_PRIVATE="/var/lib/postgresql/ssl/provided/ubiquity-db.key" \
-    UBIQUITY_DB_PROVIDED_CERT_PUBLIC="/var/lib/postgresql/ssl/provided/ubiquity-db.crt"
+    UBIQUITY_DB_PROVIDED_CERT_PUBLIC="/var/lib/postgresql/ssl/provided/ubiquity-db.crt"\
+    UBIQUITY_DB_MAX_CONNECTION="1000"
 
 RUN PGSSL_PRIVATE="`dirname $UBIQUITY_DB_CERT_PRIVATE`" && mkdir -p "$PGSSL_PRIVATE" && chown -R postgres:postgres "$PGSSL_PRIVATE" && chmod 777 "$PGSSL_PRIVATE"
 RUN PGSSL_PUBLIC="`dirname $UBIQUITY_DB_CERT_PUBLIC`" && mkdir -p "$PGSSL_PUBLIC" && chown -R postgres:postgres "$PGSSL_PUBLIC" && chmod 777 "$PGSSL_PUBLIC"
diff --git a/scripts/ubiquity-postgresql/docker-entrypoint-initdb.d/init-db-tuning.sh b/scripts/ubiquity-postgresql/docker-entrypoint-initdb.d/init-db-tuning.sh
new file mode 100644
index 00000000..4ab9ad17
--- /dev/null
+++ b/scripts/ubiquity-postgresql/docker-entrypoint-initdb.d/init-db-tuning.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ ! -z "$UBIQUITY_DB_MAX_CONNECTION" ]
+then
+       echo "Updating max_connection to $UBIQUITY_DB_MAX_CONNECTION"
+       sed -i "s/max_connections = 100/max_connections = ${UBIQUITY_DB_MAX_CONNECTION}/g" /var/lib/postgresql/data/postgresql.conf
+fi