diff --git a/roles/web-app-mobilizon/templates/docker-compose.yml.j2 b/roles/web-app-mobilizon/templates/docker-compose.yml.j2
index 5bb2b332..524d7fe9 100644
--- a/roles/web-app-mobilizon/templates/docker-compose.yml.j2
+++ b/roles/web-app-mobilizon/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
     image: "{{ mobilizon_image }}{{ ':' ~ mobilizon_version if mobilizon_version }}"
-    container_name: "{{ mobilizon_image }}"
+    container_name: "{{ mobilizon_container }}"
     volumes:
       - uploads:/var/lib/mobilizon/uploads
       - {{ mobilizon_host_conf_exs_file }}:/etc/mobilizon/config.exs:ro
diff --git a/roles/web-app-mobilizon/vars/main.yml b/roles/web-app-mobilizon/vars/main.yml
index 6164fb79..e9b7e36f 100644
--- a/roles/web-app-mobilizon/vars/main.yml
+++ b/roles/web-app-mobilizon/vars/main.yml
@@ -7,4 +7,4 @@ container_port:                 4000
 mobilizon_host_conf_exs_file:   "{{docker_compose.directories.config}}config.exs"
 mobilizon_version:              "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.version', True) }}"
 mobilizon_image:                "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.image', True) }}"
-mobilizon_name:                 "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.name', True) }}"
\ No newline at end of file
+mobilizon_container:            "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.name', True) }}"
\ No newline at end of file
diff --git a/roles/web-app-phpmyadmin/templates/docker-compose.yml.j2 b/roles/web-app-phpmyadmin/templates/docker-compose.yml.j2
index 7ebd65f4..e51def5e 100644
--- a/roles/web-app-phpmyadmin/templates/docker-compose.yml.j2
+++ b/roles/web-app-phpmyadmin/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@
   application:
 {% set container_port = 80 %}
     image: "{{ phpmyadmin_image }}:{{ phpmyadmin_version }}"
-    container_name: "{{ phpmyadmin_name }}"
+    container_name: "{{ phpmyadmin_container }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
diff --git a/roles/web-app-phpmyadmin/vars/main.yml b/roles/web-app-phpmyadmin/vars/main.yml
index c2aaf456..12589152 100644
--- a/roles/web-app-phpmyadmin/vars/main.yml
+++ b/roles/web-app-phpmyadmin/vars/main.yml
@@ -3,4 +3,4 @@ database_type:        "mariadb"
 database_host:        "{{ applications | get_app_conf('svc-db-mariadb', 'docker.services.mariadb.name', True) if applications | get_app_conf(application_id, 'features.central_database', False)}}"
 phpmyadmin_version:   "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.version', True) }}"
 phpmyadmin_image:     "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.image', True) }}"
-phpmyadmin_name:      "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.name', True) }}"
\ No newline at end of file
+phpmyadmin_container:      "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.name', True) }}"
\ No newline at end of file
diff --git a/roles/web-app-snipe-it/vars/main.yml b/roles/web-app-snipe-it/vars/main.yml
index a87e305c..8d608650 100644
--- a/roles/web-app-snipe-it/vars/main.yml
+++ b/roles/web-app-snipe-it/vars/main.yml
@@ -4,6 +4,6 @@ database_type:      "mariadb"
 snipe_it_url:       "{{ domains | get_url(application_id, web_protocol) }}"
 snipe_it_version:   "{{ applications | get_app_conf(application_id, 'docker.services.snipe-it.version', True) }}"
 snipe_it_image:     "{{ applications | get_app_conf(application_id, 'docker.services.snipe-it.image', True) }}"
-snipe_it_name:      "{{ applications | get_app_conf(application_id, 'docker.services.snipe-it.name', True) }}"
+snipe_it_container:      "{{ applications | get_app_conf(application_id, 'docker.services.snipe-it.name', True) }}"
 snipe_it_volume:    "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
 snipe_it_user:      "www-data"
\ No newline at end of file
diff --git a/roles/web-app-yourls/vars/main.yml b/roles/web-app-yourls/vars/main.yml
index 29f17bac..4a15fddf 100644
--- a/roles/web-app-yourls/vars/main.yml
+++ b/roles/web-app-yourls/vars/main.yml
@@ -4,4 +4,4 @@ yourls_user:      "{{ applications | get_app_conf(application_id, 'users.adminis
 yourls_password:  "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
 yourls_version:   "{{ applications | get_app_conf(application_id, 'docker.services.yourls.version', True) }}"
 yourls_image:     "{{ applications | get_app_conf(application_id, 'docker.services.yourls.image', True) }}"
-yourls_name:      "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"
\ No newline at end of file
+yourls_container:      "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"
\ No newline at end of file