diff --git a/ansible/roles/postldap/defaults/main.yml b/ansible/roles/postldap/defaults/main.yml
index e36e587c5..d4fbd9c99 100644
--- a/ansible/roles/postldap/defaults/main.yml
+++ b/ansible/roles/postldap/defaults/main.yml
@@ -230,9 +230,6 @@ postldap__postfix__dependent_maincf:
       - name: 'check_sasl_access ldap:${config_directory}/ldap_known_sender_relays.cf'
         copy_id_from: 'permit_mynetworks'
         weight: 5
-      - name: 'check_sender_access ldap:${config_directory}/ldap_unauth_sender_access.cf'
-        copy_id_from: 'permit_sasl_authenticated'
-        weight: 10
       - name: 'check_sender_access ldap:${config_directory}/ldap_unauth_domain_access.cf'
         copy_id_from: 'permit_sasl_authenticated'
         weight: 15
@@ -295,19 +292,21 @@ postldap__postfix__dependent_lookup_tables:
       (configured in the attribute mail, aka the mailbox or maildrop).
     no_log: '{{ postldap__no_log|d(True) }}'
     connection: '{{ postldap__postfix_ldap_connection }}'
-    search_base: '{{ postldap__ldap_people_dn|join(",") }}'
+    search_base: '{{ postldap__ldap_base_dn|join(",") }}'
     query_filter: '(&
-                    (objectClass=inetOrgPerson)
-                    (|
-                      (mail=%s)
-                      (mailAlias=%s)
-                    )
-                    (|
-                      (authorizedService=all)
-                      (authorizedService=mail:receive)
-                    )
-                  )'
-    result_attribute: 'mail'
+                     (objectClass=mailRecipient)
+                     (|
+                       (mailAddress=%s)
+                       (mailAlternateAddress=%s)
+                     )
+                     (|
+                       (authorizedService=all)
+                       (authorizedService=mail:receive)
+                     )
+                   )'
+    result_attribute: ''
+    special_result_attribute: 'member'
+    leaf_result_attribute: 'mail'
 
   - name: 'ldap_virtual_mailbox_maps.cf'
     state: 'present'
@@ -316,20 +315,20 @@ postldap__postfix__dependent_lookup_tables:
       (and are responsible for them), the virtual_mailbox_maps configuration is used.
     no_log: '{{ postldap__no_log|d(True) }}'
     connection: '{{ postldap__postfix_ldap_connection }}'
-    search_base: '{{ postldap__ldap_people_dn|join(",") }}'
+    search_base: '{{ postldap__ldap_base_dn|join(",") }}'
     query_filter: '(&
-                    (objectClass=inetOrgPerson)
-                    (|
-                      (mail=%s)
-                      (mailAlias=%s)
-                    )
-                    (|
-                      (authorizedService=all)
-                      (authorizedService=mail:receive)
-                    )
-                  )'
-    result_attribute: 'mail'
-    result_format: '/%d/%u/Maildir/'
+                     (objectClass=mailRecipient)
+                     (|
+                       (mailAddress=%s)
+                       (mailAlternateAddress=%s)
+                     )
+                     (|
+                       (authorizedService=all)
+                       (authorizedService=mail:receive)
+                     )
+                   )'
+    result_attribute: 'uid'
+    result_format: '/%u/Maildir/'
 
   - name: 'ldap_virtual_mailbox_domains.cf'
     state: 'present'
@@ -340,8 +339,8 @@ postldap__postfix__dependent_lookup_tables:
     connection: '{{ postldap__postfix_ldap_connection }}'
     search_base: '{{ postldap__ldap_domains_dn|join(",") }}'
     query_filter: '(&
-                    (objectClass=dNSDomain)
-                    (dc=%s)
+                     (objectClass=dNSDomain)
+                     (dc=%s)
                    )'
     result_attribute: 'dc'
 
@@ -349,36 +348,33 @@ postldap__postfix__dependent_lookup_tables:
     state: 'present'
     comment: |
       The smtpd_sender_login_maps configurations performs a lookup from an incoming
-      email-sender to a username. Postfix first performs a full lookup
-      on user@domain, then user and then @domain.
-      The later one is also used for catchalls where the mailAlias
-      is set to e.g. @foobar.com
+      email-sender to a username.
     no_log: '{{ postldap__no_log|d(True) }}'
     connection: '{{ postldap__postfix_ldap_connection }}'
     search_base: '{{ postldap__ldap_base_dn|join(",") }}'
-    query_filter: '(|
-                    (&
-                      (objectClass=inetOrgPerson)
-                      (|
-                        (mail=%s)
-                        (mailAlias=%s)
-                      )
-                      (|
-                        (authorizedService=all)
-                        (authorizedService=mail:send)
-                      )
-                    )
-                    (&
-                      (objectClass=account)
-                      (uid=%u)
-                      (host=%d)
-                      (|
-                        (authorizedService=all)
-                        (authorizedService=mail:send)
-                      )
-                    )
-                  )'
-    result_attribute: 'uid, mail, mailAlias'
+    query_filter: '(&
+                     (|
+                       (&
+                         (objectClass=mailRecipient)
+                         (|
+                           (mailAddress=%s)
+                           (mailAlternateAddress=%s)
+                         )
+                       )
+                       (&
+                         (objectClass=account)
+                         (uid=%u)
+                         (host=%d)
+                       )
+                     )
+                     (|
+                       (authorizedService=all)
+                       (authorizedService=mail:send)
+                     )
+                   )'
+    result_attribute: ''
+    special_result_attribute: 'member'
+    leaf_result_attribute: 'uid'
     size_limit: 1
 
   - name: 'ldap_known_sender_relays.cf'
@@ -396,47 +392,18 @@ postldap__postfix__dependent_lookup_tables:
     connection: '{{ postldap__postfix_ldap_connection }}'
     search_base: '{{ postldap__ldap_base_dn|join(",") }}'
     query_filter: '(&
-                    (objectClass=account)
-                    (uid=%u)
-                    (host=%d)
-                    (|
-                      (authorizedService=all)
-                      (authorizedService=mail:send)
-                    )
-                  )'
+                     (objectClass=account)
+                     (uid=%u)
+                     (host=%d)
+                     (|
+                       (authorizedService=all)
+                       (authorizedService=mail:send)
+                     )
+                   )'
     result_attribute: 'uid'
     result_format: 'smtpd_permit_known_sender_relays'
     size_limit: 1
 
-  - name: 'ldap_unauth_sender_access.cf'
-    state: 'present'
-    comment: |
-      This lookup table is used to check if a sender exists after authenticated
-      sender has been accepted. If a sender exists, it means that the sender has
-      not been authenticated properly, or perhaps somebody tries to send e-mail
-      as one of our own users which is not allowed without authentication. In
-      such cases, the mail will be rejected with a sensible response indicating
-      that the sender needs to enable SMTP authentication.
-    no_log: '{{ postldap__no_log|d(True) }}'
-    connection: '{{ postldap__postfix_ldap_connection }}'
-    search_base: '{{ postldap__ldap_base_dn|join(",") }}'
-    query_filter: '(|
-                    (&
-                      (objectClass=inetOrgPerson)
-                      (|
-                        (mail=%s)
-                        (mailAlias=%s)
-                      )
-                    )
-                    (&
-                      (objectClass=account)
-                      (uid=%u)
-                      (host=%d)
-                    )
-                  )'
-    result_attribute: 'uid, mail, mailAlias'
-    result_format: '550 Authentication Required'
-
   - name: 'ldap_unauth_domain_access.cf'
     state: 'present'
     comment: |
@@ -452,21 +419,15 @@ postldap__postfix__dependent_lookup_tables:
     query_filter: '(|
                      (&
                        (objectClass=dNSDomain)
-                       (|
-                         (dc=%d)
-                         (dc={{ postldap__domain_rev_pattern }})
-                       )
+                       (dc=%d)
                      )
                      (&
                        (objectClass=domainRelatedObject)
-                       (|
-                         (associatedDomain=%d)
-                         (associatedDomain={{ postldap__domain_rev_pattern }})
-                       )
+                       (associatedDomain=%d)
                      )
                    )'
     result_attribute: 'dc, associatedDomain'
-    result_format: '550 Domain Authentication Required'
+    result_format: '550 Authentication Required'
                                                                    # ]]]
                                                                    # ]]]
 # LDAP [[[
