diff --git a/nextcloud/nextcloud.yaml b/nextcloud/nextcloud.yaml
index c1c52b7..8732345 100644
--- a/nextcloud/nextcloud.yaml
+++ b/nextcloud/nextcloud.yaml
@@ -67,10 +67,10 @@ data:
     set_cfg ldapEmailAttribute "mail"
     set_cfg ldapUuidUserAttribute "entryUUID"
 
-    set_cfg ldapGroupFilter "(&(|(objectclass=groupOfNames))(cn=*))"
-    set_cfg ldapGroupDisplayName "cn"
-    set_cfg ldapUuidGroupAttribute "entryUUID"
-    set_cfg ldapGroupMemberAssocAttr "member"
+    set_cfg ldapLoginFilter "(&(|(objectClass=user)(objectClass=person))(sAMAccountName=%uid))"
+    set_cfg ldapUserFilter "(&(|(objectClass=user)(objectClass=person))(sAMAccountName=*))"
+    set_cfg ldapUuidUserAttribute "objectGUID"
+    set_cfg ldapUuidGroupAttribute "objectGUID"
 
     set_cfg ldapConfigurationActive "1"
     set_cfg turnOffCertCheck "0"
@@ -199,17 +199,17 @@ spec:
             - name: LDAP_CONFIG_ID
               value: "s01"
             - name: LDAP_HOST
-              value: "ldap.undercloud.local"
+              value: "dc.undercloud.local"
             - name: LDAP_PORT
               value: "389"
             - name: LDAP_BASE_DN
               value: "dc=undercloud,dc=local"
             - name: LDAP_USER_BASE_DN
-              value: "ou=users,dc=undercloud,dc=local"
+              value: "ou=users,ou=Undercloud,dc=undercloud,dc=local"
             - name: LDAP_GROUP_BASE_DN
-              value: "ou=groups,dc=undercloud,dc=local"
+              value: "ou=groups,ou=Undercloud,dc=undercloud,dc=local"
             - name: LDAP_BIND_DN
-              value: "cn=nextcloud,ou=serviceaccounts,ou=users,dc=undercloud,dc=local"
+              value: "cn=nextcloud,ou=serviceaccounts,ou=users,ou=Undercloud,dc=undercloud,dc=local"
             - name: LDAP_BIND_PASSWORD
               valueFrom:
                 secretKeyRef:
diff --git a/nextcloud/secrets.yaml b/nextcloud/secrets.yaml
index 8724c0c..9f4dfc6 100644
--- a/nextcloud/secrets.yaml
+++ b/nextcloud/secrets.yaml
@@ -25,4 +25,4 @@ metadata:
   namespace: nextcloud
 type: Opaque
 stringData:
-  bindPassword: "thisismysecureLDAPPWnextcloud"
\ No newline at end of file
+  bindPassword: "1thisismySECURELDAPPWnextcloud"
\ No newline at end of file