diff --git a/alerta.conf.tmpl b/alerta.conf.tmpl
index d599dc2..d27a50a 100644
--- a/alerta.conf.tmpl
+++ b/alerta.conf.tmpl
@@ -8,7 +8,7 @@ timezone = Europe/London
 
 [alerta-mailer]
 amqp_topic = notify
-amqp_url = "{{ env "MONGODB_TYPE" }}://{{ env "MONGODB_USER" }}:{{ secret "db_root_password" }}@{{ env "MONGODB_ADDR" }}/{{ env "MONGODB_NAME" }}"
+amqp_url = "mongodb://{{ env "DB_HOST" }}/{{ env "DB_NAME" }}"
 config_file = /app/alerta.conf
 dashboard_url = https://{{ env "DOMAIN" }}
 debug = {{ env "DEBUG" }}
diff --git a/alertad.conf.tmpl b/alertad.conf.tmpl
index 9c2ef77..f291454 100644
--- a/alertad.conf.tmpl
+++ b/alertad.conf.tmpl
@@ -49,7 +49,7 @@ PLUGINS = [
     "rocketchat",
 ]
 
-AMQP_URL = "{{ env "MONGODB_TYPE" }}://{{ env "MONGODB_USER" }}:{{ secret "db_root_password" }}@{{ env "MONGODB_ADDR" }}/{{ env "MONGODB_NAME" }}"
+AMQP_URL = "mongodb://{{ env "DB_HOST" }}/{{ env "DB_NAME" }}"
 AMQP_TOPIC = "notify"
 
 ROCKETCHAT_WEBHOOK_URL = "{{ secret "rocket_chat_webhook_url" }}"
@@ -57,8 +57,8 @@ ROCKETCHAT_CHANNEL = "{{ env "ROCKET_CHAT_CHANNEL" }}"
 ALERTA_USERNAME = "{{ env "ROCKET_CHAT_ALERTA_USERNAME" }}"
 ICON_EMOJI = "{{ env "ROCKET_CHAT_ICON_EMOJI" }}"
 
-DATABASE_URL = "{{ env "MONGODB_TYPE" }}://{{ env "MONGODB_USER" }}:{{ secret "db_root_password" }}@{{ env "MONGODB_ADDR" }}/{{ env "MONGODB_NAME" }}"
-DATABASE_NAME = "{{ env "MONGODB_NAME" }}"
+DATABASE_URL = "mongodb://{{ env "DB_HOST" }}"
+DATABASE_NAME = "{{ env "DB_NAME" }}"
 
 EMAIL_VERIFICATION = False
 MAIL_FROM = "{{ env "MAIL_FROM" }}"
diff --git a/compose.yml b/compose.yml
index f8cae53..d9cd328 100644
--- a/compose.yml
+++ b/compose.yml
@@ -29,10 +29,8 @@ x-environment: &default-env
   - KEYCLOAK_URL=${KEYCLOAK_URL}
   - MAIL_FROM=${MAIL_FROM}
   - MAIL_TO=${MAIL_TO}
-  - MONGODB_ADDR=db:27017
-  - MONGODB_NAME=alerta
-  - MONGODB_TYPE=mongodb
-  - MONGODB_USER=alerta
+  - DB_HOST=db:27017
+  - DB_NAME=alerta
   - OAUTH2_CLIENT_ID=${OAUTH2_CLIENT_ID}
   - ROCKET_CHAT_ALERTA_USERNAME=${ROCKET_CHAT_ALERTA_USERNAME}
   - ROCKET_CHAT_CHANNEL=${ROCKET_CHAT_CHANNEL}
@@ -73,16 +71,10 @@ services:
 
   db:
     image: "mongo:4.4.3-bionic"
-    command: |
-      --authenticationDatabase=admin
     secrets:
       - db_root_password
     volumes:
       - "mongodb:/data/db"
-    environment:
-      - MONGO_INITDB_DATABASE=alerta
-      - MONGO_INITDB_ROOT_USERNAME=alerta
-      - MONGO_INITDB_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
     networks:
       - internal