diff --git a/defaults/main.yml b/defaults/main.yml
index 6e981b3..c7629b1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -55,22 +55,22 @@ nextcloud_ldap_host: "{{ ldap_uri | default('openldap') | regex_replace(':[0-9]+
 nextcloud_ldap_port: "389"
 #nextcloud_ldap_backup_host: ""
 nextcloud_ldap_backup_port: "389"
-#nextcloud_ldap_dn: ""
+#nextcloud_ldap_agent_name: ""
 #nextcloud_ldap_agent_password: ""
 nextcloud_ldap_base: "dc={{ openldap_domain | default('example.com') | replace('.', ',dc=') }}"
 #nextcloud_ldap_base_users: ""
 #nextcloud_ldap_base_groups: ""
-#nextcloud_ldap_userfilter_objectclass: ""
-#nextcloud_ldap_userlist_filter: ""
+#nextcloud_ldap_user_filter_objectclass: ""
+#nextcloud_ldap_user_filter: ""
 #nextcloud_ldap_login_filter: ""
-#nextcloud_ldap_groupfilter_objectclass: ""
+#nextcloud_ldap_group_filter_objectclass: ""
 #nextcloud_ldap_group_filter: ""
 #nextcloud_ldap_gid_number: ""
-#nextcloud_ldap_display_name: ""
+#nextcloud_ldap_user_display_name: ""
 #nextcloud_ldap_user_display_name_2: ""
 #nextcloud_ldap_group_display_name: ""
-#nextcloud_ldap_email_attr: ""
-#nextcloud_ldap_group_member_assoc_attribute: ""
+#nextcloud_ldap_email_attribute: ""
+#nextcloud_ldap_group_member_assoc_attr: ""
 
 # container
 nextcloud_image: eumau/nextcloud
diff --git a/tasks/main.yml b/tasks/main.yml
index 4d758a1..aed610d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -88,22 +88,22 @@
       LDAP_PORT: "{{ nextcloud_ldap_port | string }}"
       LDAP_BACKUP_HOST: "{{ nextcloud_ldap_backup_host | default(omit) }}"
       LDAP_BACKUP_PORT: "{{ nextcloud_ldap_backup_port | string }}"
-      LDAP_DN: "{{ nextcloud_ldap_dn | default(omit) }}"
+      LDAP_AGENT_NAME: "{{ nextcloud_ldap_agent_name | default(omit) }}"
       LDAP_AGENT_PASSWORD: "{{ nextcloud_ldap_agent_password | default(omit) }}"
       LDAP_BASE: "{{ nextcloud_ldap_base }}"
       LDAP_BASE_USERS: "{{ nextcloud_ldap_base_users | default(omit) }}"
       LDAP_BASE_GROUPS: "{{ nextcloud_ldap_base_groups | default(omit) }}"
-      LDAP_USERFILTER_OBJECTCLASS: "{{ nextcloud_ldap_userfilter_objectclass | default(omit) }}"
-      LDAP_USERLIST_FILTER: "{{ nextcloud_ldap_userlist_filter | default(omit) }}"
+      LDAP_USER_FILTER_OBJECTCLASS: "{{ nextcloud_ldap_user_filter_objectclass | default(omit) }}"
+      LDAP_USER_FILTER: "{{ nextcloud_ldap_user_filter | default(omit) }}"
       LDAP_LOGIN_FILTER: "{{ nextcloud_ldap_login_filter | default(omit) }}"
-      LDAP_GROUPFILTER_OBJECTCLASS: "{{ nextcloud_ldap_groupfilter_objectclass | default(omit) }}"
+      LDAP_GROUP_FILTER_OBJECTCLASS: "{{ nextcloud_ldap_group_filter_objectclass | default(omit) }}"
       LDAP_GROUP_FILTER: "{{ nextcloud_ldap_group_filter | default(omit) }}"
       LDAP_GID_NUMBER: "{{ nextcloud_ldap_gid_number | default(omit) }}"
-      LDAP_DISPLAY_NAME: "{{ nextcloud_ldap_display_name | default(omit) }}"
+      LDAP_USER_DISPLAY_NAME: "{{ nextcloud_ldap_user_display_name | default(omit) }}"
       LDAP_USER_DISPLAY_NAME_2: "{{ nextcloud_ldap_user_display_name_2 | default(omit) }}"
       LDAP_GROUP_DISPLAY_NAME: "{{ nextcloud_ldap_group_display_name | default(omit) }}"
-      LDAP_EMAIL_ATTR: "{{ nextcloud_ldap_email_attr | default(omit) }}"
-      LDAP_GROUP_MEMBER_ASSOC_ATTRIBUTE: "{{ nextcloud_ldap_group_member_assoc_attribute | default(omit) }}"
+      LDAP_EMAIL_ATTRIBUTE: "{{ nextcloud_ldap_email_attribute | default(omit) }}"
+      LDAP_GROUP_MEMBER_ASSOC_ATTR: "{{ nextcloud_ldap_group_member_assoc_attr | default(omit) }}"
     networks:
       - name: "{{ docker_network }}"
     ports: