diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml
index 4e0895e1..df5c766c 100644
--- a/roles/web-app-bigbluebutton/tasks/main.yml
+++ b/roles/web-app-bigbluebutton/tasks/main.yml
@@ -19,7 +19,7 @@
 
 - name: "Unset 'proxy_extra_configuration'"
   set_fact:
-    proxy_extra_configuration: "{{ undef() }}"
+    proxy_extra_configuration: null
 
 - name: configure websocket_upgrade.conf
   copy: 
diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml
index 400b4af5..5c163689 100644
--- a/roles/web-app-listmonk/tasks/main.yml
+++ b/roles/web-app-listmonk/tasks/main.yml
@@ -1,6 +1,8 @@
 ---
-- name: Set proxy_extra_configuration based on applications | get_app_conf(application_id, 'public_api_activated', True)
-  set_fact:
+- name: "load docker, db and proxy for {{application_id}}"
+  include_role: 
+    name: cmp-db-docker-proxy
+  vars:
     proxy_extra_configuration: >-
       {% if not applications | get_app_conf(application_id, 'public_api_activated', True) %}
       {{ lookup('file', '{{ role_path }}/files/deactivate-public-api.conf') }}
@@ -8,10 +10,6 @@
       ""
       {% endif %}
 
-- name: "load docker, db and proxy for {{application_id}}"
-  include_role: 
-    name: cmp-db-docker-proxy
-
 - name: add config.toml
   template: 
     src:  "config.toml.j2"