diff --git a/salt/dom0/files/bin/qubes-update b/salt/dom0/files/bin/qubes-update
index 13d2938..66b5aa5 100755
--- a/salt/dom0/files/bin/qubes-update
+++ b/salt/dom0/files/bin/qubes-update
@@ -4,7 +4,7 @@
 # SPDX-FileCopyrightText: 2016 Bahtiar Gadimov <https:/bahtiar.gadimov.de>
 # SPDX-FileCopyrightText: 2016 - 2019 Marek Marczykowsk-Gorecki
 #                                            <marmarek@invisiblethingslab.com>
-# SPDX-FileCopyrightText: 2017 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2017 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2020 Frederic Pierret <https://github.com/fepitre>
 # SPDX-FileCopyrightText: 2021 ctrlaltf24
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com
diff --git a/salt/reader/create.sls b/salt/reader/create.sls
index ea9ed1f..d68c130 100644
--- a/salt/reader/create.sls
+++ b/salt/reader/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/reader/install.sls b/salt/reader/install.sls
index 7902abc..07a57cf 100644
--- a/salt/reader/install.sls
+++ b/salt/reader/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-cacher/files/server/bind-dirs/50_cacher.conf b/salt/sys-cacher/files/server/bind-dirs/50_cacher.conf
index 320d64c..c95e000 100755
--- a/salt/sys-cacher/files/server/bind-dirs/50_cacher.conf
+++ b/salt/sys-cacher/files/server/bind-dirs/50_cacher.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# SPDX-FileCopyrightText: 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2023 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-cacher/files/server/conf/acng.conf b/salt/sys-cacher/files/server/conf/acng.conf
index f3d38d2..6078a0f 100644
--- a/salt/sys-cacher/files/server/conf/acng.conf
+++ b/salt/sys-cacher/files/server/conf/acng.conf
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-cacher/files/server/mirrors/archlx_mirrors b/salt/sys-cacher/files/server/mirrors/archlx_mirrors
index f14b993..2179865 100644
--- a/salt/sys-cacher/files/server/mirrors/archlx_mirrors
+++ b/salt/sys-cacher/files/server/mirrors/archlx_mirrors
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-cacher/files/server/mirrors/fedora_mirrors b/salt/sys-cacher/files/server/mirrors/fedora_mirrors
index 6d4a714..897904d 100644
--- a/salt/sys-cacher/files/server/mirrors/fedora_mirrors
+++ b/salt/sys-cacher/files/server/mirrors/fedora_mirrors
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-mirage-firewall/create.sls b/salt/sys-mirage-firewall/create.sls
index 52e1625..e9601a2 100644
--- a/salt/sys-mirage-firewall/create.sls
+++ b/salt/sys-mirage-firewall/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/configure-browser.sls b/salt/sys-pihole/configure-browser.sls
index c1c0a00..8def661 100644
--- a/salt/sys-pihole/configure-browser.sls
+++ b/salt/sys-pihole/configure-browser.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/create.sls b/salt/sys-pihole/create.sls
index 5b59d23..acde949 100644
--- a/salt/sys-pihole/create.sls
+++ b/salt/sys-pihole/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/files/admin/prefs.sh b/salt/sys-pihole/files/admin/prefs.sh
index 7c846bc..3cca1fb 100755
--- a/salt/sys-pihole/files/admin/prefs.sh
+++ b/salt/sys-pihole/files/admin/prefs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/files/server/firewall/flush b/salt/sys-pihole/files/server/firewall/flush
index ff3b00b..9e666fd 100644
--- a/salt/sys-pihole/files/server/firewall/flush
+++ b/salt/sys-pihole/files/server/firewall/flush
@@ -1,6 +1,6 @@
 #!/usr/sbin/nft -f
 
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-pihole/files/server/firewall/flush.sh b/salt/sys-pihole/files/server/firewall/flush.sh
index 2e44451..60fccf4 100644
--- a/salt/sys-pihole/files/server/firewall/flush.sh
+++ b/salt/sys-pihole/files/server/firewall/flush.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/files/server/firewall/internalise.sh b/salt/sys-pihole/files/server/firewall/internalise.sh
index 0f4e658..27fdf57 100644
--- a/salt/sys-pihole/files/server/firewall/internalise.sh
+++ b/salt/sys-pihole/files/server/firewall/internalise.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/files/server/firewall/update_nft.sh b/salt/sys-pihole/files/server/firewall/update_nft.sh
index d7cf100..3309ef5 100644
--- a/salt/sys-pihole/files/server/firewall/update_nft.sh
+++ b/salt/sys-pihole/files/server/firewall/update_nft.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-pihole/files/server/network/eth0 b/salt/sys-pihole/files/server/network/eth0
index bd6e8d3..0dae8f1 100644
--- a/salt/sys-pihole/files/server/network/eth0
+++ b/salt/sys-pihole/files/server/network/eth0
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-pihole/files/server/network/setupVars.conf b/salt/sys-pihole/files/server/network/setupVars.conf
index f5a3383..775217e 100644
--- a/salt/sys-pihole/files/server/network/setupVars.conf
+++ b/salt/sys-pihole/files/server/network/setupVars.conf
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-pihole/install.sls b/salt/sys-pihole/install.sls
index f0787a8..6c00502 100644
--- a/salt/sys-pihole/install.sls
+++ b/salt/sys-pihole/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-rsync/configure.sls b/salt/sys-rsync/configure.sls
index dcf440c..5f4c5ed 100644
--- a/salt/sys-rsync/configure.sls
+++ b/salt/sys-rsync/configure.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-rsync/create.sls b/salt/sys-rsync/create.sls
index 5685340..7dcb785 100644
--- a/salt/sys-rsync/create.sls
+++ b/salt/sys-rsync/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-rsync/files/server/rpc/qusal.Rsync b/salt/sys-rsync/files/server/rpc/qusal.Rsync
index 8da8043..7b413b2 100755
--- a/salt/sys-rsync/files/server/rpc/qusal.Rsync
+++ b/salt/sys-rsync/files/server/rpc/qusal.Rsync
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-rsync/files/server/rsync/rsyncd.conf b/salt/sys-rsync/files/server/rsync/rsyncd.conf
index 51b2234..28f8948 100644
--- a/salt/sys-rsync/files/server/rsync/rsyncd.conf
+++ b/salt/sys-rsync/files/server/rsync/rsyncd.conf
@@ -1,7 +1,7 @@
 # rsyncd.conf configuration file
 # vim: ft=toml
 
-# SPDX-FileCopyrightText: 2020 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2020 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-rsync/install-client.sls b/salt/sys-rsync/install-client.sls
index e4997ee..0a464e3 100644
--- a/salt/sys-rsync/install-client.sls
+++ b/salt/sys-rsync/install-client.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-rsync/install.sls b/salt/sys-rsync/install.sls
index 2aa5101..a3ef029 100644
--- a/salt/sys-rsync/install.sls
+++ b/salt/sys-rsync/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-ssh/configure.sls b/salt/sys-ssh/configure.sls
index 1785c7c..9cd32fb 100644
--- a/salt/sys-ssh/configure.sls
+++ b/salt/sys-ssh/configure.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-ssh/create.sls b/salt/sys-ssh/create.sls
index 5685340..7dcb785 100644
--- a/salt/sys-ssh/create.sls
+++ b/salt/sys-ssh/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-ssh/files/server/rpc/qusal.Ssh b/salt/sys-ssh/files/server/rpc/qusal.Ssh
index 83fb534..78bb259 100755
--- a/salt/sys-ssh/files/server/rpc/qusal.Ssh
+++ b/salt/sys-ssh/files/server/rpc/qusal.Ssh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-ssh/install-client.sls b/salt/sys-ssh/install-client.sls
index c573491..72d73cf 100644
--- a/salt/sys-ssh/install-client.sls
+++ b/salt/sys-ssh/install-client.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-ssh/install.sls b/salt/sys-ssh/install.sls
index 4934534..9b66d49 100644
--- a/salt/sys-ssh/install.sls
+++ b/salt/sys-ssh/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-syncthing/cancel.sls b/salt/sys-syncthing/cancel.sls
index 9605e38..a1c946e 100644
--- a/salt/sys-syncthing/cancel.sls
+++ b/salt/sys-syncthing/cancel.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
diff --git a/salt/sys-syncthing/clean.sls b/salt/sys-syncthing/clean.sls
index ac5b631..74b2f51 100644
--- a/salt/sys-syncthing/clean.sls
+++ b/salt/sys-syncthing/clean.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-syncthing/configure.sls b/salt/sys-syncthing/configure.sls
index 84f3092..e2104fe 100644
--- a/salt/sys-syncthing/configure.sls
+++ b/salt/sys-syncthing/configure.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-syncthing/create.sls b/salt/sys-syncthing/create.sls
index 417ac43..4efa1fd 100644
--- a/salt/sys-syncthing/create.sls
+++ b/salt/sys-syncthing/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-syncthing/files/admin/firewall/in.sh b/salt/sys-syncthing/files/admin/firewall/in.sh
index ae885a5..c01e62b 100644
--- a/salt/sys-syncthing/files/admin/firewall/in.sh
+++ b/salt/sys-syncthing/files/admin/firewall/in.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-syncthing/files/client/systemd/qubes-syncthing-forwarder.service b/salt/sys-syncthing/files/client/systemd/qubes-syncthing-forwarder.service
index a62db4d..0de39ef 100644
--- a/salt/sys-syncthing/files/client/systemd/qubes-syncthing-forwarder.service
+++ b/salt/sys-syncthing/files/client/systemd/qubes-syncthing-forwarder.service
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-syncthing/files/server/rpc/qusal.Syncthing b/salt/sys-syncthing/files/server/rpc/qusal.Syncthing
index 46fda96..5b459c3 100644
--- a/salt/sys-syncthing/files/server/rpc/qusal.Syncthing
+++ b/salt/sys-syncthing/files/server/rpc/qusal.Syncthing
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/salt/sys-syncthing/install.sls b/salt/sys-syncthing/install.sls
index 5d69643..4c6657b 100644
--- a/salt/sys-syncthing/install.sls
+++ b/salt/sys-syncthing/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-usb/create.sls b/salt/sys-usb/create.sls
index 1d4263a..9d4267a 100644
--- a/salt/sys-usb/create.sls
+++ b/salt/sys-usb/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-wireguard/configure.sls b/salt/sys-wireguard/configure.sls
index 93cc610..5ae8b08 100644
--- a/salt/sys-wireguard/configure.sls
+++ b/salt/sys-wireguard/configure.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-wireguard/files/admin/qubes-setup-sys-wireguard.desktop b/salt/sys-wireguard/files/admin/qubes-setup-sys-wireguard.desktop
index 98bd5ed..1bb565d 100644
--- a/salt/sys-wireguard/files/admin/qubes-setup-sys-wireguard.desktop
+++ b/salt/sys-wireguard/files/admin/qubes-setup-sys-wireguard.desktop
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-wireguard/files/admin/setup-sys-wireguard b/salt/sys-wireguard/files/admin/setup-sys-wireguard
index e55cc7d..e32c435 100755
--- a/salt/sys-wireguard/files/admin/setup-sys-wireguard
+++ b/salt/sys-wireguard/files/admin/setup-sys-wireguard
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-wireguard/files/server/set-wg-conf.sh b/salt/sys-wireguard/files/server/set-wg-conf.sh
index 2c2cf33..7b6f47e 100755
--- a/salt/sys-wireguard/files/server/set-wg-conf.sh
+++ b/salt/sys-wireguard/files/server/set-wg-conf.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-wireguard/files/server/vpn/dns-hijack.nft b/salt/sys-wireguard/files/server/vpn/dns-hijack.nft
index b535d19..d918206 100755
--- a/salt/sys-wireguard/files/server/vpn/dns-hijack.nft
+++ b/salt/sys-wireguard/files/server/vpn/dns-hijack.nft
@@ -1,7 +1,7 @@
 #!/usr/bin/nft -f
 # vim: ft=nftables
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/salt/sys-wireguard/files/server/vpn/tunnel.nft b/salt/sys-wireguard/files/server/vpn/tunnel.nft
index c862a32..d07f866 100755
--- a/salt/sys-wireguard/files/server/vpn/tunnel.nft
+++ b/salt/sys-wireguard/files/server/vpn/tunnel.nft
@@ -1,7 +1,7 @@
 #!/usr/bin/nft -f
 # vim: ft=nftables
 
-# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+# SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 # SPDX-FileCopyrightText: 2023 1cho1ce <https://github.com/1cho1ce>
 # SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 #
diff --git a/salt/sys-wireguard/install.sls b/salt/sys-wireguard/install.sls
index aa8989e..5d771e0 100644
--- a/salt/sys-wireguard/install.sls
+++ b/salt/sys-wireguard/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.com>
+SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
 SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later