diff --git a/roles/dashboard/templates/serverapplication.yml.j2 b/roles/dashboard/templates/serverapplication.yml.j2
index 45109b554..88a96ff8d 100644
--- a/roles/dashboard/templates/serverapplication.yml.j2
+++ b/roles/dashboard/templates/serverapplication.yml.j2
@@ -27,8 +27,8 @@ spDashboard.password={{ dashboard_sp_dashboard_password }}
 
 # SAB connection details
 sab-rest.endpoint={{ dashboard.sab_rest_endpoint }}
-sab-rest.username=cdk
-sab-rest.password={{ dashboard_sab_rest_password }}
+sab-rest.username={{ dashboard.sab_rest_username }}
+sab-rest.password={{ dashboard.sab_rest_password }}
 
 # SAB roles
 admin.surfconext.idp.sabRole=SURFconextverantwoordelijke
diff --git a/roles/invite/templates/serverapplication.yml.j2 b/roles/invite/templates/serverapplication.yml.j2
index 81e7dae5d..0d734650b 100644
--- a/roles/invite/templates/serverapplication.yml.j2
+++ b/roles/invite/templates/serverapplication.yml.j2
@@ -173,6 +173,14 @@ external-api-configuration:
       password: "{{ invite.profile_secret }}"
       scopes:
         - profile
+    - username: {{ invite.pdp_user }}
+      password: "{{ invite.pdp_secret }}"
+      scopes:
+        - crm
+    - username: {{ invite.idp_dashboard_user }}
+      password: "{{ invite.idp_dashboard_secret }}"
+      scopes:
+        - crm
     - username: {{ invite.sp_dashboard_user }}
       password: "{{ invite.sp_dashboard_secret }}"
       organizationGUIDFallback: {{ invite.surf_idp_organization_guid }}
diff --git a/roles/pdp/handlers/main.yml b/roles/pdp/handlers/main.yml
index c6179bb34..9ce5432e7 100644
--- a/roles/pdp/handlers/main.yml
+++ b/roles/pdp/handlers/main.yml
@@ -1,9 +1,9 @@
 - name: restart pdpserver
   community.docker.docker_container:
-    name: pdpserver
-    state: started
+    name: "pdp"
+    state: "started"
     restart: true
     # avoid restarting it creates unexpected data loss according to docker_container_module notes
     comparisons:
-      '*': ignore
-  when: pdpservercontainer is success and pdpservercontainer is not change
+      '*': "ignore"
+  when: "pdpservercontainer is success and pdpservercontainer is not change"
diff --git a/roles/pdp/templates/serverapplication.yml.j2 b/roles/pdp/templates/serverapplication.yml.j2
index 762c2dbdc..a6d33a914 100644
--- a/roles/pdp/templates/serverapplication.yml.j2
+++ b/roles/pdp/templates/serverapplication.yml.j2
@@ -41,9 +41,9 @@ email:
 voot:
   serviceUrl: https://voot.{{ base_domain }}
 sab:
-  password: {{ aa.sab_rest_password }}
-  userName: {{ aa.sab_rest_username }}
-  endpoint: {{ aa.sab_rest_endpoint }}
+  password: {{ pdp.sab_rest_password }}
+  userName: {{ pdp.sab_rest_username }}
+  endpoint: {{ pdp.sab_rest_endpoint }}
 policies:
   cachePolicies: {{ pdp.cache_policies }}
 manage: