diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml
index 9b1fdb8f..e106317d 100644
--- a/group_vars/all/09_ports.yml
+++ b/group_vars/all/09_ports.yml
@@ -64,7 +64,7 @@ ports:
       web-app-espocrm: 8040
       syncope: 8041
       collabora: 8042
-      mobilizon: 8043
+      web-app-mobilizon: 8043
       simpleicons: 8044
       libretranslate: 8045
       pretix: 8046
diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml
index f58b4354..1670f593 100644
--- a/group_vars/all/10_networks.yml
+++ b/group_vars/all/10_networks.yml
@@ -14,7 +14,7 @@ defaults_networks:
       subnet: 192.168.101.16/28
     web-app-baserow:
       subnet: 192.168.101.32/28
-    mobilizon:
+    web-app-mobilizon:
       subnet: 192.168.101.48/28
     bluesky:
       subnet: 192.168.101.64/28
diff --git a/roles/web-app-mobilizon/config/main.yml b/roles/web-app-mobilizon/config/main.yml
index 055c4183..d9b8b1ff 100644
--- a/roles/web-app-mobilizon/config/main.yml
+++ b/roles/web-app-mobilizon/config/main.yml
@@ -1,6 +1,4 @@
 titel:              "Mobilizon on {{ primary_domain | upper }}"
-images:
-  mobilizon:        "docker.io/framasoft/mobilizon"
 features:
   central_database: true
   oidc:             true
@@ -20,4 +18,8 @@ domains:
 docker:
   services:
     database:
-      enabled: true
\ No newline at end of file
+      enabled: true
+    mobilizon:
+      image:    "docker.io/framasoft/mobilizon"
+      name:     "mobilizon"
+      version:  ""
\ No newline at end of file
diff --git a/roles/web-app-mobilizon/templates/docker-compose.yml.j2 b/roles/web-app-mobilizon/templates/docker-compose.yml.j2
index 21c39b5c..5bb2b332 100644
--- a/roles/web-app-mobilizon/templates/docker-compose.yml.j2
+++ b/roles/web-app-mobilizon/templates/docker-compose.yml.j2
@@ -1,6 +1,7 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-    image: "{{ applications | get_app_conf(application_id, 'images.' ~ application_id, True) }}"
+    image: "{{ mobilizon_image }}{{ ':' ~ mobilizon_version if mobilizon_version }}"
+    container_name: "{{ mobilizon_image }}"
     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 bfda0b34..6164fb79 100644
--- a/roles/web-app-mobilizon/vars/main.yml
+++ b/roles/web-app-mobilizon/vars/main.yml
@@ -1,7 +1,10 @@
-application_id:                 mobilizon
+application_id:                 web-app-mobilizon
 
 database_type:                  "postgres"
 database_gis_enabled:           true
 
 container_port:                 4000
-mobilizon_host_conf_exs_file:   "{{docker_compose.directories.config}}config.exs"
\ No newline at end of file
+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