diff --git a/roles/docker-akaunting/templates/docker-compose.yml.j2 b/roles/docker-akaunting/templates/docker-compose.yml.j2
index 9286fa7d..fb4a2b5f 100644
--- a/roles/docker-akaunting/templates/docker-compose.yml.j2
+++ b/roles/docker-akaunting/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:
 
 {% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 
-    image: docker.io/akaunting/akaunting:{{applications.akaunting.version}}
+    image: {{ applications[application_id].images.application }}
     build:
       context: .
     ports:
diff --git a/roles/docker-akaunting/vars/configuration.yml b/roles/docker-akaunting/vars/configuration.yml
index 24d95c17..c98c9327 100644
--- a/roles/docker-akaunting/vars/configuration.yml
+++ b/roles/docker-akaunting/vars/configuration.yml
@@ -1,12 +1,13 @@
-version:                  "latest"
-company_name:             "{{primary_domain}}"
-company_email:            "{{users.administrator.email}}"
-setup_admin_email:        "{{users.administrator.email}}"
+images:
+  application:      "docker.io/akaunting/akaunting:latest"
+company_name:       "{{primary_domain}}"
+company_email:      "{{users.administrator.email}}"
+setup_admin_email:  "{{users.administrator.email}}"
 features:
-  matomo:                 true
-  css:                    true
-  portfolio_iframe:       false
-  central_database:       true
+  matomo:           true
+  css:              true
+  portfolio_iframe: false
+  central_database: true
 credentials:
 domains:
   canonical:
diff --git a/roles/docker-attendize/templates/docker-compose.yml.j2 b/roles/docker-attendize/templates/docker-compose.yml.j2
index 839d7560..7a649575 100644
--- a/roles/docker-attendize/templates/docker-compose.yml.j2
+++ b/roles/docker-attendize/templates/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
 {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
 
   web:
-    image: "attendize_web:{{applications.attendize.version}}"
+    image: "{{ applications[application_id].images.web }}"
     ports:
     - "{{ports.localhost.http[application_id]}}:80"
     volumes:
@@ -19,7 +19,7 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
 
   worker:
-    image: "attendize_worker:{{applications.attendize.version}}"
+    image: "{{ applications[application_id].images.worker }}"
 {% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
       maildev:
 {% include 'templates/docker/container/networks.yml.j2' %}
diff --git a/roles/docker-attendize/vars/configuration.yml b/roles/docker-attendize/vars/configuration.yml
index bf381ac6..79240767 100644
--- a/roles/docker-attendize/vars/configuration.yml
+++ b/roles/docker-attendize/vars/configuration.yml
@@ -1,4 +1,6 @@
-version:            "latest"
+image:              
+  web:              "attendize_web:latest"
+  worker:           "attendize_worker:latest"
 credentials:
 features:
   matomo:           true
diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2
index 1dca512a..2e9411d9 100644
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:
 
   application:
 {% include 'roles/docker-compose/templates/services/base.yml.j2' %}
-    image: "baserow/baserow:{{applications.baserow.version}}"
+    image: "{{ applications[application_id].images.application }}"
     container_name: baserow-application
     volumes:
       - data:/baserow/data
diff --git a/roles/docker-baserow/vars/configuration.yml b/roles/docker-baserow/vars/configuration.yml
index bdff87c2..50af2b64 100644
--- a/roles/docker-baserow/vars/configuration.yml
+++ b/roles/docker-baserow/vars/configuration.yml
@@ -1,4 +1,5 @@
-version:              "latest"
+images:
+  application:        "baserow/baserow:latest"
 features:
   matomo:             true
   css:                true
diff --git a/roles/docker-bluesky/templates/docker-compose.yml.j2 b/roles/docker-bluesky/templates/docker-compose.yml.j2
index 4bde76aa..078f24ea 100644
--- a/roles/docker-bluesky/templates/docker-compose.yml.j2
+++ b/roles/docker-bluesky/templates/docker-compose.yml.j2
@@ -1,6 +1,6 @@
 services:
   pds:
-    image: "ghcr.io/bluesky-social/pds:{{applications.bluesky.pds.version}}"
+    image: "{{ applications[application_id].images.pds }}"
 {% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     volumes:
         - pds_data:/opt/pds
diff --git a/roles/docker-bluesky/vars/configuration.yml b/roles/docker-bluesky/vars/configuration.yml
index a89b94d8..43dd0ea3 100644
--- a/roles/docker-bluesky/vars/configuration.yml
+++ b/roles/docker-bluesky/vars/configuration.yml
@@ -1,6 +1,8 @@
 users:
   administrator:
     email:          "{{users.administrator.email}}"
+images:
+  pds:              "ghcr.io/bluesky-social/pds:latest"
 pds:
   version:          "latest"
 credentials:
diff --git a/roles/docker-coturn/README.md b/roles/docker-coturn/README.md
index 245777e8..b5aac4b6 100644
--- a/roles/docker-coturn/README.md
+++ b/roles/docker-coturn/README.md
@@ -1,4 +1,4 @@
-# DRAFT role docker-coturn
+# Coturn Server (DRAFT)
 setup an coturn server based on https://hub.docker.com/r/coturn/coturn
 
 ## todo
diff --git a/roles/docker-coturn/vars/configuration.yml.j2 b/roles/docker-coturn/vars/configuration.yml.j2
index 222e2209..b619dff3 100644
--- a/roles/docker-coturn/vars/configuration.yml.j2
+++ b/roles/docker-coturn/vars/configuration.yml.j2
@@ -1,4 +1,2 @@
-user:       turnuser
-credentials:
-  # password:                                                           # Need to be defined in invetory file
-  # secret:                                                             # Need to be defined in invetory file
+user:         turnuser
+credentials:  
\ No newline at end of file