diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4
index accadca46..3bfef5d2c 100644
--- a/docker/docker-compose.yml.m4
+++ b/docker/docker-compose.yml.m4
@@ -254,6 +254,10 @@ ifelse(read_env(`PGNODE_3_ENABLED'), 1, `'
       - CACHE_SIZE=ifenvelse(`CACHE_SIZE', 10)
       - CACHE_DATA_MIN_SIZE_KB=ifenvelse(`CACHE_DATA_MIN_SIZE_KB', 0)
       - CACHE_DATA_MAX_SIZE_KB=ifenvelse(`CACHE_DATA_MAX_SIZE_KB', 10240)
+      - DATABASE_HOST=read_env(`MEDIAFILE_DATABASE_HOST')
+      - DATABASE_PORT=read_env(`MEDIAFILE_DATABASE_PORT')
+      - DATABASE_USER=read_env(`MEDIAFILE_DATABASE_USER')
+      - DATABASE_PASSWORD=read_env(`MEDIAFILE_DATABASE_PASSWORD')
       - DATABASE_NAME=read_env(`MEDIAFILE_DATABASE_NAME')
       - DATABASE_TABLE=read_env(`MEDIAFILE_DATABASE_TABLENAME')
     restart: always
diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4
index c20164ecb..a2880a887 100644
--- a/docker/docker-stack.yml.m4
+++ b/docker/docker-stack.yml.m4
@@ -277,6 +277,10 @@ ifelse(read_env(`PGNODE_3_ENABLED'), 1, `'
       - CACHE_SIZE=ifenvelse(`CACHE_SIZE', 10)
       - CACHE_DATA_MIN_SIZE_KB=ifenvelse(`CACHE_DATA_MIN_SIZE_KB', 0)
       - CACHE_DATA_MAX_SIZE_KB=ifenvelse(`CACHE_DATA_MAX_SIZE_KB', 10240)
+      - DATABASE_HOST=read_env(`MEDIAFILE_DATABASE_HOST')
+      - DATABASE_PORT=read_env(`MEDIAFILE_DATABASE_PORT')
+      - DATABASE_USER=read_env(`MEDIAFILE_DATABASE_USER')
+      - DATABASE_PASSWORD=read_env(`MEDIAFILE_DATABASE_PASSWORD')
       - DATABASE_NAME=read_env(`MEDIAFILE_DATABASE_NAME')
       - DATABASE_TABLE=read_env(`MEDIAFILE_DATABASE_TABLENAME')
     deploy: