diff --git a/CODEOWNERS b/CODEOWNERS
index 9e38a1a7f..db9762890 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -54,7 +54,7 @@ device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
 device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/device-fairphone-*/			@z3ntu
-device/*/device-generic-x86_64/			@craftyguy
+device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/device-google-peach-pi/		@jenneron
diff --git a/device/testing/device-generic-x86_64/APKBUILD b/device/testing/device-generic-x86_64/APKBUILD
index 58c178c35..6edf78d82 100644
--- a/device/testing/device-generic-x86_64/APKBUILD
+++ b/device/testing/device-generic-x86_64/APKBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
 pkgver=12