diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index 61b050c82e8ed4de6e3934ce9bff3d4657d37f20..65e52744b012ff0e9a2f3a13a0c14adf59ca016e 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -50,8 +50,13 @@
   notify:
     - Restart Prosody
 
+- name: Enable Prosody service on boot (workaround for systemctl broken handling of SysV)
+  command: rcconf -on prosody
+  register: result
+  changed_when: result.stderr == ""
+
 - name: Enable and start Prosody service
-  service: name=prosody enabled=yes state=started
+  service: name=prosody state=started
 
 - name: Deploy firewall configuration for XMPP server
   copy: src="ferm_xmpp.conf" dest="/etc/ferm/conf.d/30-xmpp.conf" owner=root group=root mode=640