diff --git a/roles/backup_client/handlers/main.yml b/roles/backup_client/handlers/main.yml
index fe46ba7eca18c434a6745e7a39f8ba254ec336a6..12864870108cb14d0412b05d2b29865d49da5374 100644
--- a/roles/backup_client/handlers/main.yml
+++ b/roles/backup_client/handlers/main.yml
@@ -1,13 +1,15 @@
 ---
 
 - name: Clean-up GnuPG keyring for import of new keys
-  shell: "rm -f /etc/duply/main/gnupg/*"
-  tags:
-    # [ANSIBLE0007] rm used in place of argument state=absent to file module
-    #   This task is invoked only if user is very specific about requiring to
-    #   run the handlers manually as a way to bring the system to consistency
-    #   after interrupted runs.
-    - skip_ansible_lint
+  file:
+    path: "/etc/duply/main/gnupg"
+    state: "{{ item }}"
+    owner: root
+    group: root
+    mode: 0700
+  with_items:
+    - absent
+    - directory
 
 - name: Import private keys
   command: "{{ gnupg_binary }} --homedir /etc/duply/main/gnupg --import /etc/duply/main/private_keys.asc"
diff --git a/roles/ldap_server/library/m_ldap_entry.py b/roles/ldap_server/library/m_ldap_entry.py
index 7b4da36d36cb22ba95c93e5c4a3194c2e78c0d25..b5c3382d712777955d199eea03295493b61536fe 100644
--- a/roles/ldap_server/library/m_ldap_entry.py
+++ b/roles/ldap_server/library/m_ldap_entry.py
@@ -342,7 +342,7 @@ def main():
             state=dict(required=False, choices=["present", "absent", "append", "replace"], default="present"),
             server_uri=dict(required=False, default="ldapi:///"),
             bind_dn=dict(required=False, default=None),
-            bind_password=dict(required=False),
+            bind_password=dict(required=False, no_log=True),
             attributes=dict(required=False, type='dict', default=None),
             ),
         check_invalid_arguments=False
diff --git a/roles/ldap_server/library/m_ldap_permissions.py b/roles/ldap_server/library/m_ldap_permissions.py
index 3a581f9701ab39c4c9d57803d462929c16303f7b..6ebe318fac95ef4a4998c83c46cab94a1cf25456 100644
--- a/roles/ldap_server/library/m_ldap_permissions.py
+++ b/roles/ldap_server/library/m_ldap_permissions.py
@@ -267,7 +267,7 @@ def main():
             rules=dict(required=True, type='list'),
             server_uri=dict(required=False, default="ldapi:///"),
             bind_dn=dict(required=False, default=None),
-            bind_password=dict(required=False)
+            bind_password=dict(required=False, no_log=True)
             )
         )