diff --git a/anda/misc/opentabletdriver/v0.6.3.0.tar.gz b/anda/misc/opentabletdriver/v0.6.3.0.tar.gz
deleted file mode 100644
index 7622665a85..0000000000
Binary files a/anda/misc/opentabletdriver/v0.6.3.0.tar.gz and /dev/null differ
diff --git a/anda/misc/opentabletdriver/anda.hcl b/anda/system/opentabletdriver/anda.hcl
similarity index 100%
rename from anda/misc/opentabletdriver/anda.hcl
rename to anda/system/opentabletdriver/anda.hcl
diff --git a/anda/misc/opentabletdriver/opentabletdriver.spec b/anda/system/opentabletdriver/opentabletdriver.spec
similarity index 90%
rename from anda/misc/opentabletdriver/opentabletdriver.spec
rename to anda/system/opentabletdriver/opentabletdriver.spec
index 7d07525748..c4e5dea8b5 100644
--- a/anda/misc/opentabletdriver/opentabletdriver.spec
+++ b/anda/system/opentabletdriver/opentabletdriver.spec
@@ -14,14 +14,13 @@ License: LGPLv3
 URL: https://github.com/OpenTabletDriver/OpenTabletDriver
 %define otddir OpenTabletDriver-%{version}
 
-BuildRequires: dotnet-sdk-6.0 git jq
+BuildRequires: dotnet-sdk-6.0 git jq systemd-rpm-macros
 
 Requires: dotnet-runtime-6.0
 Requires: libevdev.so.2()(64bit)
 Requires: gtk3
 Requires: gtk3
 Requires: udev
-Requires(post): grep
 Suggests: libX11
 Suggests: libXrandr
 
@@ -43,6 +42,14 @@ rm -rf ./dist
 mkdir -p "%{buildroot}/%{_prefix}/lib/"
 cp -r bin "%{buildroot}/%{_prefix}/lib/opentabletdriver"
 
+%post
+%systemd_user_post %name.service
+
+%preun
+%systemd_user_preun %name.service
+
+%postun
+%systemd_user_postun_with_restart %name.service
 
 %files
 %defattr(-,root,root)
diff --git a/anda/misc/opentabletdriver/update.rhai b/anda/system/opentabletdriver/update.rhai
similarity index 100%
rename from anda/misc/opentabletdriver/update.rhai
rename to anda/system/opentabletdriver/update.rhai