diff --git a/Makefile b/Makefile
index 8c6cefbd2a..c4f15f7045 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2025 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2026 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -116,7 +116,7 @@ CORE_MAINTAINER?=	project@opnsense.org
 CORE_ORIGIN?=		opnsense/${CORE_NAME}
 CORE_PACKAGESITE?=	https://pkg.opnsense.org
 CORE_PRODUCT?=		OPNsense
-CORE_REPOSITORY?=	${CORE_ABI}/latest
+CORE_REPOSITORY?=	latest
 CORE_WWW?=		https://opnsense.org/
 CORE_USER?=		wwwonly
 CORE_UID?=		789
diff --git a/plist b/plist
index 9f40c8db0d..46e9dd3c26 100644
--- a/plist
+++ b/plist
@@ -2553,4 +2553,5 @@
 @sample /usr/local/etc/bogonsv6.sample
 @sample /usr/local/etc/config.xml.sample
 @shadow /usr/local/etc/pkg/repos/FreeBSD.conf.sample
+@shadow /usr/local/etc/pkg/repos/OPNsense-aux.conf.sample
 @shadow /usr/local/etc/pkg/repos/OPNsense.conf.sample
diff --git a/src/etc/pkg/repos/OPNsense-aux.conf.shadow.in b/src/etc/pkg/repos/OPNsense-aux.conf.shadow.in
new file mode 100644
index 0000000000..9cbdbb4d91
--- /dev/null
+++ b/src/etc/pkg/repos/OPNsense-aux.conf.shadow.in
@@ -0,0 +1,7 @@
+OPNsense-aux: {
+  fingerprints: "/usr/local/etc/pkg/fingerprints/OPNsense",
+  url: "%%CORE_PACKAGESITE%%/${ABI}/%%CORE_ABI%%/aux",
+  signature_type: "fingerprints",
+  priority: 11,
+  enabled: yes
+}
diff --git a/src/etc/pkg/repos/OPNsense.conf.shadow.in b/src/etc/pkg/repos/OPNsense.conf.shadow.in
index b399ce1f76..5b411ca6b3 100644
--- a/src/etc/pkg/repos/OPNsense.conf.shadow.in
+++ b/src/etc/pkg/repos/OPNsense.conf.shadow.in
@@ -1,6 +1,6 @@
 OPNsense: {
   fingerprints: "/usr/local/etc/pkg/fingerprints/OPNsense",
-  url: "%%CORE_PACKAGESITE%%/${ABI}/%%CORE_REPOSITORY%%",
+  url: "%%CORE_PACKAGESITE%%/${ABI}/%%CORE_ABI%%/%%CORE_REPOSITORY%%",
   signature_type: "fingerprints",
   priority: 11,
   enabled: yes
diff --git a/src/opnsense/scripts/firmware/repos/OPNsense.php b/src/opnsense/scripts/firmware/repos/OPNsense.php
index 2bfe238657..e819666cb6 100755
--- a/src/opnsense/scripts/firmware/repos/OPNsense.php
+++ b/src/opnsense/scripts/firmware/repos/OPNsense.php
@@ -62,3 +62,7 @@ if (!empty($config->system->firmware->flavour)) {
 
 /* rewrite the config via the defaults and possible arguments */
 shell_safe($frmt, $args);
+
+/* overwrite the aux configuration for consistency */
+$conf = '/usr/local/etc/pkg/repos/OPNsense-aux.conf';
+@copy($conf . '.sample', $conf);