diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript
index 52682fcdd..99847d424 100644
--- a/debian/freedombox.maintscript
+++ b/debian/freedombox.maintscript
@@ -94,6 +94,8 @@ rm_conffile /etc/uwsgi/apps-available/bepasty-freedombox.ini 23.10~
 rm_conffile /etc/apache2/conf-available/calibre-freedombox.conf 23.10~
 rm_conffile /etc/apache2/conf-available/cockpit-freedombox.conf 23.10~
 rm_conffile /etc/apache2/conf-available/deluge-plinth.conf 23.10~
+rm_conffile /etc/apache2/conf-available/jwchat-plinth.conf 23.10~
+rm_conffile /etc/avahi/services/xmpp-server.service 23.10~
 rm_conffile /etc/dovecot/conf.d/15-freedombox-mail.conf 23.10~
 rm_conffile /etc/dovecot/conf.d/05-freedombox-passdb.conf 23.10~
 rm_conffile /etc/dovecot/conf.d/95-freedombox-sieve.conf 23.10~
diff --git a/plinth/modules/ejabberd/__init__.py b/plinth/modules/ejabberd/__init__.py
index 2cc217a6f..f0484ec1b 100644
--- a/plinth/modules/ejabberd/__init__.py
+++ b/plinth/modules/ejabberd/__init__.py
@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 
 from plinth import app as app_module
 from plinth import cfg, frontpage, menu
+from plinth.config import DropinConfigs
 from plinth.daemon import Daemon
 from plinth.modules import config
 from plinth.modules.apache.components import Webserver
@@ -50,7 +51,7 @@ class EjabberdApp(app_module.App):
 
     app_id = 'ejabberd'
 
-    _version = 6
+    _version = 7
 
     def __init__(self):
         """Create components for the app."""
@@ -79,6 +80,16 @@ class EjabberdApp(app_module.App):
         packages = Packages('packages-ejabberd', ['ejabberd'])
         self.add(packages)
 
+        dropin_configs = DropinConfigs('dropin-configs-ejabberd', [
+            '/etc/apache2/conf-available/jwchat-plinth.conf',
+        ])
+        self.add(dropin_configs)
+
+        dropin_configs = DropinConfigs('dropin-config-ejabberd-avahi', [
+            '/etc/avahi/services/xmpp-server.service',
+        ], copy_only=True)
+        self.add(dropin_configs)
+
         firewall = Firewall('firewall-ejabberd', info.name,
                             ports=['xmpp-client', 'xmpp-server',
                                    'xmpp-bosh'], is_external=True)
diff --git a/plinth/modules/ejabberd/data/etc/apache2/conf-available/jwchat-plinth.conf b/plinth/modules/ejabberd/data/usr/share/freedombox/etc/apache2/conf-available/jwchat-plinth.conf
similarity index 100%
rename from plinth/modules/ejabberd/data/etc/apache2/conf-available/jwchat-plinth.conf
rename to plinth/modules/ejabberd/data/usr/share/freedombox/etc/apache2/conf-available/jwchat-plinth.conf
diff --git a/plinth/modules/ejabberd/data/etc/avahi/services/xmpp-server.service b/plinth/modules/ejabberd/data/usr/share/freedombox/etc/avahi/services/xmpp-server.service
similarity index 100%
rename from plinth/modules/ejabberd/data/etc/avahi/services/xmpp-server.service
rename to plinth/modules/ejabberd/data/usr/share/freedombox/etc/avahi/services/xmpp-server.service