diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index 63b229010ba263360df11e837bad65590374b289..0055de61e94d3c451b32d5c409addefa54b25d98 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -1,13 +1,5 @@
 ---
 
-# Ansible pre-requisites
-# ======================
-
-- name: Install Python apt bindings
-  apt:
-    name: python-apt
-
-
 # Main implementation
 # ===================
 
@@ -30,13 +22,20 @@
     update_cache: true
   when: backports_repository_configuration.changed
 
-- name: Configure package pins to backports for Prosody
+- name: Configure package pins to backports for Prosody on Debian 10 Buster
   template:
     src: prosody_backports_pin.j2
     dest: /etc/apt/preferences.d/prosody
     owner: root
     group: root
     mode: 0644
+  when: ansible_distribution_release == 'buster'
+
+- name: Drop package pins to backports for Prosody on Debian 11 Bullseye
+  file:
+    path: /etc/apt/preferences.d/prosody
+    state: absent
+  when: ansible_distribution_release == 'bullseye'
 
 - name: Install additional Prosody dependencies
   apt:
@@ -114,6 +113,16 @@
     group: root
     mode: 0644
 
+- name: Deploy LDAP client configuration (for validating LDAP server certificate)
+  copy:
+    src: prosody_ldaprc
+    dest: "/var/lib/prosody/.ldaprc"
+    owner: root
+    group: prosody
+    mode: 0640
+  notify:
+    - Restart Prosody
+
 - name: Deploy Prosody configuration file
   template:
     src: "prosody.cfg.lua.j2"