diff --git a/roles/xmpp_server/defaults/main.yml b/roles/xmpp_server/defaults/main.yml
index 65e34e7ca5edd3cac7932f01ee053e365aa0e82e..f90e98953ead7924e5c8ca91358814e5b6ea8428 100644
--- a/roles/xmpp_server/defaults/main.yml
+++ b/roles/xmpp_server/defaults/main.yml
@@ -3,5 +3,6 @@
 enable_backup: false
 xmpp_domains:
   - "{{ ansible_domain }}"
+xmpp_prosody_package: "prosody-0.10"
 xmpp_tls_certificate: "{{ lookup('file', tls_certificate_dir + '/' + ansible_fqdn + '_xmpp.pem') }}"
 xmpp_tls_key: "{{ lookup('file', tls_private_key_dir + '/' + ansible_fqdn + '_xmpp.key') }}"
diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml
index b27dac585dee054e05ebbe627c4d81f7117e8ce8..d993ea545799e42a2e3e04a9c28c861fc057c99a 100644
--- a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml
+++ b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml
@@ -9,6 +9,7 @@ xmpp_domains:
 xmpp_ldap_base_dn: dc=local
 xmpp_ldap_password: prosodypassword
 xmpp_ldap_server: ldap-server
+xmpp_prosody_package: prosody-0.9
 xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/parameters-optional_xmpp.cert.pem') }}"
 xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/parameters-optional_xmpp.key.pem') }}"
 
diff --git a/roles/xmpp_server/molecule/default/tests/test_default.py b/roles/xmpp_server/molecule/default/tests/test_default.py
index 296f41e0028afec8bef4336c35ead13bd9411cc6..c1c3c6013c6a5d3c6363f2ffff063850e57b3e2f 100644
--- a/roles/xmpp_server/molecule/default/tests/test_default.py
+++ b/roles/xmpp_server/molecule/default/tests/test_default.py
@@ -7,15 +7,15 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['parameters-mandatory', 'parameters-optional'])
 
 
-def test_installed_packages(host):
+def test_supporting_packages_installed(host):
     """
-    Tests if all the necessary packages have been installed.
+    Tests if all the necessary supporting packages have been
+    installed.
     """
 
     assert host.package('python-apt').is_installed
     assert host.package('lua-sec').is_installed
     assert host.package('lua-ldap').is_installed
-    assert host.package('prosody').is_installed
 
 
 def test_prosody_apt_key(host):
diff --git a/roles/xmpp_server/molecule/default/tests/test_mandatory.py b/roles/xmpp_server/molecule/default/tests/test_mandatory.py
index 3375065e1ed6034d6f004b659f3ab3e3928a8651..88105a0282dd4421e81a39ff222437ba3c46c9f5 100644
--- a/roles/xmpp_server/molecule/default/tests/test_mandatory.py
+++ b/roles/xmpp_server/molecule/default/tests/test_mandatory.py
@@ -73,3 +73,11 @@ Component "conference.domain1" "muc"
   restrict_room_creation = "local"
 Component "proxy.domain1" "proxy65"
   proxy65_acl = { "domain1" }""" in config.content
+
+
+def test_correct_prosody_package_installed(host):
+    """
+    Tests if correct Prosody package has been installed.
+    """
+
+    assert host.package('prosody-0.10').is_installed
diff --git a/roles/xmpp_server/molecule/default/tests/test_optional.py b/roles/xmpp_server/molecule/default/tests/test_optional.py
index ea7bf36be569aa2ca87c66865324789db423336a..bbe4de41b30578163bebbd99346f096f2f095dbd 100644
--- a/roles/xmpp_server/molecule/default/tests/test_optional.py
+++ b/roles/xmpp_server/molecule/default/tests/test_optional.py
@@ -79,3 +79,11 @@ Component "conference.domain3" "muc"
   restrict_room_creation = "local"
 Component "proxy.domain3" "proxy65"
   proxy65_acl = { "domain3" }""" in config.content
+
+
+def test_correct_prosody_package_installed(host):
+    """
+    Tests if correct Prosody package has been installed.
+    """
+
+    assert host.package('prosody-0.9').is_installed
diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index 669844f999a95515fe922ed88ffe507ec48c7554..540bfce0ba1f4b4f4cbb9402bf86575f84ae61f9 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -26,8 +26,10 @@
 
 - name: Install Prosody
   apt:
-    name: prosody
+    name: "{{ xmpp_prosody_package }}"
     state: present
+  notify:
+    - Restart Prosody
 
 - name: Allow Prosody user to traverse the directory with TLS private keys
   user: