diff --git a/roles/rocketchat/defaults/main.yml b/roles/rocketchat/defaults/main.yml
index 1ae4869c75..75492eb32e 100644
--- a/roles/rocketchat/defaults/main.yml
+++ b/roles/rocketchat/defaults/main.yml
@@ -78,9 +78,9 @@ rocketchat_docker_ports: "{{ rocketchat_docker_ports_defaults
 rocketchat_docker_envs_default:
   TZ: "{{ tz }}"
   ROOT_URL: "{{ rocketchat_web_url }}"
-  MONGO_URL: mongodb://rocketchat_db:27017/rocketchat?replicaSet=rs0
-  MONGO_OPLOG_URL: mongodb://rocketchat_db:27017/local?replicaSet=rs0
-  DEPLOY_METHOD: docker
+  MONGO_URL: "mongodb://rocketchat_db:27017/rocketchat?replicaSet=rs0"
+  MONGO_OPLOG_URL: "mongodb://rocketchat_db:27017/local?replicaSet=rs0"
+  DEPLOY_METHOD: "docker"
 rocketchat_docker_envs_custom: {}
 rocketchat_docker_envs: "{{ rocketchat_docker_envs_default
                             | combine(rocketchat_docker_envs_custom) }}"
@@ -153,3 +153,8 @@ rocketchat_docker_restart_policy: unless-stopped
 
 # State
 rocketchat_docker_state: started
+
+# Dependencies
+rocketchat_depends_on: "rocketchat_db"
+rocketchat_depends_on_delay: "0"
+rocketchat_depends_on_healthchecks: "false"
diff --git a/roles/rocketchat/tasks/main.yml b/roles/rocketchat/tasks/main.yml
index 54ce7d7b84..79b25eac0d 100644
--- a/roles/rocketchat/tasks/main.yml
+++ b/roles/rocketchat/tasks/main.yml
@@ -14,9 +14,9 @@
     mongodb_instances: ["rocketchat_db"]
     mongodb_docker_image_tag: "5"
     mongodb_docker_envs_custom:
-      MONGODB_REPLICA_SET_MODE: primary
-      MONGODB_REPLICA_SET_NAME: rs0
-      MONGODB_ENABLE_JOURNAL: true
+      MONGODB_REPLICA_SET_MODE: "primary"
+      MONGODB_REPLICA_SET_NAME: "rs0"
+      MONGODB_ENABLE_JOURNAL: "true"
 
 - name: Add DNS record
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"