diff --git a/device/testing/device-librecomputer-lafrite/APKBUILD b/device/testing/device-librecomputer-lafrite/APKBUILD
index 6c110fef3..bf223c49c 100644
--- a/device/testing/device-librecomputer-lafrite/APKBUILD
+++ b/device/testing/device-librecomputer-lafrite/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lafrite
 pkgdesc="Libre Computer AML-S805X-AC-V1.0"
 pkgver=0.2
diff --git a/device/testing/device-librecomputer-lepotato/APKBUILD b/device/testing/device-librecomputer-lepotato/APKBUILD
index 08567b55d..7491a65b5 100644
--- a/device/testing/device-librecomputer-lepotato/APKBUILD
+++ b/device/testing/device-librecomputer-lepotato/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lepotato
 pkgdesc="Libre Computer AML-S905X-CC-V1.0"
 pkgver=0.2
diff --git a/device/testing/device-librecomputer-solitude/APKBUILD b/device/testing/device-librecomputer-solitude/APKBUILD
index 4137f8a27..a9b3e6a1f 100644
--- a/device/testing/device-librecomputer-solitude/APKBUILD
+++ b/device/testing/device-librecomputer-solitude/APKBUILD
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Newbyte <newbyte@postmarketos.org>
-# Co-maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Co-maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-solitude
 pkgdesc="Libre Computer AML-S905D3-CC"
 pkgver=0.1
diff --git a/device/testing/device-videostrong-kii-pro/APKBUILD b/device/testing/device-videostrong-kii-pro/APKBUILD
index 22a72bc8d..18536364e 100644
--- a/device/testing/device-videostrong-kii-pro/APKBUILD
+++ b/device/testing/device-videostrong-kii-pro/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-videostrong-kii-pro
 pkgdesc="VideoStrong KII Pro"
 pkgver=0.1
diff --git a/device/testing/firmware-videostrong-kii-pro/APKBUILD b/device/testing/firmware-videostrong-kii-pro/APKBUILD
index 1fa1382fd..4c27d8ba2 100644
--- a/device/testing/firmware-videostrong-kii-pro/APKBUILD
+++ b/device/testing/firmware-videostrong-kii-pro/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=firmware-videostrong-kii-pro
 pkgver=1
 pkgrel=0
diff --git a/device/testing/linux-postmarketos-amlogic/APKBUILD b/device/testing/linux-postmarketos-amlogic/APKBUILD
index 474fd02bd..c442469d2 100644
--- a/device/testing/linux-postmarketos-amlogic/APKBUILD
+++ b/device/testing/linux-postmarketos-amlogic/APKBUILD
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/mainline>
 # Kernel config based on: arch/arm64/configs/defconfig
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 # Co-Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=linux-postmarketos-amlogic
 pkgver=6.5.5
diff --git a/device/testing/soc-amlogic-s905/APKBUILD b/device/testing/soc-amlogic-s905/APKBUILD
index b76af41ad..91522f343 100644
--- a/device/testing/soc-amlogic-s905/APKBUILD
+++ b/device/testing/soc-amlogic-s905/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 # Co-Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=soc-amlogic-s905
 pkgdesc="Common package for devices using the Amlogic S905 SoC"
diff --git a/device/testing/u-boot-amlogic-s905-tv/APKBUILD b/device/testing/u-boot-amlogic-s905-tv/APKBUILD
index b6575c392..03c4a237c 100644
--- a/device/testing/u-boot-amlogic-s905-tv/APKBUILD
+++ b/device/testing/u-boot-amlogic-s905-tv/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=u-boot-amlogic-s905-tv
 pkgver=2020.07
 pkgrel=0
diff --git a/device/testing/u-boot-librecomputer-lafrite/APKBUILD b/device/testing/u-boot-librecomputer-lafrite/APKBUILD
index 4b647d282..3f6d6d5c7 100644
--- a/device/testing/u-boot-librecomputer-lafrite/APKBUILD
+++ b/device/testing/u-boot-librecomputer-lafrite/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://u-boot.readthedocs.io/en/latest/board/amlogic/radxa-zero.html>
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=u-boot-librecomputer-lafrite
 pkgver=2023.04
 pkgrel=0
diff --git a/device/testing/u-boot-librecomputer-lepotato/APKBUILD b/device/testing/u-boot-librecomputer-lepotato/APKBUILD
index 5706663ab..56f2b2a29 100644
--- a/device/testing/u-boot-librecomputer-lepotato/APKBUILD
+++ b/device/testing/u-boot-librecomputer-lepotato/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://u-boot.readthedocs.io/en/latest/board/amlogic/radxa-zero.html>
-# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=u-boot-librecomputer-lepotato
 pkgver=2023.04
 pkgrel=0