diff --git a/actions/xmpp b/actions/xmpp
index 5978a43cc..da357d730 100755
--- a/actions/xmpp
+++ b/actions/xmpp
@@ -135,9 +135,9 @@ def subcommand_pre_install(arguments):
 
 def subcommand_setup(_):
     """Setup jwchat apache conf"""
-    subprocess.call(['a2dissite', 'jwchat'])
-    subprocess.call(['a2enconf', 'jwchat-plinth'])
-    action_utils.service_reload('apache2')
+    with action_utils.WebserverChange() as webserver_change:
+        webserver_change.disable('jwchat', kind='site')
+        webserver_change.enable('jwchat-plinth')
 
 
 def subcommand_is_ldap_enabled(_):