diff --git a/roles/svc-db-openldap/docs/Administration.md b/roles/svc-db-openldap/docs/Administration.md
index e9efc347..e3a85bcf 100644
--- a/roles/svc-db-openldap/docs/Administration.md
+++ b/roles/svc-db-openldap/docs/Administration.md
@@ -68,5 +68,5 @@ docker exec -i ldap \
     -D "$LDAP_ADMIN_DN" \
     -w "$LDAP_ADMIN_PASSWORD" \
     -c \
-    -f "/tmp/ldif/data/01_rbac.ldif"
+    -f "/tmp/ldif/groups/01_rbac.ldif"
 ```
\ No newline at end of file
diff --git a/roles/svc-db-openldap/handlers/main.yml b/roles/svc-db-openldap/handlers/main.yml
index 7870e637..e5a609c9 100644
--- a/roles/svc-db-openldap/handlers/main.yml
+++ b/roles/svc-db-openldap/handlers/main.yml
@@ -45,11 +45,11 @@
 
 - name: "Import users, groups, etc. to LDAP"
   shell: >
-    docker exec -i {{ openldap_name }} ldapadd -x -D "{{ldap.dn.administrator.data}}" -w "{{ldap.bind_credential}}" -c -f "{{openldap_ldif_docker_path}}data/{{ item | basename | regex_replace('\.j2$', '') }}"
+    docker exec -i {{ openldap_name }} ldapadd -x -D "{{ldap.dn.administrator.data}}" -w "{{ldap.bind_credential}}" -c -f "{{openldap_ldif_docker_path}}groups/{{ item | basename | regex_replace('\.j2$', '') }}"
   register: ldapadd_result
   changed_when: "'adding new entry' in ldapadd_result.stdout"
   failed_when: ldapadd_result.rc not in [0, 20, 68, 65]
   listen:
     - "Import data LDIF files"
     - "Import all LDIF files"
-  loop: "{{ query('fileglob', role_path ~ '/templates/ldif/data/*.j2') | sort }}"
\ No newline at end of file
+  loop: "{{ query('fileglob', role_path ~ '/templates/ldif/groups/*.j2') | sort }}"
\ No newline at end of file
diff --git a/roles/svc-db-openldap/templates/ldif/data/01_rbac_group.ldif.j2 b/roles/svc-db-openldap/templates/ldif/groups/01_rbac_group.ldif.j2
similarity index 100%
rename from roles/svc-db-openldap/templates/ldif/data/01_rbac_group.ldif.j2
rename to roles/svc-db-openldap/templates/ldif/groups/01_rbac_group.ldif.j2
diff --git a/roles/svc-db-openldap/templates/ldif/data/02_rbac_roles.ldif.j2 b/roles/svc-db-openldap/templates/ldif/groups/02_rbac_roles.ldif.j2
similarity index 100%
rename from roles/svc-db-openldap/templates/ldif/data/02_rbac_roles.ldif.j2
rename to roles/svc-db-openldap/templates/ldif/groups/02_rbac_roles.ldif.j2
diff --git a/roles/svc-db-openldap/templates/ldif/data/README.md b/roles/svc-db-openldap/templates/ldif/groups/README.md
similarity index 100%
rename from roles/svc-db-openldap/templates/ldif/data/README.md
rename to roles/svc-db-openldap/templates/ldif/groups/README.md
diff --git a/roles/svc-db-openldap/vars/main.yml b/roles/svc-db-openldap/vars/main.yml
index c06e2d05..7a5d09c1 100644
--- a/roles/svc-db-openldap/vars/main.yml
+++ b/roles/svc-db-openldap/vars/main.yml
@@ -12,7 +12,7 @@ openldap_ldif_host_path:        "{{docker_compose.directories.volumes}}ldif/"
 openldap_ldif_docker_path:      "/tmp/ldif/"
 openldap_ldif_types:
   - configuration
-  - data
+  - groups
   - schema                      # Don't know if this is still needed, it's now setup via tasks
 
 openldap_name:                  "{{ applications | get_app_conf(application_id, 'docker.services.openldap.name', True) }}"