diff --git a/debian/compat b/debian/compat
index f599e28b..b1bd38b6 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+13
diff --git a/debian/control b/debian/control
index 500509f7..45c736e9 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,29 @@ Standards-Version: 4.5.0
 Homepage: https://github.com/siemens/mtda
 X-Python3-Version: >= 3.7
 
+Package: mtda-service
+Architecture: all
+Multi-Arch: foreign
+Depends: mtda-common,
+         python3-daemon,
+         python3-gevent,
+         python3-libgpiod,
+         python3-psutil,
+         python3-requests,
+         python3-serial,
+         python3-systemd,
+         python3-usb,
+         python3-zeroconf,
+         python3-zmq,
+         python3-zstandard,
+         usbrelay,
+         ${misc:Depends}
+Replaces: mtda-usb-functions
+Suggests: nbd-server
+Description: Multi-Tenant Device Access service
+ Provide the infrastructure for running MTDA as a systemd
+ service.
+
 Package: mtda
 Architecture: all
 Multi-Arch: foreign
@@ -81,29 +104,6 @@ Description: support for pytest code that uses MTDA
  Provide helper classes to write tests with the pytest and MTDA
  frameworks.
 
-Package: mtda-service
-Architecture: all
-Multi-Arch: foreign
-Depends: mtda-common,
-         python3-daemon,
-         python3-gevent,
-         python3-libgpiod,
-         python3-psutil,
-         python3-requests,
-         python3-serial,
-         python3-systemd,
-         python3-usb,
-         python3-zeroconf,
-         python3-zmq,
-         python3-zstandard,
-         usbrelay,
-         ${misc:Depends}
-Replaces: mtda-usb-functions
-Suggests: nbd-server
-Description: Multi-Tenant Device Access service
- Provide the infrastructure for running MTDA as a systemd
- service.
-
 Package: mtda-ui
 Architecture: all
 Multi-Arch: foreign
diff --git a/debian/mtda.udev b/debian/mtda-service.udev
similarity index 100%
rename from debian/mtda.udev
rename to debian/mtda-service.udev
diff --git a/debian/rules b/debian/rules
index e2f274e5..49c41224 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ PY_TARGET=$(shell python3 -c "import sysconfig; print(sysconfig.get_path('stdlib
 MTDA_DIST=$(PY_TARGET)/dist-packages/mtda
 
 %:
-	dh $@ --with python3 --with=systemd --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_test:
 
@@ -71,14 +71,6 @@ override_dh_auto_install:
 	mv debian/mtda-service$(MTDA_DIST)/www.py debian/mtda-www$(MTDA_DIST)/
 	install -m 0644 configs/10-www.conf debian/mtda-www/etc/mtda/config.d/
 
-override_dh_systemd_enable:
-	dh_systemd_enable --name=mtda
-	dh_systemd_enable --name=mtda-config
-
 override_dh_installsystemd:
 	dh_installsystemd --name=mtda
 	dh_installsystemd --name=mtda-config
-
-override_dh_systemd_start:
-	dh_systemd_start --name=mtda
-	dh_systemd_start --name=mtda-config