diff --git a/request-tracker/defaults/main.yml b/request-tracker/defaults/main.yml
index 61864f9313b0f86941ac43cba13f9e927d61b06b..0881a4984255bc3d1e4cadfd628d4d6284370b2c 100644
--- a/request-tracker/defaults/main.yml
+++ b/request-tracker/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+
 rt_enable_acmetool: false
 rt_enable_nginx: true
 rt_workers: 4
+rt_ldap_password: "{{ lookup('passwordstore', rt_ldappass) }}"
diff --git a/request-tracker/tasks/main.yml b/request-tracker/tasks/main.yml
index ebb170181db8e9b17538f61da39bde32e6ed9be7..010909f7c6ce91f18b3ba48e8e2a9ae84a06e68b 100644
--- a/request-tracker/tasks/main.yml
+++ b/request-tracker/tasks/main.yml
@@ -45,7 +45,7 @@
   file:
     path: /var/lib/request-tracker4/attachments
     state: directory
-    mode: u=rwx,g=rs
+    mode: "u=rwx,g=rs"
     owner: www-data
   tags:
     - rt
diff --git a/request-tracker/tasks/postgres.yml b/request-tracker/tasks/postgres.yml
index bef8fd7ea263411577ed7f8b54894da32f04a789..910f3d6295ac41eacf48b43bb1ab5abae5695f14 100644
--- a/request-tracker/tasks/postgres.yml
+++ b/request-tracker/tasks/postgres.yml
@@ -1,7 +1,9 @@
 ---
 
 - name: Ensure the Postgres user exists
-  postgresql_user: name=www-data state=present
+  postgresql_user:
+    name: www-data
+    state: present
   become: true
   become_user: postgres
   tags:
@@ -9,7 +11,10 @@
     - rt
 
 - name: Ensure the Postgres DB exists
-  postgresql_db: name=rtdb owner=www-data state=present
+  postgresql_db:
+    name: rtdb
+    owner: www-data
+    state: present
   become: true
   become_user: postgres
   tags:
diff --git a/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2 b/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2
index 05116c7349fba8304c5de7c1295cee05614a0e62..f3170b31f55ac548b35c5cfe03bd08b8cb881e3c 100644
--- a/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2
+++ b/request-tracker/templates/RT_SiteConfig.d/70-ldap.pm.j2
@@ -1,7 +1,7 @@
 ### LDAP
 Set($LDAPHost,'{{rt_ldaphost}}');
 Set($LDAPUser,'{{rt_ldapuser}}');
-Set($LDAPPassword,'{{lookup('passwordstore', rt_ldappass)}}');
+Set($LDAPPassword,'{{ rt_ldap_password }}');
 Set($LDAPBase,'{{rt_ldapbase}}');
 Set($LDAPFilter, '(&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*)(!(userAccountControl:1.2.840.113556.1.4.803:=2)))');
 Set($LDAPMapping, {Name         => 'sAMAccountName', # required
@@ -30,7 +30,7 @@ Set($ExternalSettings, {
                 'type' => 'ldap',
                 'server' => '{{rt_ldaphost}}',
                 'user' => '{{rt_ldapuser}}',
-                'pass' => '{{lookup('passwordstore', rt_ldappass)}}',
+                'pass' => '{{ rt_ldap_password }}',
                 'base' => '{{rt_ldapbase}}',
                 'filter' => '(&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*)(!(userAccountControl:1.2.840.113556.1.4.803:=2)))',
                 'attr_match_list' => ['Name', 'EmailAddress'],