diff --git a/device/archived/device-volla-mimameid-downstream/APKBUILD b/device/archived/device-volla-mimameid-downstream/APKBUILD
index 7c03ba683..2af5cc65d 100644
--- a/device/archived/device-volla-mimameid-downstream/APKBUILD
+++ b/device/archived/device-volla-mimameid-downstream/APKBUILD
@@ -1,6 +1,6 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 pkgname=device-volla-mimameid-downstream
 pkgdesc="Volla Phone 22 (Downstream)"
 pkgver=1
diff --git a/device/archived/linux-volla-mimameid-downstream/APKBUILD b/device/archived/linux-volla-mimameid-downstream/APKBUILD
index 08b14cf80..18432bf91 100644
--- a/device/archived/linux-volla-mimameid-downstream/APKBUILD
+++ b/device/archived/linux-volla-mimameid-downstream/APKBUILD
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/gs5_defconfig
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 
 pkgname=linux-volla-mimameid-downstream
 pkgver=4.14.186
diff --git a/device/testing/device-oneplus-cheeseburger/APKBUILD b/device/testing/device-oneplus-cheeseburger/APKBUILD
index f6f62ade3..dba105548 100644
--- a/device/testing/device-oneplus-cheeseburger/APKBUILD
+++ b/device/testing/device-oneplus-cheeseburger/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-cheeseburger
 pkgdesc="OnePlus 5"
diff --git a/device/testing/device-oneplus-dumpling/APKBUILD b/device/testing/device-oneplus-dumpling/APKBUILD
index 69bb1cd2e..a401956c0 100644
--- a/device/testing/device-oneplus-dumpling/APKBUILD
+++ b/device/testing/device-oneplus-dumpling/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-dumpling
 pkgdesc="OnePlus 5T"
diff --git a/device/testing/device-volla-mimameid/APKBUILD b/device/testing/device-volla-mimameid/APKBUILD
index 8e4cb32db..64c242eb8 100644
--- a/device/testing/device-volla-mimameid/APKBUILD
+++ b/device/testing/device-volla-mimameid/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 pkgname=device-volla-mimameid
 pkgdesc="Volla Phone 22"
 pkgver=3
diff --git a/device/testing/device-volla-yggdrasil/APKBUILD b/device/testing/device-volla-yggdrasil/APKBUILD
index 844f16348..fd65a5b55 100644
--- a/device/testing/device-volla-yggdrasil/APKBUILD
+++ b/device/testing/device-volla-yggdrasil/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-volla-yggdrasil
 pkgdesc="Volla Phone"
diff --git a/device/testing/firmware-oneplus-msm8998/APKBUILD b/device/testing/firmware-oneplus-msm8998/APKBUILD
index c1060bf5f..fd097cc7f 100644
--- a/device/testing/firmware-oneplus-msm8998/APKBUILD
+++ b/device/testing/firmware-oneplus-msm8998/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 pkgname=firmware-oneplus-msm8998
 pkgver=10.0.1
 pkgrel=4
diff --git a/device/testing/linux-postmarketos-mediatek-mt6763/APKBUILD b/device/testing/linux-postmarketos-mediatek-mt6763/APKBUILD
index 3eb5651e2..8e722b9af 100644
--- a/device/testing/linux-postmarketos-mediatek-mt6763/APKBUILD
+++ b/device/testing/linux-postmarketos-mediatek-mt6763/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 # Mainline Linux kernel fork with patches for MediaTek MT6763 devices
 # Kernel config based on: arch/arm64/configs/mt6763_defconfig
 _flavor="postmarketos-mediatek-mt6763"
diff --git a/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD b/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD
index 8c88236f8..437dd8b93 100644
--- a/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD
+++ b/device/testing/linux-postmarketos-mediatek-mt6768/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 # Mainline Linux kernel fork with patches for MediaTek MT6768 devices
 # Kernel config based on: arch/arm64/configs/mt6768_defconfig
 _flavor="postmarketos-mediatek-mt6768"
diff --git a/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD
index 89a74e0e8..d9a2b356d 100644
--- a/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 # Stable Linux kernel with patches for MSM8998 devices
 # Kernel config based on: msm8998_defconfig
 _flavor="postmarketos-qcom-msm8998"
diff --git a/device/testing/soc-qcom-msm8998/APKBUILD b/device/testing/soc-qcom-msm8998/APKBUILD
index 0ad7913ef..28a9a6518 100644
--- a/device/testing/soc-qcom-msm8998/APKBUILD
+++ b/device/testing/soc-qcom-msm8998/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
+# Maintainer:
 pkgname=soc-qcom-msm8998
 pkgdesc="Common package for Qualcomm MSM8998 devices"
 pkgver=1