diff --git a/playbooks/selfservice/selfservice-absent.yml b/playbooks/selfservice/selfservice-absent.yml
index 7a1b02b5a17f28df8d7a855f3949c8318cf255ff..c9f416a1f2aab721bd9dddc25fb022c3f97af0ad 100644
--- a/playbooks/selfservice/selfservice-absent.yml
+++ b/playbooks/selfservice/selfservice-absent.yml
@@ -1,11 +1,11 @@
 ---
-- name: Delegation absent
+- name: Selfservice absent
   hosts: ipaserver
   become: true
 
   tasks:
-  - name: Ensure delegation "basic manager attributes" is absent
-    ipadelegation:
+  - name: Ensure selfservice "basic manager attributes" is absent
+    ipaselfservice:
       ipaadmin_password: SomeADMINpassword
       name: "basic manager attributes"
       state: absent
diff --git a/playbooks/selfservice/selfservice-member-absent.yml b/playbooks/selfservice/selfservice-member-absent.yml
index 61d0d34a9992dcb8819988b75e2a1b4ac4f254cb..2e6c55bee2082c2cf4154bd2427a29bb520e0c09 100644
--- a/playbooks/selfservice/selfservice-member-absent.yml
+++ b/playbooks/selfservice/selfservice-member-absent.yml
@@ -1,15 +1,15 @@
 ---
-- name: Delegation member absent
+- name: Selfservice member absent
   hosts: ipaserver
   become: true
 
   tasks:
-  - name: Ensure delegation "basic manager attributes" member attributes employeenumber and employeetype are absent
-    ipadelegation:
+  - name: Ensure selfservice "basic manager attributes" member attributes employeenumber and employeetype are absent
+    ipaselfservice:
       ipaadmin_password: SomeADMINpassword
       name: "basic manager attributes"
       attribute:
-      - employeenumber
-      - employeetype
+      - businesscategory
+      - departmentnumber
       action: member
       state: absent
diff --git a/playbooks/selfservice/selfservice-member-present.yml b/playbooks/selfservice/selfservice-member-present.yml
index 1d5c1180cbe921f80dd4ff9befc218d8114f19f8..ff0ff58177f61d8e33d41afadb5e2c0fc93b7163 100644
--- a/playbooks/selfservice/selfservice-member-present.yml
+++ b/playbooks/selfservice/selfservice-member-present.yml
@@ -1,11 +1,11 @@
 ---
-- name: Delegation member present
+- name: Selfservice member present
   hosts: ipaserver
   become: true
 
   tasks:
-  - name: Ensure delegation "basic manager attributes" member attribute departmentnumber is present
-    ipadelegation:
+  - name: Ensure selfservice "basic manager attributes" member attribute departmentnumber is present
+    ipaselfservice:
       ipaadmin_password: SomeADMINpassword
       name: "basic manager attributes"
       attribute:
diff --git a/playbooks/selfservice/selfservice-present.yml b/playbooks/selfservice/selfservice-present.yml
index 755a5a90e4a37fa319d39c1647ddd1d2bbab4854..0451e0ec29038ee7b551495d0acd0f755a1c1066 100644
--- a/playbooks/selfservice/selfservice-present.yml
+++ b/playbooks/selfservice/selfservice-present.yml
@@ -1,11 +1,11 @@
 ---
-- name: Delegation present
+- name: Selfservice present
   hosts: ipaserver
   become: true
 
   tasks:
-  - name: Ensure delegation "basic manager attributes" is present
-    ipadelegation:
+  - name: Ensure selfservice "basic manager attributes" is present
+    ipaselfservice:
       ipaadmin_password: SomeADMINpassword
       name: "basic manager attributes"
       permission: read