diff --git a/docker-compose.yml b/docker-compose.yml
index a4cf158a7..b52f7c6a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,6 +55,7 @@ services:
       - DB_USER=${DB_USER:-odk}
       - DB_PASSWORD=${DB_PASSWORD:-odk}
       - DB_NAME=${DB_NAME:-odk}
+      - DB_PORT=${DB_PORT:-null}
       - DB_SSL=${DB_SSL:-null}
       - EMAIL_FROM=${EMAIL_FROM:-no-reply@$DOMAIN}
       - EMAIL_HOST=${EMAIL_HOST:-mail}
diff --git a/files/service/config.json.template b/files/service/config.json.template
index a4ebc8fba..cdf5bb763 100644
--- a/files/service/config.json.template
+++ b/files/service/config.json.template
@@ -3,6 +3,7 @@
     "database": {
       "host": "${DB_HOST}",
       "user": "${DB_USER}",
+      "port": ${DB_PORT},
       "password": "${DB_PASSWORD}",
       "database": "${DB_NAME}",
       "ssl": ${DB_SSL}