diff --git a/roles/web-app-lam/config/main.yml b/roles/web-app-lam/config/main.yml
index b858bc91..94132154 100644
--- a/roles/web-app-lam/config/main.yml
+++ b/roles/web-app-lam/config/main.yml
@@ -1,5 +1,8 @@
-images:
-  lam:                          "ghcr.io/ldapaccountmanager/lam:latest"
+docker:
+  services:
+    lam:
+      image:   ghcr.io/ldapaccountmanager/lam
+      version: latest
 oauth2_proxy:
   application:                  application
   port:                         80
@@ -10,7 +13,6 @@ features:
   css:                          true
   port-ui-desktop:              true
   ldap:                         true
-  central_database:             false
   oauth2:                       true
   logout:                       true
 server:
diff --git a/roles/web-app-lam/templates/docker-compose.yml.j2 b/roles/web-app-lam/templates/docker-compose.yml.j2
index 09f8fd06..dab5d626 100644
--- a/roles/web-app-lam/templates/docker-compose.yml.j2
+++ b/roles/web-app-lam/templates/docker-compose.yml.j2
@@ -1,8 +1,8 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
-    container_name: {{ application_id | get_entity_name }}
-    image: "{{ applications | get_app_conf(application_id, 'images.lam', True) }}"
+    container_name: "{{ lam_container }}"
+    image: "{{ lam_image }}"
     ports:
       - 127.0.0.1:{{ports.localhost.http[application_id]}}:80 
 {% include 'roles/docker-container/templates/base.yml.j2' %}
diff --git a/roles/web-app-lam/vars/main.yml b/roles/web-app-lam/vars/main.yml
index bda460f1..cf8b47bb 100644
--- a/roles/web-app-lam/vars/main.yml
+++ b/roles/web-app-lam/vars/main.yml
@@ -1 +1,6 @@
-application_id: "web-app-lam"
\ No newline at end of file
+# General
+application_id: "web-app-lam"
+
+# LAM specific
+lam_image:      "{{ applications | get_app_conf(application_id, 'docker.services.lam.image', True) }}"
+lam_container:  "{{ application_id | get_entity_name }}"
\ No newline at end of file