diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
index 95c72ee2fe5735b8c138cdbb9e0627cc0fe5cb91..2a6d5a72ff8d72d8d63f6c1df66482d5db94f2e3 100644
--- a/docs/releasenotes.rst
+++ b/docs/releasenotes.rst
@@ -31,6 +31,10 @@ run applications using Debian-only repositories.
   * Prosody package and some of its dependencies are installed from
     Debian backports to get more featureful release installed.
 
+  * Role no longer depends on fetching external Prosody modules from
+    project code repository, and instead relies on the prosody-modules
+    package for LDAP authentication module.
+
 
 6.0.0
 -----
diff --git a/roles/xmpp_server/molecule/default/tests/test_default.py b/roles/xmpp_server/molecule/default/tests/test_default.py
index a41efec8280a8f9896feba066e6488d2fc8abdb6..7c28208c3ad596ba98bd394877708ce68f447ad3 100644
--- a/roles/xmpp_server/molecule/default/tests/test_default.py
+++ b/roles/xmpp_server/molecule/default/tests/test_default.py
@@ -18,6 +18,7 @@ def test_supporting_packages_installed(host):
 
     assert host.package('python-apt').is_installed
     assert host.package('lua-ldap').is_installed
+    assert host.package('prosody-modules').is_installed
 
 
 def test_prosody_user(host):
@@ -331,9 +332,11 @@ def test_backports_prosody_pinning(host):
     assert pin.mode == 0o644
 
     prosody_package = host.package("prosody")
+    prosody_modules_package = host.package("prosody-modules")
     lua_ldap_package = host.package("lua-sec")
 
     assert "bpo" in prosody_package.version
+    assert "bpo" in prosody_modules_package.version
     assert "bpo" in lua_ldap_package.version
 
 
diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index 4272df47c4f2a6b759036c8583a2e3f6c2917f03..afcf4c400d2ec459ba4523d4a35ef208bbf53c3f 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -64,9 +64,11 @@
     repo: "deb http://packages.prosody.im/debian {{ ansible_distribution_release }} main"
     state: absent
 
-- name: Install Lua LDAP library
+- name: Install additional Prosody dependencies
   apt:
-    name: lua-ldap
+    name:
+      - lua-ldap
+      - prosody-modules
     state: present
   notify:
     - Restart Prosody
diff --git a/roles/xmpp_server/templates/prosody_backports_pin.j2 b/roles/xmpp_server/templates/prosody_backports_pin.j2
index 58c5bbf7001e6e0757391bc2157624b69f1247fa..633c8541a0aee5633ad68757368e333d48f3aa4c 100644
--- a/roles/xmpp_server/templates/prosody_backports_pin.j2
+++ b/roles/xmpp_server/templates/prosody_backports_pin.j2
@@ -3,6 +3,6 @@
 # to get more up-to-date features and bug/security updates.
 #
 
-Package: prosody lua-sec
+Package: prosody prosody-modules lua-sec
 Pin: release a={{ ansible_distribution_release }}-backports
 Pin-Priority: 600