diff --git a/nifi-registry-docker/dockerhub/README.md b/nifi-registry-docker/dockerhub/README.md
index e4f7823..860c6dc 100644
--- a/nifi-registry-docker/dockerhub/README.md
+++ b/nifi-registry-docker/dockerhub/README.md
@@ -123,3 +123,15 @@ volume to provide certificates on the host system to the container instance.
     -e LDAP_TLS_TRUSTSTORE: ''
     -e LDAP_TLS_TRUSTSTORE_PASSWORD: ''
     -e LDAP_TLS_TRUSTSTORE_TYPE: ''
+
+### The following, optional environment variables can be used to configure the database
+
+| nifi-registry.properties entry         | Variable                   |
+|----------------------------------------|----------------------------|
+| nifi.registry.db.url                   | NIFI_REGISTRY_DB_URL       |
+| nifi.registry.db.driver.class          | NIFI_REGISTRY_DB_CLASS     |
+| nifi.registry.db.driver.directory      | NIFI_REGISTRY_DB_DIR       |
+| nifi.registry.db.driver.username       | NIFI_REGISTRY_DB_USER      |
+| nifi.registry.db.driver.password       | NIFI_REGISTRY_DB_PASS      |
+| nifi.registry.db.driver.maxConnections | NIFI_REGISTRY_DB_MAX_CONNS |
+| nifi.registry.db.sql.debug             | NIFI_REGISTRY_DB_DEBUG_SQL |
\ No newline at end of file
diff --git a/nifi-registry-docker/dockerhub/sh/start.sh b/nifi-registry-docker/dockerhub/sh/start.sh
index 618d229..0d725ad 100755
--- a/nifi-registry-docker/dockerhub/sh/start.sh
+++ b/nifi-registry-docker/dockerhub/sh/start.sh
@@ -23,6 +23,8 @@ scripts_dir='/opt/nifi-registry/scripts'
 prop_replace 'nifi.registry.web.http.port'      "${NIFI_REGISTRY_WEB_HTTP_PORT:-18080}"
 prop_replace 'nifi.registry.web.http.host'      "${NIFI_REGISTRY_WEB_HTTP_HOST:-$HOSTNAME}"
 
+. ${scripts_dir}/update_database.sh
+
 # Check if we are secured or unsecured
 case ${AUTH} in
     tls)
diff --git a/nifi-registry-docker/dockerhub/sh/update_database.sh b/nifi-registry-docker/dockerhub/sh/update_database.sh
new file mode 100644
index 0000000..c1c3c6f
--- /dev/null
+++ b/nifi-registry-docker/dockerhub/sh/update_database.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+prop_replace 'nifi.registry.db.url'                         "${NIFI_REGISTRY_DB_URL:-jdbc:h2:./database/nifi-registry-primary;AUTOCOMMIT=OFF;DB_CLOSE_ON_EXIT=FALSE;LOCK_MODE=3;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE}"
+prop_replace 'nifi.registry.db.driver.class'                "${NIFI_REGISTRY_DB_CLASS:-org.h2.Driver}"
+prop_replace 'nifi.registry.db.driver.directory'            "${NIFI_REGISTRY_DB_DIR:-}"
+prop_replace 'nifi.registry.db.driver.username'             "${NIFI_REGISTRY_DB_USER:-nifireg}"
+prop_replace 'nifi.registry.db.driver.password'             "${NIFI_REGISTRY_DB_PASS:-nifireg}"
+prop_replace 'nifi.registry.db.driver.maxConnections'       "${NIFI_REGISTRY_DB_MAX_CONNS:-5}"
+prop_replace 'nifi.registry.db.sql.debug'                   "${NIFI_REGISTRY_DB_DEBUG_SQL:-false}"
\ No newline at end of file