diff --git a/community-containers/lldap/lldap.json b/community-containers/lldap/lldap.json
index df4a5ae3..b1b87226 100644
--- a/community-containers/lldap/lldap.json
+++ b/community-containers/lldap/lldap.json
@@ -42,33 +42,39 @@
         "php /var/www/html/occ app:install user_ldap",
         "php /var/www/html/occ app:enable user_ldap",
         "CONF_NAME=$(php /var/www/html/occ ldap:create-empty-config -p)",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentPassword             '%LLDAP_LDAP_USER_PASS%'",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAdminGroup                lldap_admin",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentName                 'cn=admin,ou=people,%NC_BASE_DN%'",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBase                      '%NC_BASE_DN%'",
         "php /var/www/html/occ ldap:set-config $CONF_NAME ldapHost                      'ldap://nextcloud-aio-lldap'",
         "php /var/www/html/occ ldap:set-config $CONF_NAME ldapPort                      3890",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapTLS                       0",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME turnOnPasswordChange          0",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseUsers                 'ou=people,%NC_BASE_DN%'",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapEmailAttribute            mail",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGidNumber                 gidNumber",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilter               '(&(|(objectclass=person))(|(uid=%uid)(|(mailPrimaryAddress=%uid)(mail=%uid))))'",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterEmail          1",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterUsername       1",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserAvatarRule            default",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserDisplayName           cn",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilter                '(|(objectclass=person))'",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterMode            0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentName                 'uid=admin,ou=people,%NC_BASE_DN%'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapAgentPassword             '%LLDAP_LDAP_USER_PASS%'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBase                      '%NC_BASE_DN%'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseUsers                 '%NC_BASE_DN%'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseGroups                '%NC_BASE_DN%'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapConfigurationActive       1",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilter               '(&(objectclass=person)(uid=%uid))'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilter                '(&(objectclass=person))'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterMode            1",
         "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserFilterObjectclass     person",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapBaseGroups                'ou=groups,%NC_BASE_DN%'",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupDisplayName          cn",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilter               '(&(|(objectclass=groupOfUniqueNames)))'",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME turnOnPasswordChange          0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapCacheTTL                  600",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapExperiencedAdmin          0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGidNumber                 gidNumber",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilter               '(&(objectclass=groupOfUniqueNames))'",
         "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilterMode           0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupDisplayName          cn",
         "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupFilterObjectclass    groupOfUniqueNames",
         "php /var/www/html/occ ldap:set-config $CONF_NAME ldapGroupMemberAssocAttr      uniqueMember",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME useMemberOfToDetectMembership 1",
-        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapConfigurationActive       1"
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapEmailAttribute            mail",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterEmail          0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapLoginFilterUsername       1",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapMatchingRuleInChainState  unknown",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapNestedGroups              0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapPagingSize                500",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapTLS                       0",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserAvatarRule            default",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUserDisplayName           displayname",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUuidGroupAttribute        auto",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapUuidUserAttribute         auto",
+        "php /var/www/html/occ ldap:set-config $CONF_NAME ldapExpertUsernameAttr        uid"
       ]
     }
   ]