diff --git a/CODEOWNERS b/CODEOWNERS
index cde01999f87726a3410f66cf576cd16476cb261c..e3e0d302374a8e1506c80afe4a429d679e16e111 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -34,7 +34,6 @@ device/*/*-qcom-msm8916/			@Minecrell @TravMurav
 device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-qcom-sm6350/				@z3ntu
 device/*/*-qcom-sm7150/				@Adrian @jiaxyga @ungeskriptet
 device/*/*-qcom-sm8250/				@jianhua
 device/*/*-qcom/					@calebccff
@@ -73,7 +72,6 @@ device/*/*-xiaomi-ysl/				@barni2000
 device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/alsa-ucm-conf-qcom-sdm670/		@flamingradian
 device/*/device-apple-n61/			@JustSoup321
-device/*/device-fairphone-*/			@z3ntu
 device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
@@ -93,7 +91,7 @@ device/*/device-postmarketos-trailblazer/	@calebccff
 device/*/device-qcom-msm8909/			@wonderfulShrineMaidenOfParadise
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell @z3ntu
+device/*/device-qemu-riscv64/			@Minecrell
 device/*/device-qualcomm-sdm845/		@calebccff
 device/*/device-raspberry-pi3/			@fossdd
 device/*/device-samsung-chagallwifi/		@Grimler
diff --git a/device/community/firmware-fairphone-fp4/APKBUILD b/device/community/firmware-fairphone-fp4/APKBUILD
index 13a77926547e6dc1b0f3bd998addd9bd38a38824..a867928a41c732d2dcd7d76fcec320e8a574350f 100644
--- a/device/community/firmware-fairphone-fp4/APKBUILD
+++ b/device/community/firmware-fairphone-fp4/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-fairphone-fp4
 pkgver=20240313
 pkgrel=1
diff --git a/device/testing/device-asus-sparrow/APKBUILD b/device/testing/device-asus-sparrow/APKBUILD
index 367e54d2f931e75bb7bf032aca145f2140ff75d3..764accb30a2f25d87bf8ba33788bc1f4d60f7fea 100644
--- a/device/testing/device-asus-sparrow/APKBUILD
+++ b/device/testing/device-asus-sparrow/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-asus-sparrow
 pkgdesc="ASUS ZenWatch 2"
 pkgver=3
diff --git a/device/testing/device-fairphone-fp1/APKBUILD b/device/testing/device-fairphone-fp1/APKBUILD
index 15612ba708391ec643e5d14514b1c4b4f27e2851..169201c11dac12df249b0b050a1fef915c615409 100644
--- a/device/testing/device-fairphone-fp1/APKBUILD
+++ b/device/testing/device-fairphone-fp1/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp1
 pkgdesc="Fairphone 1"
 pkgver=2
diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD
index 3e4bb2b3295a5c3259679b914a0e861fa17c8739..39bb9b24fe7f0bde588e29ac4dc49121d5e35b75 100644
--- a/device/testing/device-fairphone-fp2/APKBUILD
+++ b/device/testing/device-fairphone-fp2/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
 pkgver=9
diff --git a/device/testing/device-fairphone-fp3/APKBUILD b/device/testing/device-fairphone-fp3/APKBUILD
index dff861986b4706f7767cee06b3aa94737f3f370f..ad2c51d0af8930bc7bf5881f9f52582bb0c66e99 100644
--- a/device/testing/device-fairphone-fp3/APKBUILD
+++ b/device/testing/device-fairphone-fp3/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp3
 pkgdesc="Fairphone 3"
 pkgver=5
diff --git a/device/testing/device-htc-memul/APKBUILD b/device/testing/device-htc-memul/APKBUILD
index bccf567afa3df4a37c3b310b3df17d87a9a5aa67..3098c7a21ae8ccaeac12ce8179ed86f7b8f27cd7 100644
--- a/device/testing/device-htc-memul/APKBUILD
+++ b/device/testing/device-htc-memul/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-htc-memul
 pkgdesc="HTC One Mini 2"
 pkgver=6
diff --git a/device/testing/device-huawei-sturgeon/APKBUILD b/device/testing/device-huawei-sturgeon/APKBUILD
index 78a3a6210d2d2077a309c1759a1cc7203a44b2e9..a6ea241b21522bb1eeb6596bed5feb1d30fef9db 100644
--- a/device/testing/device-huawei-sturgeon/APKBUILD
+++ b/device/testing/device-huawei-sturgeon/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-huawei-sturgeon
 pkgdesc="Huawei Watch"
 pkgver=3
diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index b1749a9c14a96f547907bbf9d2b4b8e75b09f532..b1567998522526289a9b66f1fd2f73d802002688 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-lg-hammerhead
 pkgver=12
 pkgrel=0
diff --git a/device/testing/device-lg-lenok/APKBUILD b/device/testing/device-lg-lenok/APKBUILD
index 1b7d3d45ae56b0402fd885c7fdbb3c1d7a6ba2ad..4ee3850ec5893c17c141fb130160ce4d31e89b79 100644
--- a/device/testing/device-lg-lenok/APKBUILD
+++ b/device/testing/device-lg-lenok/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-lg-lenok
 pkgdesc="LG G Watch R"
 pkgver=4
diff --git a/device/testing/device-oneplus-bacon/APKBUILD b/device/testing/device-oneplus-bacon/APKBUILD
index 2962be47e964dbfe88d4bdf2b81a3eb0739b693e..0e1cd18f61b701cca31286a815cee0fed5e454fc 100644
--- a/device/testing/device-oneplus-bacon/APKBUILD
+++ b/device/testing/device-oneplus-bacon/APKBUILD
@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-oneplus-bacon
 pkgver=6
 pkgrel=0
diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index f68fc68306d89d4fe3a271e5415b25ef5c0f003c..78ac648d65e03c9b85fb4d89dcdff00378b58743 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Audun MG <audun@gangsto.org>
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
 pkgver=3
diff --git a/device/testing/firmware-asus-sparrow/APKBUILD b/device/testing/firmware-asus-sparrow/APKBUILD
index f33660c6ab3c1e4c228d6cd1fb2b2cf10c677b2e..932c48c7bb687cf78371faee2fc8e9f78942e5a0 100644
--- a/device/testing/firmware-asus-sparrow/APKBUILD
+++ b/device/testing/firmware-asus-sparrow/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-asus-sparrow
 pkgver=1
 pkgrel=0
diff --git a/device/testing/firmware-fairphone-fp2/APKBUILD b/device/testing/firmware-fairphone-fp2/APKBUILD
index d7b6db9651df97dc8392567796c6b5525101b2c3..e6084dfeee2f9797ec253b448e221b73f17aa68f 100644
--- a/device/testing/firmware-fairphone-fp2/APKBUILD
+++ b/device/testing/firmware-fairphone-fp2/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-fairphone-fp2
 pkgver=17.09.3
 pkgrel=3
diff --git a/device/testing/firmware-fairphone-fp3/APKBUILD b/device/testing/firmware-fairphone-fp3/APKBUILD
index 30b91a3bdb6c9ce9469a5edf90a62fd0c7cdd243..bb1e434d623a9ad7fc52b00200d1f10c8ed01e6f 100644
--- a/device/testing/firmware-fairphone-fp3/APKBUILD
+++ b/device/testing/firmware-fairphone-fp3/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-fairphone-fp3
 pkgver=20210805
 _commit="ee529820bb874ab1b52873f0b144c3786f01ee4c"
diff --git a/device/testing/firmware-fairphone-fp5/APKBUILD b/device/testing/firmware-fairphone-fp5/APKBUILD
index 440d1148634362eafd72a57d593fec355f9b1c0e..39cc60239c2d581af38cd2b2a6fc16847a58cf3f 100644
--- a/device/testing/firmware-fairphone-fp5/APKBUILD
+++ b/device/testing/firmware-fairphone-fp5/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-fairphone-fp5
 pkgver=20240417
 pkgrel=1
diff --git a/device/testing/firmware-htc-memul/APKBUILD b/device/testing/firmware-htc-memul/APKBUILD
index e4d0218425f11e5915c862a01850bf394f1cc057..97de2d7a69e04820cde6c5c21989969a097a5cf4 100644
--- a/device/testing/firmware-htc-memul/APKBUILD
+++ b/device/testing/firmware-htc-memul/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-htc-memul
 pkgver=1
 pkgrel=2
diff --git a/device/testing/firmware-huawei-sturgeon/APKBUILD b/device/testing/firmware-huawei-sturgeon/APKBUILD
index 8a2109032bcc7f4a6bc1f96478910201f01ab026..414aca6323a50ab1bae53f4170c0a1a185efdbdd 100644
--- a/device/testing/firmware-huawei-sturgeon/APKBUILD
+++ b/device/testing/firmware-huawei-sturgeon/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-huawei-sturgeon
 pkgver=2
 pkgrel=0
diff --git a/device/testing/firmware-lg-hammerhead/APKBUILD b/device/testing/firmware-lg-hammerhead/APKBUILD
index 18f9744204f77a4466de41e0664edeba4d7fbe59..9a55d091dcc41b9aa64b3827e5d97ce9df58da64 100644
--- a/device/testing/firmware-lg-hammerhead/APKBUILD
+++ b/device/testing/firmware-lg-hammerhead/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-lg-hammerhead
 pkgver=1
 pkgrel=4
diff --git a/device/testing/firmware-lg-lenok/APKBUILD b/device/testing/firmware-lg-lenok/APKBUILD
index 0dbfef403a73ca5b2f6d87399e0a2bebe4b7ebc8..fb57157a4d8e14fac3f3ead552cbcca14728ce95 100644
--- a/device/testing/firmware-lg-lenok/APKBUILD
+++ b/device/testing/firmware-lg-lenok/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-lg-lenok
 pkgver=1
 pkgrel=0
diff --git a/device/testing/firmware-oneplus-bacon/APKBUILD b/device/testing/firmware-oneplus-bacon/APKBUILD
index 474d2ad788770462d86b22143c493b5b5d87f23d..4b60b513919cceaef81e46da6008aa4586e39a73 100644
--- a/device/testing/firmware-oneplus-bacon/APKBUILD
+++ b/device/testing/firmware-oneplus-bacon/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-oneplus-bacon
 pkgver=1
 pkgrel=0
diff --git a/device/testing/firmware-sony-leo/APKBUILD b/device/testing/firmware-sony-leo/APKBUILD
index cd8f46af3d143732866eb2562976e21d315e2b54..52a358c39ce1e736e4fce770a2e6d57d834500c2 100644
--- a/device/testing/firmware-sony-leo/APKBUILD
+++ b/device/testing/firmware-sony-leo/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-sony-leo
 pkgver=1
 pkgrel=0
diff --git a/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD
index 27f1c720b416ebe355cb037db4c487941e19295d..6969848ef649083eccf9bac87b390c64af30a3bc 100644
--- a/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Newbyte <newbie13xd@gmail.com>
+# Co-Maintainer: Luca Weiss <luca@lucaweiss.eu>
 # Kernel config based on: arch/arm/configs/qcom_defconfig
 
 _flavor="postmarketos-qcom-msm8226"