diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml
index f39d28a6..b15c09a8 100644
--- a/roles/web-app-listmonk/tasks/main.yml
+++ b/roles/web-app-listmonk/tasks/main.yml
@@ -66,7 +66,10 @@
     EOSQL
   args:
     executable: /bin/bash
-  loop: "{{ listmonk_settings }}"
+  loop: "{{ LISTMONK_SETTINGS }}"
   loop_control:
     label: "{{ item.key }}"
   when: item.when is not defined or item.when
+  no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
+  async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
+  poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
diff --git a/roles/web-app-listmonk/templates/docker-compose.yml.j2 b/roles/web-app-listmonk/templates/docker-compose.yml.j2
index 9a2379aa..c5000e14 100644
--- a/roles/web-app-listmonk/templates/docker-compose.yml.j2
+++ b/roles/web-app-listmonk/templates/docker-compose.yml.j2
@@ -2,8 +2,8 @@
   application:
 {% set container_healthcheck = 'health' %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: "{{ listmonk_image }}:{{ listmonk_version }}"
-    container_name: "{{ listmonk_name }}"
+    image: "{{ LISTMONK_IMAGE }}:{{ LISTMONK_VERSION }}"
+    container_name: "{{ LISTMONK_NAME }}"
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
     volumes:
diff --git a/roles/web-app-listmonk/vars/main.yml b/roles/web-app-listmonk/vars/main.yml
index 73575182..20bcb3b6 100644
--- a/roles/web-app-listmonk/vars/main.yml
+++ b/roles/web-app-listmonk/vars/main.yml
@@ -1,17 +1,18 @@
+# General 
 application_id: "web-app-listmonk"
 database_type:  "postgres"
 
-container_port:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port', True) }}"
+container_port:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port') }}"
 
 # Docker
 docker_compose_flush_handlers: false
 
-# Listmonk Specific
-listmonk_version: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version', True) }}"
-listmonk_image:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image', True) }}"
-listmonk_name:    "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name', True) }}"
+# Listmonk
+LISTMONK_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
+LISTMONK_IMAGE:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
+LISTMONK_NAME:    "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
 
-listmonk_settings:
+LISTMONK_SETTINGS:
   - key: "app.root_url"
     value: '"{{ domains | get_url(application_id, WEB_PROTOCOL) }}"'
 
@@ -34,10 +35,10 @@ listmonk_settings:
     value: 'true'
 
   - key: "security.captcha_key"
-    value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_site_key", True) }}"'
+    value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_site_key") }}"'
 
   - key: "security.captcha_secret"
-    value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_secret", True) }}"'
+    value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_secret") }}"'
 
   # SMTP servers
   - key: "smtp"
diff --git a/roles/web-app-openproject/tasks/main.yml b/roles/web-app-openproject/tasks/main.yml
index 62d64862..d91f89d3 100644
--- a/roles/web-app-openproject/tasks/main.yml
+++ b/roles/web-app-openproject/tasks/main.yml
@@ -32,9 +32,10 @@
     RAILS_ENV={{ ENVIRONMENT | lower }} bundle exec rails runner \"Setting[:{{ item.key }}] = '{{ item.value }}'\""
   args:
     chdir: "{{ docker_compose.directories.instance }}"
-  loop: "{{ openproject_rails_settings | dict2items }}"
-  async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
-  poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
+  loop:   "{{ openproject_rails_settings | dict2items }}"
+  async:  "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
+  poll:   "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
+  no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
 
 - name: Setup LDAP
   include_tasks: 01_ldap.yml