diff --git a/templates/roles/web-app/config/main.yml.j2 b/templates/roles/web-app/config/main.yml.j2
index 23aa0911..e6392d07 100644
--- a/templates/roles/web-app/config/main.yml.j2
+++ b/templates/roles/web-app/config/main.yml.j2
@@ -1,17 +1,21 @@
-{% raw %}
 credentials: {}
 docker:
-  images: {}                # @todo Move under services
-  versions: {}              # @todo Move under services
   services:
     redis:
-      enabled:      false   # Enable Redis 
+      enabled:          false   # Enable Redis 
     database:
-      enabled:      false   # Enable the database 
+      enabled:          false   # Enable the database
+    {{ application_id }}:  
+      no_stop_required: true
+      image:            ""
+      version:          "latest"
+      name:             "web-app-{{ application_id }}"
+    volumes:
+      data:             "web-app-{{ application_id }}_data"
 features:
   matomo:           true    # Enable Matomo Tracking
   css:              true    # Enable Global CSS Styling
-  port-ui-desktop: true    # Enable loading of app in iframe
+  port-ui-desktop:  true    # Enable loading of app in iframe
   ldap:             false   # Enable LDAP Network
   central_database: false   # Enable Central Database Network
   recaptcha:        false   # Enable ReCaptcha
@@ -25,5 +29,3 @@ domains:
   aliases:          []      # Alias redirections to the first element of the canonical domains
 rbac:
   roles: {}
-
-{% endraw %}
\ No newline at end of file
diff --git a/templates/roles/web-app/vars/main.yml.j2 b/templates/roles/web-app/vars/main.yml.j2
index 74aa78a7..6e07cf6a 100644
--- a/templates/roles/web-app/vars/main.yml.j2
+++ b/templates/roles/web-app/vars/main.yml.j2
@@ -1,3 +1,10 @@
 application_id:                 {{ application_id }} # ID of the application, should be the name of the role folder
 database_type:                  0                    # Database type [postgres, mariadb]
-docker_compose_flush_handlers:  true                 # When this is set to true an auto-flush after the docker-compose.yml, and env deploy is triggered, otherwise you have todo it manual.
\ No newline at end of file
+docker_compose_flush_handlers:  true                 # When this is set to true an auto-flush after the docker-compose.yml, and env deploy is triggered, otherwise you have todo it manual.
+
+# The following variable mapping is optional, but imt makes it easier to read the code. 
+# I recommend, to use this mappings, but you can skipp it and access the config entries direct via get_app_conf
+{{ application_id | get_cymais_dir }}_version:   "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.version',        True) }}"{% endraw %}
+{{ application_id | get_cymais_dir }}_image:     "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.image',          True) }}"{% endraw %}
+{{ application_id | get_cymais_dir }}_name:      "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.name',           True) }}"{% endraw %}
+{{ application_id | get_cymais_dir }}_volume:    "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.volumes.data',   True) }}"{% endraw %}
\ No newline at end of file