diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml
index d9f9201b..6debce19 100644
--- a/group_vars/all/09_ports.yml
+++ b/group_vars/all/09_ports.yml
@@ -7,7 +7,7 @@ ports:
     # https://developer.mozilla.org/de/docs/Web/API/WebSockets_API
     websocket:
       web-app-mastodon: 4001
-      espocrm: 4002
+      web-app-espocrm: 4002
     oauth2_proxy:
       phpmyadmin: 4181
       lam: 4182
@@ -60,7 +60,7 @@ ports:
       phpldapadmin: 8037
       fusiondirectory: 8038
       presentation: 8039
-      espocrm: 8040
+      web-app-espocrm: 8040
       syncope: 8041
       collabora: 8042
       mobilizon: 8043
diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml
index ed9701a8..f4b957da 100644
--- a/group_vars/all/10_networks.yml
+++ b/group_vars/all/10_networks.yml
@@ -80,7 +80,7 @@ defaults_networks:
       subnet: 192.168.103.32/28
     presentation:
       subnet: 192.168.103.48/28
-    espocrm:
+    web-app-espocrm:
       subnet: 192.168.103.64/28
     syncope:
       subnet: 192.168.103.80/28
diff --git a/group_vars/all/12_oidc.yml b/group_vars/all/12_oidc.yml
index 1a76df21..0f6a0fe6 100644
--- a/group_vars/all/12_oidc.yml
+++ b/group_vars/all/12_oidc.yml
@@ -12,7 +12,7 @@ _oidc_client_realm:         "{{ oidc.client.realm if oidc.client is defined and
 _oidc_url:                  "{{ 
                                 (oidc.url 
                                   if (oidc is defined and oidc.url is defined) 
-                                  else web_protocol ~ '://' ~ (domains | get_domain('keycloak'))
+                                  else web_protocol ~ '://' ~ (domains | get_domain('web-app-keycloak'))
                                 ) 
                             }}"
 _oidc_client_issuer_url:    "{{ _oidc_url }}/realms/{{_oidc_client_realm}}"
diff --git a/roles/web-app-espocrm/config/main.yml b/roles/web-app-espocrm/config/main.yml
index 2e337a52..4f5d78f9 100644
--- a/roles/web-app-espocrm/config/main.yml
+++ b/roles/web-app-espocrm/config/main.yml
@@ -1,5 +1,3 @@
-images:              
-  espocrm:            "espocrm/espocrm:latest"
 features:
   matomo:             true
   css:                false
@@ -30,4 +28,10 @@ email:
 docker:
   services:
     database:
-      enabled: true
\ No newline at end of file
+      enabled: true              
+    espocrm:
+      image:    "espocrm/espocrm"
+      version:  "latest"
+      name:     "espocrm"
+    volumes:
+      data: espocrm_data
\ No newline at end of file
diff --git a/roles/web-app-espocrm/templates/docker-compose.yml.j2 b/roles/web-app-espocrm/templates/docker-compose.yml.j2
index cb6f08bf..5559c8a6 100644
--- a/roles/web-app-espocrm/templates/docker-compose.yml.j2
+++ b/roles/web-app-espocrm/templates/docker-compose.yml.j2
@@ -1,6 +1,7 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   web:
-    image: "{{ applications | get_app_conf(application_id, 'images.espocrm', True) }}"
+    container_name: {{ espocrm_name }}
+    image: "{{ espocrm_image }}:{{ espocrm_version }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
     ports:
@@ -11,7 +12,7 @@
       - data:/var/www/html
 
   daemon:
-    image: "{{ applications | get_app_conf(application_id, 'images.espocrm', True) }}"
+    image: "{{ espocrm_image }}:{{ espocrm_version }}"
     restart: {{docker_restart_policy}}
     logging:
       driver: journald
@@ -21,7 +22,7 @@
       - data:/var/www/html
 
   websocket:
-    image: "{{ applications | get_app_conf(application_id, 'images.espocrm', True) }}"
+    image: "{{ espocrm_image }}:{{ espocrm_version }}"
     restart: {{docker_restart_policy}}
     logging:
       driver: journald
@@ -40,5 +41,6 @@
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
+    name: {{ espocrm_volume }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/web-app-espocrm/vars/main.yml b/roles/web-app-espocrm/vars/main.yml
index bfceee64..26d79efe 100644
--- a/roles/web-app-espocrm/vars/main.yml
+++ b/roles/web-app-espocrm/vars/main.yml
@@ -1,7 +1,11 @@
-application_id:                 "espocrm"
+application_id:                 "web-app-espocrm"
 database_type:                  "mariadb"
 ws_path:                        "/ws"
 ws_port:                        "{{ ports.localhost.websocket[application_id] }}"
 client_max_body_size:           "100m"
 vhost_flavour:                  "ws_generic"
-docker_compose_flush_handlers:  true
\ No newline at end of file
+docker_compose_flush_handlers:  true
+espocrm_version:                "{{ applications | get_app_conf(application_id, 'docker.services.espocrm.version', True) }}"
+espocrm_image:                  "{{ applications | get_app_conf(application_id, 'docker.services.espocrm.image', True) }}"
+espocrm_name:                   "{{ applications | get_app_conf(application_id, 'docker.services.espocrm.name', True) }}"
+espocrm_volume:                 "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
\ No newline at end of file