diff --git a/accessibility/gammy/Makefile b/accessibility/gammy/Makefile
index 80c884df37fd..bd9eedd45f60 100644
--- a/accessibility/gammy/Makefile
+++ b/accessibility/gammy/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	gammy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.64
 PORTREVISION=	1
 CATEGORIES=	accessibility
 
-MAINTAINER=	me@igalic.co
+MAINTAINER=	freebsd@igalic.co
 COMMENT=	Adaptive screen brightness and temperature for Windows and Unix
 WWW=		https://getgammy.com/
 
 LICENSE=	GPLv3
 
 USES=		compiler:c++11-lang gl qmake qt:5 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Fushko
 USE_GL=		gl
 USE_QT=		core dbus gui widgets \
 		buildtools:build qmake:build
 USE_XORG=	x11 xext xxf86vm
 
 PLIST_FILES=	bin/gammy \
 		share/applications/gammy.desktop \
 		share/pixmaps/gammy.png
 
 .include <bsd.port.mk>
diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile
index b407f5e8cece..86121c77623e 100644
--- a/net-im/gotosocial/Makefile
+++ b/net-im/gotosocial/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	gotosocial
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.2
 PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES?=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/:web
 DISTFILES?=	${PORTNAME}_${DISTVERSION}_web-assets.tar.gz:web
 
-MAINTAINER=	me+freebsd@igalic.co
+MAINTAINER=	freebsd@igalic.co
 COMMENT=	Golang fediverse server
 WWW=		https://docs.gotosocial.org/en/latest/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 
 # Note: we don't use go:modules, because this project vendors all deps
 USES=		go
 USE_RC_SUBR=	${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	superseriousbusiness
 
 SUB_LIST=	DBDIR="${DBDIR}" \
 		GROUP="${GROUPS}" \
 		USER="${USERS}" \
 		WWWDIR="${WWWDIR}"
 
 USERS=		gotosocial
 GROUPS=		gotosocial
 
 DBDIR=		/var/db/${PORTNAME}
 
 PLIST_SUB=	WWWDIR="${WWWDIR}"
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		VERSION=${DISTVERSION} COMMIT=${GH_TAGNAME} scripts/build.sh )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in LICENSE README.md
 	${INSTALL_DATA} ${WRKSRC}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/config.yaml \
 		${STAGEDIR}${ETCDIR}/config.yaml.sample
 	(cd ${WRKSRC}/../web && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ )
 
 .include <bsd.port.mk>
diff --git a/net/cloud-init-devel/Makefile b/net/cloud-init-devel/Makefile
index 9f48292170ff..d8b15ce38cef 100644
--- a/net/cloud-init-devel/Makefile
+++ b/net/cloud-init-devel/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	cloud-init
 DISTVERSION=	22.4-28
 DISTVERSIONSUFFIX=	-gaecdcbf8
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	me+FreeBSD@igalic.co
+MAINTAINER=	freebsd@igalic.co
 COMMENT=	Init scripts for use on cloud images, development version
 WWW=		https://cloud-init.io/
 
 LICENSE=	APACHE20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		sudo>0:security/sudo
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} \
 		bash:shells/bash
 
 USES=		python:3.6+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 SHEBANG_FILES=	tools/hook-hotplug tools/read-dependencies tools/read-version \
 		tools/validate-yaml.py
 
 TEST_ENV=	${MAKE_ENV} \
 		PYTHON=${PYTHON_VERSION}
 TEST_TARGET=	check
 
 # Conflicts
 CONFLICTS_INSTALL=	cloud-init
 
 # Standard bsd.port.mk variables
 ETCDIR=		${PREFIX}/etc/cloud
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
 	${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py
 	${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample
 	${REINPLACE_CMD} 's|^.*\.cfg$$|@sample &.sample|' ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>