diff --git a/acct-group/jackett/jackett-0.ebuild b/acct-group/jackett/jackett-0.ebuild
index 3f2812dc1..166db73d6 100644
--- a/acct-group/jackett/jackett-0.ebuild
+++ b/acct-group/jackett/jackett-0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-group
 
-ACCT_GROUP_ID=-1
 DESCRIPTION="Group for www-apps/jackett-bin"
-KEYWORDS="amd64"
+ACCT_GROUP_ID=-1
diff --git a/acct-group/opentracker/opentracker-0.ebuild b/acct-group/opentracker/opentracker-0.ebuild
index c98ba1714..cb3a77da0 100644
--- a/acct-group/opentracker/opentracker-0.ebuild
+++ b/acct-group/opentracker/opentracker-0.ebuild
@@ -5,4 +5,5 @@ EAPI=8
 
 inherit acct-group
 
+DESCRIPTION="Group for net-p2p/opentracker"
 ACCT_GROUP_ID=-1
diff --git a/acct-group/torrserver/torrserver-0.ebuild b/acct-group/torrserver/torrserver-0.ebuild
index 9258c4825..d1d032366 100644
--- a/acct-group/torrserver/torrserver-0.ebuild
+++ b/acct-group/torrserver/torrserver-0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-group
 
-ACCT_GROUP_ID=-1
 DESCRIPTION="Group for net-p2p/torrserver-bin"
-KEYWORDS="amd64"
+ACCT_GROUP_ID=-1
diff --git a/acct-user/jackett/jackett-0.ebuild b/acct-user/jackett/jackett-0.ebuild
index 80c12121b..3e9959b0c 100644
--- a/acct-user/jackett/jackett-0.ebuild
+++ b/acct-user/jackett/jackett-0.ebuild
@@ -1,14 +1,13 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-user
 
 DESCRIPTION="User for www-apps/jackett-bin"
-KEYWORDS="amd64"
 ACCT_USER_ID=-1
 ACCT_USER_GROUPS=( jackett )
-ACCT_USER_HOME="/var/lib/jackett/"
+ACCT_USER_HOME="/var/lib/jackett"
 
 acct-user_add_deps
diff --git a/acct-user/opentracker/opentracker-0.ebuild b/acct-user/opentracker/opentracker-0.ebuild
index 6472855de..3990174ff 100644
--- a/acct-user/opentracker/opentracker-0.ebuild
+++ b/acct-user/opentracker/opentracker-0.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 inherit acct-user
 
+DESCRIPTION="User for net-p2p/opentracker"
 ACCT_USER_ID=-1
 ACCT_USER_GROUPS=( opentracker )
 ACCT_USER_HOME="/var/lib/opentracker"
-ACCT_USER_HOME_OWNER="opentracker:opentracker"
 
 acct-user_add_deps
diff --git a/acct-user/torrserver/torrserver-0.ebuild b/acct-user/torrserver/torrserver-0.ebuild
index 491065393..cd0c705e0 100644
--- a/acct-user/torrserver/torrserver-0.ebuild
+++ b/acct-user/torrserver/torrserver-0.ebuild
@@ -1,14 +1,13 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-user
 
 DESCRIPTION="User for net-p2p/torrserver-bin"
-KEYWORDS="amd64"
 ACCT_USER_ID=-1
 ACCT_USER_GROUPS=( torrserver )
-ACCT_USER_HOME="/var/lib/torrserver/"
+ACCT_USER_HOME="/var/lib/torrserver"
 
 acct-user_add_deps