diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index 4ac6b06cf5da8e9a75f84063618d2be551305dc5..6d4e6d58b234b6eabd522d16d02a99106ff4ac24 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -37,12 +37,6 @@
             - domain3
             - proxy.domain3
             - conference.domain3
-        - name: deprecated-buster64_xmpp
-          fqdn:
-            - deprecated
-            - domain4
-            - proxy.domain4
-            - conference.domain4
 
     - name: Set-up link to generated X.509 material
       file:
@@ -99,7 +93,6 @@
         192.168.56.21: "client-buster"
         192.168.56.31: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
         192.168.56.32: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
-        192.168.56.33: "deprecated domain4 proxy.domain4 conference.domain4"
 
     - name: Enable TLSv1.0+ in global OpenSSL configuration file in order to be able to test the xmpp_server_tls_protocol parameter
       lineinfile:
@@ -111,65 +104,6 @@
         mode: 0644
         state: present
 
-    # @WORKAROUND: Prosody repository override
-    #
-    # Prosody project has killed off Debian Buster repositories. Trick
-    # the system to install packages from custom repository location
-    # instead.
-    - name: Override server IP for Prosody repository via hosts file
-      lineinfile:
-        path: /etc/hosts
-        regexp:
-        line: "{{ lookup('dig', 'prosody.repo.majic.rs') }} packages.prosody.im"
-        owner: root
-        group: root
-        mode: 0644
-        state: present
-      tags:
-        - workaround:prosody_repository_override
-
-    - name: Add workaround Prosody repository signing key
-      apt_key:
-        data: "{{ lookup('file', 'workaround_prosody_repository_signing_key.asc') }}"
-        state: present
-      tags:
-        - workaround:prosody_repository_override
-
-- hosts: deprecated
-  become: true
-  tasks:
-
-    - name: Add Prosody repository signing key
-      apt_key:
-        data: "{{ lookup('file', 'prosody-debian-gpg-key.asc') }}"
-        state: present
-
-    - name: Add Prosody repository
-      apt_repository:
-        repo: "deb http://packages.prosody.im/debian {{ ansible_distribution_release }} main"
-        state: present
-
-    - name: Install Prosody (from Prosody repository)
-      apt:
-        name: prosody-0.11
-        state: present
-
-    - name: Set-up directory for storing additional Prosody modules
-      file:
-        path: "/usr/local/lib/prosody/modules/"
-        state: directory
-        owner: root
-        group: root
-        mode: 0755
-
-    - name: Invalidate the Prosody repository URL for testing if the file gets dropped at correct time during initial converge
-      copy:
-        content: "deb http://invalidname/debian buster main"
-        dest: "/etc/apt/sources.list.d/packages_prosody_im_debian.list"
-        owner: root
-        group: root
-        mode: 0644
-
 - hosts: clients
   become: true
   tasks:
@@ -238,11 +172,6 @@
           server: domain1
           security: tls
           nickname: noxmpp
-        - jid: eve.doe@domain4
-          password: evepassword
-          server: domain4
-          security: tls
-          nickname: eve.doe
 
   handlers:
 
@@ -309,17 +238,6 @@
             sn: XMPP
             mail: noxmpp@domain1
 
-        - dn: uid=eve,ou=people,dc=local
-          objectClass:
-            - inetOrgPerson
-            - simpleSecurityObject
-          attributes:
-            userPassword: evepassword
-            uid: eve
-            cn: Eve Doe
-            sn: Doe
-            mail: eve.doe@domain4
-
     - name: Add test accounts to correct group
       ldap_attr:
         dn: "cn=xmpp,ou=groups,dc=local"
@@ -331,7 +249,7 @@
           - uid=mick,ou=people,dc=local
           - uid=eve,ou=people,dc=local
 
-- hosts: parameters-mandatory,parameters-optional,deprecated
+- hosts: parameters-mandatory,parameters-optional
   become: true
   tasks: