diff --git a/acct-group/drone-runner-docker/ChangeLog b/acct-group/drone-runner-docker/ChangeLog
new file mode 100644
index 0000000..f563a4f
--- /dev/null
+++ b/acct-group/drone-runner-docker/ChangeLog
@@ -0,0 +1,5 @@
+*drone-runner-docker-0 (25 Sep 2020)
+
+  25 Sep 2020; Manuel Friedli <manuel@gentoo.org> +drone-runner-docker-0.ebuild,
+  +metadata.xml:
+  acct-group/drone-runner-docker: Add drone-runner-docker group
diff --git a/acct-group/drone-runner-docker/Manifest b/acct-group/drone-runner-docker/Manifest
new file mode 100644
index 0000000..e45dd40
--- /dev/null
+++ b/acct-group/drone-runner-docker/Manifest
@@ -0,0 +1,3 @@
+EBUILD drone-runner-docker-0.ebuild 302 BLAKE2B b2ee07aed96b4d3605498172510a61c929e5d3c498f4b61e0537cd18f2f0e835d6ff215f6d5856d922114593a0a8be799e49eb8dd44875faf0fd4ad24cf0e17a SHA512 a45aa968b778d286140616927892e10da8f802e508bcbf30e6c2e048bdb629e2f7f64e18b1bbd9d2f87785b42481d8559deca83e3bdf0134c42d5af3806ed66f
+MISC ChangeLog 200 BLAKE2B c2d95a9a3982101cf463e63b37eee22abe4c10a5b9e75be1a2085c9d3a356fdddba2da7ecdc7d128d78c5eec7d63832d688336ae02ac4adf1c4a02e20e98856a SHA512 4918142cf6100aab78f961e0b0608b0b92acfdac9f4504e625a0a248d85c3d4893f580ade2cdc94272c2b4ac6f08b763c3ce42ea47832624d7bc7e7953428aa4
+MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
diff --git a/acct-group/drone-runner-docker/drone-runner-docker-0.ebuild b/acct-group/drone-runner-docker/drone-runner-docker-0.ebuild
new file mode 100644
index 0000000..40d2715
--- /dev/null
+++ b/acct-group/drone-runner-docker/drone-runner-docker-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+DESCRIPTION="Group used for the drone.io docker runner"
+KEYWORDS="~amd64"
+
+# If you want this to persist across multiple machines, pick a real number!
+ACCT_GROUP_ID="-1"
diff --git a/acct-group/drone-runner-docker/metadata.xml b/acct-group/drone-runner-docker/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/acct-group/drone-runner-docker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/drone-runner-docker/ChangeLog b/acct-user/drone-runner-docker/ChangeLog
new file mode 100644
index 0000000..97e3ad5
--- /dev/null
+++ b/acct-user/drone-runner-docker/ChangeLog
@@ -0,0 +1,5 @@
+*drone-runner-docker-0 (25 Sep 2020)
+
+  25 Sep 2020; Manuel Friedli <manuel@gentoo.org> +drone-runner-docker-0.ebuild,
+  +metadata.xml:
+  acct-user/drone-runner-docker: Add drone-runner-docker user
diff --git a/acct-user/drone-runner-docker/Manifest b/acct-user/drone-runner-docker/Manifest
new file mode 100644
index 0000000..f2c1006
--- /dev/null
+++ b/acct-user/drone-runner-docker/Manifest
@@ -0,0 +1,3 @@
+EBUILD drone-runner-docker-0.ebuild 334 BLAKE2B 3434502fbe3d2330c234774900651320e0de8af7c436a2c9ac9b84a456b1f7c17b7ed11dc4b1a26d1518dfa0f4f33f3bbac952cf800451f9c632d48c33cda434 SHA512 8ebc6d8d61e6e5529773628d0fabf71ef3d0a9f50e8113549d0d4469f0ccec327c1edf8dda38c53ce4ff68c056dc7ebeee4a9d6c69782c0d178b958768e1ab68
+MISC ChangeLog 198 BLAKE2B 4200548e561aec514a59ac858dd2988860e948ddcf48a005cf7a3934e9687a882b22647f59f1c58690ac394cf287bc109b675318d41bfd67bc5c92e5c7e5ac88 SHA512 3a15499f99c6797cf2220cbf6ebb5a5b003f9cb1a51275eaf5d388456ebdbcf2db6b3b092c5dcdabd008f2c8f47fd7469dd2cedbc7b637c2cef70216a2623eb8
+MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
diff --git a/acct-user/drone-runner-docker/drone-runner-docker-0.ebuild b/acct-user/drone-runner-docker/drone-runner-docker-0.ebuild
new file mode 100644
index 0000000..210b44c
--- /dev/null
+++ b/acct-user/drone-runner-docker/drone-runner-docker-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the drone.io docker runner"
+KEYWORDS="~amd64"
+
+ACCT_USER_ID=-1
+# drone goes first, to make it the primary group
+ACCT_USER_GROUPS=( drone-runner-docker docker )
+
+acct-user_add_deps
diff --git a/acct-user/drone-runner-docker/metadata.xml b/acct-user/drone-runner-docker/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/acct-user/drone-runner-docker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>