diff --git a/adguardhome/.SRCINFO b/adguardhome/.SRCINFO
index cf350e0..d307f56 100644
--- a/adguardhome/.SRCINFO
+++ b/adguardhome/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = adguardhome
 	pkgdesc = Network-wide ads and trackers blocking DNS server
 	pkgver = 0.107.5
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://github.com/AdguardTeam/AdGuardHome
 	arch = x86_64
@@ -14,11 +14,12 @@ pkgbase = adguardhome
 	makedepends = npm
 	makedepends = yarn
 	makedepends = git
+	backup = etc/default/adguardhome
 	source = adguardhome-0.107.5.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v0.107.5.tar.gz
 	source = adguardhome.service
 	source = adguardhome.defaults
 	b2sums = 92b7027296622862715479b265b79b7147afd69beef6cbb7bf02409ab288965f5bf77d87390ddd9068e0c061247a5071e43ad65e3337b919985964792fbc5ed1
-	b2sums = 0e45eb3b76d00110d53caeebb4ced95b97895d8b2b4934d3bd7bdac3a572690a6c5dc176d70b5e1d9ac5f8e358e192dbd32681e01df92b404286103475bd22ba
+	b2sums = d55d1667916e291b201dde5bd0a5d2d6dd16c654ecec4ea47c4a3a54b898e7008ba0538c9d5a4c7572cc304cc625b39accd69692766c1618890efff88e96e5a0
 	b2sums = ec3a3cd8debae4dcb4a723ef2ba31960aa1f897e2f8c857fcf9861bc7959072b22fed3091c0d07084c280be0755d03bf6ca4fef5f2d08ae20397378e13cf9c9b
 
 pkgname = adguardhome
diff --git a/adguardhome/PKGBUILD b/adguardhome/PKGBUILD
index e215ab7..ef260fc 100644
--- a/adguardhome/PKGBUILD
+++ b/adguardhome/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=adguardhome
 _pkgname=AdGuardHome
 pkgver=0.107.5
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Network-wide ads and trackers blocking DNS server"
 arch=(x86_64 aarch64 armv7h armv6h)
@@ -15,8 +15,9 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/AdguardTeam/AdGuardHome/arc
         "$pkgname.defaults"
 )
 makedepends=(go 'nodejs<17.0.0' npm yarn git)
+backup=('etc/default/adguardhome')
 b2sums=('92b7027296622862715479b265b79b7147afd69beef6cbb7bf02409ab288965f5bf77d87390ddd9068e0c061247a5071e43ad65e3337b919985964792fbc5ed1'
-        '0e45eb3b76d00110d53caeebb4ced95b97895d8b2b4934d3bd7bdac3a572690a6c5dc176d70b5e1d9ac5f8e358e192dbd32681e01df92b404286103475bd22ba'
+        'd55d1667916e291b201dde5bd0a5d2d6dd16c654ecec4ea47c4a3a54b898e7008ba0538c9d5a4c7572cc304cc625b39accd69692766c1618890efff88e96e5a0'
         'ec3a3cd8debae4dcb4a723ef2ba31960aa1f897e2f8c857fcf9861bc7959072b22fed3091c0d07084c280be0755d03bf6ca4fef5f2d08ae20397378e13cf9c9b')
 
 prepare() {
@@ -32,5 +33,5 @@ build() {
 package() {
   install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname"
   install -Dm644 "$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -Dm644 "$srcdir"/$pkgname.defaults "$pkgdir/etc/defaults/$pkgname"
+  install -Dm644 "$srcdir"/$pkgname.defaults "$pkgdir/etc/default/$pkgname"
 }
diff --git a/adguardhome/adguardhome.service b/adguardhome/adguardhome.service
index 9ef8e0d..d278459 100644
--- a/adguardhome/adguardhome.service
+++ b/adguardhome/adguardhome.service
@@ -5,11 +5,11 @@ After=syslog.target network-online.target
 [Service]
 DynamicUser=true
 StateDirectory=adguardhome
+WorkingDirectory=/var/lib/adguardhome
 EnvironmentFile=/etc/default/adguardhome
 AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_NET_RAW
-ExecStart=/usr/bin/adguardhome -h $HOST -p $PORT $ARGS
-WorkingDirectory=/var/lib/adguardhome
+ExecStart=/usr/bin/adguardhome -w /var/lib/adguardhome -h $HOST -p $PORT $ARGS
 
 [Install]
 WantedBy=multi-user.target