diff --git a/roles/web-app-friendica/vars/main.yml b/roles/web-app-friendica/vars/main.yml
index 900a24b7..3f3959e4 100644
--- a/roles/web-app-friendica/vars/main.yml
+++ b/roles/web-app-friendica/vars/main.yml
@@ -2,6 +2,9 @@
 application_id:                 "web-app-friendica"
 database_type:                  "mariadb"
 
+# Docker
+docker_compose_flush_handlers:  false
+
 # Friendica Specific
 friendica_container:            "friendica"
 friendica_no_validation:        "{{ applications | get_app_conf(application_id, 'features.oidc', True) }}" # Email validation is not neccessary if OIDC is active
@@ -11,4 +14,3 @@ friendica_host_ldap_config:     "{{ docker_compose.directories.volumes }}ldapaut
 friendica_config_dir:           "{{ friendica_application_base }}/config"
 friendica_config_file:          "{{ friendica_config_dir }}/local.config.php"
 friendica_user:                 "www-data"
-
diff --git a/roles/web-app-nextcloud/vars/main.yml b/roles/web-app-nextcloud/vars/main.yml
index 8e5e6710..4eaba9cf 100644
--- a/roles/web-app-nextcloud/vars/main.yml
+++ b/roles/web-app-nextcloud/vars/main.yml
@@ -3,14 +3,17 @@
 application_id:                                 "web-app-nextcloud"                                           # Application identifier
 container_port:                                 80
 
+# Networking
+domain:                                         "{{ domains | get_domain(application_id) }}"                  # Public domain at which Nextcloud will be accessable
+http_port:                                      "{{ ports.localhost.http[application_id] }}"                  # Port at which nextcloud is reachable in the local network
+
 # Database
 database_password:                              "{{ applications | get_app_conf(application_id, 'credentials.database_password', True)}}"
 database_type:                                  "mariadb"                                                     # Database flavor
 nextcloud_plugins_enabled:                      "{{ applications | get_app_conf(application_id, 'plugins_enabled', True) }}"
 
-# Networking
-domain:                                         "{{ domains | get_domain(application_id) }}"                  # Public domain at which Nextcloud will be accessable
-http_port:                                      "{{ ports.localhost.http[application_id] }}"                  # Port at which nextcloud is reachable in the local network
+# Docker
+docker_compose_flush_handlers:                  false # Deactivate flushing because first some routines have to be done
 
 nextcloud_administrator_username:               "{{ applications | get_app_conf(application_id, 'users.administrator.username', True) }}"