diff --git a/roles/your_spotify/defaults/main.yml b/roles/your_spotify/defaults/main.yml
index 652148d288..8a20444aca 100644
--- a/roles/your_spotify/defaults/main.yml
+++ b/roles/your_spotify/defaults/main.yml
@@ -85,7 +85,7 @@ your_spotify_docker_envs_default:
   SPOTIFY_PUBLIC: "{{ your_spotify.public_key }}"
   SPOTIFY_SECRET: "{{ your_spotify.secret_key }}"
   CORS: "{{ your_spotify_web_url + ':443' }}"
-  MONGO_ENDPOINT: "mongodb://your_spotify_db:27017/your_spotify"
+  MONGO_ENDPOINT: "mongodb://your-spotify-db:27017/your_spotify"
 your_spotify_docker_envs_custom: {}
 your_spotify_docker_envs: "{{ your_spotify_docker_envs_default
                               | combine(your_spotify_docker_envs_custom) }}"
diff --git a/roles/your_spotify/tasks/main.yml b/roles/your_spotify/tasks/main.yml
index 185e849017..efbc12690a 100644
--- a/roles/your_spotify/tasks/main.yml
+++ b/roles/your_spotify/tasks/main.yml
@@ -19,11 +19,16 @@
     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"
     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"
 
+- name: Remove old Database Docker container
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
+  vars:
+    _var_prefix: "your_spotify_db"
+
 - name: MongoDB Role
   ansible.builtin.include_role:
     name: mongodb
   vars:
-    mongodb_instances: ["your_spotify_db"]
+    mongodb_instances: ["your-spotify-db"]
     mongodb_paths_location: "{{ server_appdata_path }}/{{ your_spotify_name }}"
 
 - name: Remove existing Docker container