diff --git a/.SRCINFO b/.SRCINFO
index c1671068dcb05..15e1126ae873c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = crossmacro
 	pkgdesc = Cross-platform mouse and keyboard macro automation tool
-	pkgver = 0.8.2
+	pkgver = 0.8.3
 	pkgrel = 1
 	url = https://github.com/alper-han/CrossMacro
 	install = crossmacro.install
@@ -20,10 +20,13 @@ pkgbase = crossmacro
 	depends = libxrandr
 	depends = polkit
 	depends = libxtst
+	depends = systemd-libs
 	options = !strip
-	source = crossmacro-0.8.2.tar.gz::https://github.com/alper-han/CrossMacro/archive/v0.8.2.tar.gz
+	source = crossmacro-0.8.3.tar.gz::https://github.com/alper-han/CrossMacro/archive/v0.8.3.tar.gz
 	source = crossmacro.sysusers
-	sha256sums = 071f77ddb875d24d39a2d5b43ff2efd09468d6124e1f9916e1282163b308c663
+	source = crossmacro-modules.conf
+	sha256sums = 20668fd4381b682ead6fbf6e8605e8f2f0d2b7b59b7531900f8fcc55a2acb734
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = crossmacro
diff --git a/PKGBUILD b/PKGBUILD
index cc6a5d5b92049..93c31bf734e8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Zynix <crossmacro@zynix.net>
 pkgname=crossmacro
-pkgver=0.8.2
+pkgver=0.8.3
 pkgrel=1
 pkgdesc="Cross-platform mouse and keyboard macro automation tool"
 arch=('x86_64')
 url="https://github.com/alper-han/CrossMacro"
 license=('GPL-3.0')
-depends=('glibc' 'gcc-libs' 'zlib' 'openssl' 'fontconfig' 'libx11' 'libxcursor' 'libxrandr' 'polkit' 'libxtst')
+depends=('glibc' 'gcc-libs' 'zlib' 'openssl' 'fontconfig' 'libx11' 'libxcursor' 'libxrandr' 'polkit' 'libxtst' 'systemd-libs')
 makedepends=('dotnet-sdk>=10.0' 'git' 'clang' 'zlib')
 options=('!strip')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/alper-han/CrossMacro/archive/v${pkgver}.tar.gz"
-        "crossmacro.sysusers")
-sha256sums=('071f77ddb875d24d39a2d5b43ff2efd09468d6124e1f9916e1282163b308c663'
-            'SKIP')  # sysusers file checksum (local file)
+        "crossmacro.sysusers"
+        "crossmacro-modules.conf")
+sha256sums=('20668fd4381b682ead6fbf6e8605e8f2f0d2b7b59b7531900f8fcc55a2acb734'
+            'SKIP'
+            'SKIP')  # sysusers and modules config checksums (local files)
 install=crossmacro.install
 
 build() {
@@ -61,13 +63,15 @@ package() {
     install -Dm644 "scripts/daemon/crossmacro.service" \
         "$pkgdir/usr/lib/systemd/system/crossmacro.service"
         
-    # Fix ExecStart path in service file
-    sed -i "s|ExecStart=/opt/crossmacro/daemon/CrossMacro.Daemon|ExecStart=/usr/lib/$pkgname/daemon/CrossMacro.Daemon|g" \
-        "$pkgdir/usr/lib/systemd/system/crossmacro.service"
+
         
     # Install sysusers config
     install -Dm644 "$srcdir/crossmacro.sysusers" \
         "$pkgdir/usr/lib/sysusers.d/crossmacro.conf"
+
+    # Install modules-load config
+    install -Dm644 "$srcdir/crossmacro-modules.conf" \
+        "$pkgdir/usr/lib/modules-load.d/crossmacro.conf"
     
     # Install udev rules
     install -Dm644 "scripts/assets/99-crossmacro.rules" \
diff --git a/crossmacro-modules.conf b/crossmacro-modules.conf
new file mode 100644
index 0000000000000..42bc0053c7855
--- /dev/null
+++ b/crossmacro-modules.conf
@@ -0,0 +1 @@
+uinput
diff --git a/crossmacro.sysusers b/crossmacro.sysusers
index 0772d5c85e25d..3c01e9dfa092a 100644
--- a/crossmacro.sysusers
+++ b/crossmacro.sysusers
@@ -1,3 +1,3 @@
 g crossmacro -
-u crossmacro - "CrossMacro Daemon User" /var/lib/crossmacro /usr/bin/nologin
+u crossmacro - "CrossMacro Daemon User" / /usr/bin/nologin
 m crossmacro input