diff --git a/Makefile b/Makefile
index c8c951c6ec..5e739aa1ae 100644
--- a/Makefile
+++ b/Makefile
@@ -109,92 +109,6 @@ CORE_PKGVERSION=	${CORE_VERSION}_${CORE_REVISION}
 CORE_PKGVERSION=	${CORE_VERSION}
 .endif
 
-CORE_PYTHON_DOT=	${CORE_PYTHON:C/./&./1}
-
-CORE_COMMENT?=		${CORE_PRODUCT} ${CORE_TYPE} release
-CORE_MAINTAINER?=	project@opnsense.org
-CORE_ORIGIN?=		opnsense/${CORE_NAME}
-CORE_PACKAGESITE?=	https://pkg.opnsense.org
-CORE_PRODUCT?=		OPNsense
-CORE_WWW?=		https://opnsense.org/
-CORE_USER?=		wwwonly
-CORE_UID?=		789
-CORE_GROUP?=		${CORE_USER}
-CORE_GID?=		${CORE_UID}
-
-CORE_DEPENDS_aarch64?=	py${CORE_PYTHON}-duckdb \
-			py${CORE_PYTHON}-numpy \
-			py${CORE_PYTHON}-pandas \
-			suricata
-
-CORE_DEPENDS_amd64?=	beep \
-			${CORE_DEPENDS_aarch64}
-
-CORE_DEPENDS?=		ca_root_nss \
-			choparp \
-			cpustats \
-			dhcp6c \
-			dhcrelay \
-			dnsmasq \
-			dpinger \
-			filterlog \
-			flock \
-			flowd \
-			hostapd \
-			hostwatch \
-			ifinfo \
-			iftop \
-			kea \
-			lighttpd \
-			monit \
-			mpd5 \
-			ntp \
-			openssh-portable \
-			openvpn \
-			opnsense-installer \
-			opnsense-lang \
-			opnsense-update \
-			pam_opnsense \
-			pftop \
-			php${CORE_PHP}-ctype \
-			php${CORE_PHP}-curl \
-			php${CORE_PHP}-dom \
-			php${CORE_PHP}-filter \
-			php${CORE_PHP}-gettext \
-			php${CORE_PHP}-ldap \
-			php${CORE_PHP}-pcntl \
-			php${CORE_PHP}-pdo \
-			php${CORE_PHP}-pear-Crypt_CHAP \
-			php${CORE_PHP}-pecl-radius \
-			php${CORE_PHP}-phalcon \
-			php${CORE_PHP}-phpseclib \
-			php${CORE_PHP}-session \
-			php${CORE_PHP}-simplexml \
-			php${CORE_PHP}-sockets \
-			php${CORE_PHP}-sqlite3 \
-			php${CORE_PHP}-xml \
-			php${CORE_PHP}-zlib \
-			pkg \
-			py${CORE_PYTHON}-Jinja2 \
-			py${CORE_PYTHON}-dnspython \
-			py${CORE_PYTHON}-jq \
-			py${CORE_PYTHON}-ldap3 \
-			py${CORE_PYTHON}-requests \
-			py${CORE_PYTHON}-sqlite3 \
-			py${CORE_PYTHON}-ujson \
-			py${CORE_PYTHON}-vici \
-			radvd \
-			rrdtool \
-			samplicator \
-			strongswan \
-			sudo \
-			syslog-ng \
-			unbound \
-			wpa_supplicant \
-			zip \
-			${CORE_ADDITIONS} \
-			${CORE_DEPENDS_${CORE_ARCH}}
-
 .for CONFLICT in ${CORE_CONFLICTS}
 CORE_CONFLICTS+=	${CONFLICT}-devel
 .endfor
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 4fa6a93fba..ccb287a39d 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -64,6 +64,8 @@ _CORE_PYTHON!=	${PYTHONLINK} -V
 CORE_PYTHON?=	${_CORE_PYTHON:[2]:S/./ /g:[1..2]:tW:S/ //}
 .endif
 
+CORE_PYTHON_DOT=${CORE_PYTHON:C/./&./1}
+
 .if exists(${PKG})
 _CORE_SYSLOGNG!=${PKG} query %v syslog-ng
 CORE_SYSLOGNG?=	${_CORE_SYSLOGNG:S/./ /g:[1..2]:tW:S/ /./g}
diff --git a/Mk/version.mk b/Mk/version.mk
index ca07ca61d6..dae7d439fc 100644
--- a/Mk/version.mk
+++ b/Mk/version.mk
@@ -33,6 +33,90 @@ CORE_TYPE?=	development
 # plugins that were migrated to core are here
 CORE_CONFLICTS?=firewall wireguard wireguard-go
 
+CORE_COMMENT?=		${CORE_PRODUCT} ${CORE_TYPE} release
+CORE_MAINTAINER?=	project@opnsense.org
+CORE_ORIGIN?=		opnsense/${CORE_NAME}
+CORE_PACKAGESITE?=	https://pkg.opnsense.org
+CORE_PRODUCT?=		OPNsense
+CORE_WWW?=		https://opnsense.org/
+CORE_USER?=		wwwonly
+CORE_UID?=		789
+CORE_GROUP?=		${CORE_USER}
+CORE_GID?=		${CORE_UID}
+
+CORE_DEPENDS_aarch64?=	py${CORE_PYTHON}-duckdb \
+			py${CORE_PYTHON}-numpy \
+			py${CORE_PYTHON}-pandas \
+			suricata
+
+CORE_DEPENDS_amd64?=	beep \
+			${CORE_DEPENDS_aarch64}
+
+CORE_DEPENDS?=		ca_root_nss \
+			choparp \
+			cpustats \
+			dhcp6c \
+			dhcrelay \
+			dnsmasq \
+			dpinger \
+			filterlog \
+			flock \
+			flowd \
+			hostapd \
+			hostwatch \
+			ifinfo \
+			iftop \
+			kea \
+			lighttpd \
+			monit \
+			mpd5 \
+			ntp \
+			openssh-portable \
+			openvpn \
+			opnsense-installer \
+			opnsense-lang \
+			opnsense-update \
+			pam_opnsense \
+			pftop \
+			php${CORE_PHP}-ctype \
+			php${CORE_PHP}-curl \
+			php${CORE_PHP}-dom \
+			php${CORE_PHP}-filter \
+			php${CORE_PHP}-gettext \
+			php${CORE_PHP}-ldap \
+			php${CORE_PHP}-pcntl \
+			php${CORE_PHP}-pdo \
+			php${CORE_PHP}-pear-Crypt_CHAP \
+			php${CORE_PHP}-pecl-radius \
+			php${CORE_PHP}-phalcon \
+			php${CORE_PHP}-phpseclib \
+			php${CORE_PHP}-session \
+			php${CORE_PHP}-simplexml \
+			php${CORE_PHP}-sockets \
+			php${CORE_PHP}-sqlite3 \
+			php${CORE_PHP}-xml \
+			php${CORE_PHP}-zlib \
+			pkg \
+			py${CORE_PYTHON}-Jinja2 \
+			py${CORE_PYTHON}-dnspython \
+			py${CORE_PYTHON}-jq \
+			py${CORE_PYTHON}-ldap3 \
+			py${CORE_PYTHON}-requests \
+			py${CORE_PYTHON}-sqlite3 \
+			py${CORE_PYTHON}-ujson \
+			py${CORE_PYTHON}-vici \
+			radvd \
+			rrdtool \
+			samplicator \
+			strongswan \
+			sudo \
+			syslog-ng \
+			unbound \
+			wpa_supplicant \
+			zip \
+			${CORE_ADDITIONS} \
+			${CORE_DEPENDS_${CORE_ARCH}}
+
 CORE_COPYRIGHT_HOLDER?=	Deciso B.V.
 CORE_COPYRIGHT_WWW?=	https://www.deciso.com/
 CORE_COPYRIGHT_YEARS?=	2014-2026