diff --git a/Keywords/sample.ucl b/Keywords/sample.ucl
index 2d4002344..ea5bf5db1 100644
--- a/Keywords/sample.ucl
+++ b/Keywords/sample.ucl
@@ -1,5 +1,3 @@
-# $FreeBSD$
-#
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # @sample etc/somefile.conf.sample
diff --git a/Keywords/shadow.ucl b/Keywords/shadow.ucl
index 0c2690212..039b8d3b6 100644
--- a/Keywords/shadow.ucl
+++ b/Keywords/shadow.ucl
@@ -1,5 +1,3 @@
-# $FreeBSD$
-#
 # MAINTAINER: franco@opnsense.org
 #
 # @shadow etc/somefile.conf.sample
diff --git a/src/etc/rc.d/configd b/src/etc/rc.d/configd
index 81a433605..ea37fb606 100755
--- a/src/etc/rc.d/configd
+++ b/src/etc/rc.d/configd
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
-#
 # PROVIDE: configd
 # REQUIRE: SERVERS
 # KEYWORD: shutdown
diff --git a/src/etc/rc.d/flowd_aggregate b/src/etc/rc.d/flowd_aggregate
index 883c8e949..acf644ff8 100755
--- a/src/etc/rc.d/flowd_aggregate
+++ b/src/etc/rc.d/flowd_aggregate
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
-#
 # PROVIDE: flowd_aggregate
 # REQUIRE: SERVERS
 # KEYWORD: shutdown
diff --git a/src/etc/rc.subr.d/recover b/src/etc/rc.subr.d/recover
index 04ef530c3..5b5e2dfaf 100755
--- a/src/etc/rc.subr.d/recover
+++ b/src/etc/rc.subr.d/recover
@@ -29,8 +29,6 @@
  */
 
 $etc_group = <<<EOF
-# \$FreeBSD$
-#
 wheel:*:0:root
 daemon:*:1:
 kmem:*:2:
@@ -72,8 +70,6 @@ nobody:*:65534:
 EOF;
 
 $etc_master_passwd = <<<EOF
-# \$FreeBSD$
-#
 root::0:0::0:0:Charlie &:/root:/bin/csh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
 installer:*:0:0::0:0:Installer Superuser:/root:/usr/sbin/nologin
@@ -106,8 +102,6 @@ nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
 EOF;
 
 $etc_shells = <<<EOF
-# \$FreeBSD$
-#
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
 # one of these shells.
@@ -134,7 +128,6 @@ foreach ($known_shells as $shell) {
 
 $etc_ttys = <<<EOF
 #
-# \$FreeBSD$
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/src/etc/ssl/opnsense.cnf b/src/etc/ssl/opnsense.cnf
index 7c6d9c985..8e714a9c4 100644
--- a/src/etc/ssl/opnsense.cnf
+++ b/src/etc/ssl/opnsense.cnf
@@ -1,4 +1,3 @@
-# $FreeBSD$
 #
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.
diff --git a/src/opnsense/service/templates/OPNsense/Auth/csh.cshrc b/src/opnsense/service/templates/OPNsense/Auth/csh.cshrc
index 1c00306b0..4ec883ef5 100644
--- a/src/opnsense/service/templates/OPNsense/Auth/csh.cshrc
+++ b/src/opnsense/service/templates/OPNsense/Auth/csh.cshrc
@@ -1,5 +1,3 @@
-# $FreeBSD$
-#
 # System-wide .cshrc file for csh(1).
 {% if not helpers.empty('system.autologout')%}
 set -r autologout={{system.autologout}}
diff --git a/src/opnsense/service/templates/OPNsense/Auth/sshd.pam b/src/opnsense/service/templates/OPNsense/Auth/sshd.pam
index 8081f37dd..ab339d9d4 100644
--- a/src/opnsense/service/templates/OPNsense/Auth/sshd.pam
+++ b/src/opnsense/service/templates/OPNsense/Auth/sshd.pam
@@ -1,6 +1,4 @@
 #
-# $FreeBSD$
-#
 # PAM configuration for the "sshd" service
 #
 
diff --git a/src/opnsense/service/templates/OPNsense/Auth/system.pam b/src/opnsense/service/templates/OPNsense/Auth/system.pam
index 5936047d9..e23710169 100644
--- a/src/opnsense/service/templates/OPNsense/Auth/system.pam
+++ b/src/opnsense/service/templates/OPNsense/Auth/system.pam
@@ -1,6 +1,4 @@
 #
-# $FreeBSD$
-#
 # System-wide defaults
 #
 
diff --git a/src/opnsense/service/templates/OPNsense/Syslog/newsyslog.conf b/src/opnsense/service/templates/OPNsense/Syslog/newsyslog.conf
index b75ea7e72..7a6e8c5f5 100644
--- a/src/opnsense/service/templates/OPNsense/Syslog/newsyslog.conf
+++ b/src/opnsense/service/templates/OPNsense/Syslog/newsyslog.conf
@@ -1,5 +1,4 @@
 # autogenerated configuration file for newsyslog, do not edit
-# $FreeBSD$
 #
 # Entries which do not specify the '/pid_file' field will cause the
 # syslogd process to be signalled when that log file is rotated.  This
diff --git a/src/root/boot/lua/brand-opnsense.lua b/src/root/boot/lua/brand-opnsense.lua
index 65cedd762..f288b94b4 100644
--- a/src/root/boot/lua/brand-opnsense.lua
+++ b/src/root/boot/lua/brand-opnsense.lua
@@ -24,8 +24,6 @@
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --
--- $FreeBSD$
---
 
 local drawer = require("drawer")
 
diff --git a/src/root/boot/lua/logo-hourglass.lua.in b/src/root/boot/lua/logo-hourglass.lua.in
index 1c165fb82..92144765a 100644
--- a/src/root/boot/lua/logo-hourglass.lua.in
+++ b/src/root/boot/lua/logo-hourglass.lua.in
@@ -24,8 +24,6 @@
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --
--- $FreeBSD$
---
 
 local drawer = require("drawer")