diff --git a/benchmarks/ddosify/Makefile b/benchmarks/ddosify/Makefile
index f83a92e4dbf578f7f7cf604c27e01fddeb27a34a..c07180e43899cae05aa21285c86bf7b7c11782c4 100644
--- a/benchmarks/ddosify/Makefile
+++ b/benchmarks/ddosify/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 1.0.6
PORTREVISION= 1
CATEGORIES= benchmarks
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= High-performance load testing tool
WWW= https://github.com/ddosify/ddosify
diff --git a/benchmarks/plow/Makefile b/benchmarks/plow/Makefile
index daa0d0f5cd7931f74e3e9c66d879b5bf72555927..48403dd0bcd2848abb82a1e49898ece84e9a9624 100644
--- a/benchmarks/plow/Makefile
+++ b/benchmarks/plow/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 1.3.1
PORTREVISION= 11
CATEGORIES= benchmarks
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= HTTP benchmarking tool with real-time web UI and terminal displaying
WWW= https://github.com/six-ddc/plow
diff --git a/devel/atlantis/Makefile b/devel/atlantis/Makefile
index 77f00af08ae544bb73162b22465c6bd05a21acea..84d7f557b12ab597bd4d004ca6b2357898756171 100644
--- a/devel/atlantis/Makefile
+++ b/devel/atlantis/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 0.23.5
PORTREVISION= 4
CATEGORIES= devel
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Terraform Pull Requests Automation
WWW= https://www.runatlantis.io
diff --git a/dns/dnsx/Makefile b/dns/dnsx/Makefile
index 73c6749d13ccfc166b91ede7f7fafbd146cf1bad..58315b548dd241d06878b72fbfaf938c0af1f520 100644
--- a/dns/dnsx/Makefile
+++ b/dns/dnsx/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 1.1.6
PORTREVISION= 1
CATEGORIES= dns
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= DNS toolkit allow to run multiple DNS queries
WWW= https://github.com/projectdiscovery/dnsx
diff --git a/net-mgmt/pushgateway/Makefile b/net-mgmt/pushgateway/Makefile
index b91ebcda154e93d5297d4ca8c316515378fa6c59..fd773b931cf7e10162bfe16c0038218940cd6db8 100644
--- a/net-mgmt/pushgateway/Makefile
+++ b/net-mgmt/pushgateway/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 1.6.2
PORTREVISION= 1
CATEGORIES= net-mgmt
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Prometheus push acceptor for ephemeral and batch jobs
WWW= https://github.com/prometheus/pushgateway
diff --git a/net/ipinfo-cli/Makefile b/net/ipinfo-cli/Makefile
index 63ddd0ee7e8305e248104841282b0adf8533ae41..b80f59adfca6f64483391cc02d803b83a1c1dd74 100644
--- a/net/ipinfo-cli/Makefile
+++ b/net/ipinfo-cli/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= ipinfo-
DISTVERSION= 3.3.0
CATEGORIES= net
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Official Command Line Interface for the IPinfo API
WWW= https://github.com/ipinfo/cli
diff --git a/net/py-whois/Makefile b/net/py-whois/Makefile
index 75871c45622ade6e0068903197e9a7c71d9bc7be..b2bfe6a0228cb517d8ec8292e0877b33b91487fc 100644
--- a/net/py-whois/Makefile
+++ b/net/py-whois/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= net python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Python package for retrieving WHOIS information of domains
WWW= https://pypi.org/project/whois/
diff --git a/security/crlfuzz/Makefile b/security/crlfuzz/Makefile
index fa915c54395fa36ce120f0c5a54dc94753f02fec..04684b159ac77eeeb2d03acbdc2e02b233348023 100644
--- a/security/crlfuzz/Makefile
+++ b/security/crlfuzz/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v
PORTREVISION= 16
CATEGORIES= security
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Fast tool to scan CRLF vulnerability written in Go
WWW= https://github.com/dwisiswant0/crlfuzz
diff --git a/security/ffuf/Makefile b/security/ffuf/Makefile
index 0fcbf04b5c9c57339b81478f24b82f88e4d3136a..9019039ab44b86cca4bee28eed1d9fd4a77e7882 100644
--- a/security/ffuf/Makefile
+++ b/security/ffuf/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 2.1.0
PORTREVISION= 1
CATEGORIES= security www
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Fast web fuzzer written in Go
WWW= https://github.com/ffuf/ffuf
diff --git a/security/gokart/Makefile b/security/gokart/Makefile
index ac13b1e2f5979b185c1dd8e3c4ec0863fdef71f7..739d10ced31badc23cd296401143a801cab17037 100644
--- a/security/gokart/Makefile
+++ b/security/gokart/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 0.5.1
PORTREVISION= 10
CATEGORIES= security
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Go Security Static Analysis
WWW= https://github.com/praetorian-inc/gokart
diff --git a/security/gokey/Makefile b/security/gokey/Makefile
index fbccb39c790e737220e3081a1387157759283767..7ce96462a26034d487e204ffe38d15ace4091e48 100644
--- a/security/gokey/Makefile
+++ b/security/gokey/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 0.1.2
PORTREVISION= 9
CATEGORIES= security
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Simple password manager write in Go
WWW= https://github.com/cloudflare/gokey
diff --git a/security/nuclei/Makefile b/security/nuclei/Makefile
index f4bc77b45f9aefc4fd6414297efd6ecc34d3194e..09802b4ea972187a9c564e06e3786c464de3ab16 100644
--- a/security/nuclei/Makefile
+++ b/security/nuclei/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 3.1.3
CATEGORIES= security
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Fast vulnerability scanner
WWW= https://github.com/projectdiscovery/nuclei
diff --git a/security/tfsec/Makefile b/security/tfsec/Makefile
index 8c0af33fc47ef12b96581293f7143ad84c88bb66..feb3d6c1177a9d715b2ba30147e3ce7c1176a0fc 100644
--- a/security/tfsec/Makefile
+++ b/security/tfsec/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 1.28.4
PORTREVISION= 1
CATEGORIES= security
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Security scanner for Terraform
WWW= https://aquasecurity.github.io/tfsec
diff --git a/sysutils/chaoskube/Makefile b/sysutils/chaoskube/Makefile
index 8a7cdbf81a6a18644f3af47ba12b390260f29c30..22aa480f577fadf50c5199252c233ee4d1c5a531 100644
--- a/sysutils/chaoskube/Makefile
+++ b/sysutils/chaoskube/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Chaoskube periodically kills random pods in your Kubernetes cluster
WWW= https://github.com/linki/chaoskube
diff --git a/sysutils/fx/Makefile b/sysutils/fx/Makefile
index cd60d0bb4a8434cdf36ed2777e0ee04574a88a05..43c42dc5a1734306d83e3812058244e9de7478d6 100644
--- a/sysutils/fx/Makefile
+++ b/sysutils/fx/Makefile
@@ -2,7 +2,7 @@ PORTNAME= fx
DISTVERSION= 31.0.0
CATEGORIES= sysutils
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Terminal JSON viewer
WWW= https://github.com/antonmedv/fx
diff --git a/sysutils/terraform-docs/Makefile b/sysutils/terraform-docs/Makefile
index d7802f25f720c56098c01a5dc19704b05535e7c4..99cb04e25b900b602c9ba065daaca420335e6262 100644
--- a/sysutils/terraform-docs/Makefile
+++ b/sysutils/terraform-docs/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 0.16.0
PORTREVISION= 17
CATEGORIES= sysutils textproc
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Generate documentation from Terraform modules
WWW= https://github.com/terraform-docs/terraform-docs
diff --git a/sysutils/terraform-switcher/Makefile b/sysutils/terraform-switcher/Makefile
index 60c604a6590f0006a56a9e162fdb9f2a38306d36..2ffa743afe337d579ff3485dd8af65252f6efc11 100644
--- a/sysutils/terraform-switcher/Makefile
+++ b/sysutils/terraform-switcher/Makefile
@@ -3,7 +3,7 @@ DISTVERSION= 0.13.1308
PORTREVISION= 8
CATEGORIES= sysutils
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Tool to switch between different versions of terraform
WWW= https://tfswitch.warrensbox.com/
diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 2dc40d6776499103f2ea8bc27bbe722e25380d89..b70ffd7bd589d3bd8b9f3da2f265638e3bf16a7f 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 1.6.6
CATEGORIES= sysutils
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Provides a common configuration to launch infrastructure
WWW= https://terraform.io/
diff --git a/sysutils/terragrunt/Makefile b/sysutils/terragrunt/Makefile
index 0ebe2ec55daee45534c24a87f5c3327a6d67ed1f..0eaadb67e65141e05d8ad7a900cceff0905bbfd0 100644
--- a/sysutils/terragrunt/Makefile
+++ b/sysutils/terragrunt/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 0.54.12
CATEGORIES= sysutils
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Terragrunt is a thin wrapper for Terraform
WWW= https://terragrunt.gruntwork.io/
diff --git a/sysutils/tflint/Makefile b/sysutils/tflint/Makefile
index d8e277cde0aff38caaf420f08e316a114f13a93a..c9052686ccab0a0655c7c4c7fd66c6b380e31b89 100644
--- a/sysutils/tflint/Makefile
+++ b/sysutils/tflint/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 0.50.0
CATEGORIES= sysutils
-MAINTAINER= nulldutra@proton.me
+MAINTAINER= dutra@FreeBSD.org
COMMENT= Terraform Linter
WWW= https://github.com/terraform-linters/tflint