diff --git a/acct-group/forgejo-runner/Manifest b/acct-group/forgejo-runner/Manifest
index 561d2ec..20d1412 100644
--- a/acct-group/forgejo-runner/Manifest
+++ b/acct-group/forgejo-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD forgejo-runner-0.ebuild 294 BLAKE2B 27dd4f06693633609167dbbe0be573c3d2787b38d68628276d09d783511f6c8cef6b34bbbc054b6115a0c4678ec300e49293a0ee77f52f45339da670b34c76c6 SHA512 af7d7df55239ca13afa88b0f2b369bc8a5dd4a7c780137a8c8b676cbb914bfb80378879c7d4bfb7f3fad03d7dfe7e6ba6afec359a8d7defd56f2598bad283a36
+EBUILD forgejo-runner-0.ebuild 301 BLAKE2B 847df5a9e89cab88fa0d3aea316980b98f373975743e7092f7df3e3139507169d9d3b235c5709316ecd6b4206df30b406666b2099c31d7375d5c35e672402e91 SHA512 df67a72426269b1d3d0b14b0026063f320b3b68d671fae570990ce6a7716129a4fb55a0100f048328eb1b6d497b7248305444d721829786c157fe9b89a570179
 MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
diff --git a/acct-group/forgejo-runner/forgejo-runner-0.ebuild b/acct-group/forgejo-runner/forgejo-runner-0.ebuild
index e8febd8..757d178 100644
--- a/acct-group/forgejo-runner/forgejo-runner-0.ebuild
+++ b/acct-group/forgejo-runner/forgejo-runner-0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit acct-group
 DESCRIPTION="Group used for the forgejo-runner"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 # If you want this to persist across multiple machines, pick a real number!
 ACCT_GROUP_ID="-1"
diff --git a/acct-user/forgejo-runner/Manifest b/acct-user/forgejo-runner/Manifest
index bb18f00..e279635 100644
--- a/acct-user/forgejo-runner/Manifest
+++ b/acct-user/forgejo-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD forgejo-runner-0.ebuild 395 BLAKE2B c28b21d1e061ecbefda369bd2e50974980f517fa09506ed82ca72253f3bf36a7e879db9d1e271e2e9aa5c7bfcb63c76d1aca513ec2a51ee274d3a024ccda7661 SHA512 64c4f443e16516a9e7b9d3ad8e4a12caec6af432be9017a7503570afbf55fddb2d8c1d8d2108be2aab8aa8bd4d87149b78462115d569d0cb1f6711151db932d6
+EBUILD forgejo-runner-0.ebuild 412 BLAKE2B ff20fa75527aef6af53b92e0e2283550248ceabab6564db57ce034979f473657441725dcb8262db0654453a13eaa654884fadc73e5b6bbb726cea7876daa2fb9 SHA512 0b7a9788f8c70bde4acfd9e57cb37ac1ecdd4bb5cf1b4b34494f3e6bdecda5143b4c3f517a24156a7df43136a0256e768923f3ecac8141496d0e75a179377a57
 MISC metadata.xml 326 BLAKE2B 3d235c638beabe1bbfa5e40fa3b16a6bb713f5bbbaf08f8d2338c969b8f7793cb9d6bfbff63ee7b880823030acb63fb091a4f283e9f933c981932866ea892976 SHA512 9d8bba960aac5bc5603d6eab68677eea0ca64df6277587e167e01aebdef453458d8d0fc5ab19b2bc5668789bbc4e70249a5bece95565c7263012428981f81ef9
diff --git a/acct-user/forgejo-runner/forgejo-runner-0.ebuild b/acct-user/forgejo-runner/forgejo-runner-0.ebuild
index 671aa44..abcd364 100644
--- a/acct-user/forgejo-runner/forgejo-runner-0.ebuild
+++ b/acct-user/forgejo-runner/forgejo-runner-0.ebuild
@@ -6,12 +6,16 @@ EAPI=8
 inherit acct-user
 
 DESCRIPTION="User for the forgejo-runner"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
+IUSE="docker"
 
 ACCT_USER_ID=-1
-# forgejo-runner goes first, to make it the primary group
-ACCT_USER_GROUPS=( forgejo-runner docker )
+ACCT_USER_GROUPS=( forgejo-runner )
 ACCT_USER_HOME=/var/lib/forgejo-runner
 ACCT_USER_HOME_PERMS=0750
 
+pkg_setup() {
+	use docker && ACCT_USER_GROUPS+=( docker )
+}
+
 acct-user_add_deps
diff --git a/metadata/md5-cache/acct-group/forgejo-runner-0 b/metadata/md5-cache/acct-group/forgejo-runner-0
index 3995dc1..4144438 100644
--- a/metadata/md5-cache/acct-group/forgejo-runner-0
+++ b/metadata/md5-cache/acct-group/forgejo-runner-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=install preinst pretend
 DESCRIPTION=Group used for the forgejo-runner
 EAPI=8
 INHERIT=acct-group
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 SLOT=0
 _eclasses_=user-info	d7c261c6f7c2392145e8789913f1bf7e	acct-group	64c2dcae095a4889476d76ba39d2ce21
-_md5_=b72701ce2ec0d7b792ba7779ed76def3
+_md5_=7adcfa28f5963f40d0bf892d7d4edfad
diff --git a/metadata/md5-cache/acct-user/forgejo-runner-0 b/metadata/md5-cache/acct-user/forgejo-runner-0
index 216ff42..d65218a 100644
--- a/metadata/md5-cache/acct-user/forgejo-runner-0
+++ b/metadata/md5-cache/acct-user/forgejo-runner-0
@@ -1,9 +1,10 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
+DEFINED_PHASES=install postinst preinst prerm pretend setup
 DESCRIPTION=User for the forgejo-runner
 EAPI=8
 INHERIT=acct-user
-KEYWORDS=~amd64
-RDEPEND=acct-group/forgejo-runner acct-group/docker
+IUSE=docker
+KEYWORDS=~amd64 ~arm64
+RDEPEND=acct-group/forgejo-runner
 SLOT=0
 _eclasses_=user-info	d7c261c6f7c2392145e8789913f1bf7e	acct-user	8c5f04cd2cfafc30ffb9bae9cf5f5605
-_md5_=058599e4d1d9c24aea4e089309dda59f
+_md5_=7682098824203bb780ea9bbb2c2f73e2