diff --git a/net/chrony/src/opnsense/mvc/app/library/OPNsense/System/Status/ChronyOverrideStatus.php b/net/chrony/src/opnsense/mvc/app/library/OPNsense/System/Status/ChronyOverrideStatus.php
new file mode 100644
index 0000000000..50277f4af1
--- /dev/null
+++ b/net/chrony/src/opnsense/mvc/app/library/OPNsense/System/Status/ChronyOverrideStatus.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * Copyright (C) 2025 Cedrik Pischem
+ * Copyright (C) 2025 Deciso B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\System\Status;
+
+use OPNsense\System\AbstractStatus;
+use OPNsense\System\SystemStatusCode;
+
+class ChronyOverrideStatus extends AbstractStatus
+{
+    public function __construct()
+    {
+        $this->internalPriority = 2;
+        $this->internalPersistent = true;
+        $this->internalIsBanner = true;
+        $this->internalTitle = gettext('Chrony config override');
+        $this->internalScope = [
+            '/ui/chrony/general/index',
+        ];
+    }
+
+    public function collectStatus()
+    {
+        if (
+            count(glob('/usr/local/etc/chrony/conf.d/*')) ||
+            count(glob('/var/run/chrony/conf.d/*')) ||
+            count(glob('/usr/local/etc/chrony/sources.d/*')) ||
+            count(glob('/var/run/chrony/sources.d/*'))
+
+        ) {
+            $this->internalMessage = gettext(
+                'The configuration contains manual overwrites, these may interfere with the settings configured here.'
+            );
+            $this->internalStatus = SystemStatusCode::NOTICE;
+        }
+    }
+}
diff --git a/net/chrony/src/opnsense/mvc/app/models/OPNsense/Chrony/General.xml b/net/chrony/src/opnsense/mvc/app/models/OPNsense/Chrony/General.xml
index 08d29de0cf..88c008f53b 100644
--- a/net/chrony/src/opnsense/mvc/app/models/OPNsense/Chrony/General.xml
+++ b/net/chrony/src/opnsense/mvc/app/models/OPNsense/Chrony/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/chrony/general</mount>
     <description>Chrony configuration</description>
-    <version>0.0.2</version>
+    <version>0.0.4</version>
     <items>
         <enabled type="BooleanField">
             <Default>0</Default>
@@ -9,7 +9,7 @@
         </enabled>
         <port type="PortField">
             <Default>323</Default>
-            <Required>Y</Required>
+            <Required>N</Required>
         </port>
         <ntsclient type="BooleanField">
             <Default>0</Default>
@@ -20,8 +20,8 @@
             <Required>Y</Required>
         </ntsnocert>
         <peers type="HostnameField">
-            <Default>0.opnsense.pool.ntp.org</Default>
-            <Required>Y</Required>
+            <Default>0.opnsense.pool.ntp.org,1.opnsense.pool.ntp.org,2.opnsense.pool.ntp.org,3.opnsense.pool.ntp.org</Default>
+            <Required>N</Required>
             <FieldSeparator>,</FieldSeparator>
             <AsList>Y</AsList>
         </peers>
diff --git a/net/chrony/src/opnsense/scripts/OPNsense/Chrony/setup.sh b/net/chrony/src/opnsense/scripts/OPNsense/Chrony/setup.sh
index ad9060012e..27df50d91c 100755
--- a/net/chrony/src/opnsense/scripts/OPNsense/Chrony/setup.sh
+++ b/net/chrony/src/opnsense/scripts/OPNsense/Chrony/setup.sh
@@ -1,5 +1,13 @@
 #!/bin/sh
 
-mkdir -p /var/db/chrony /var/lib/chrony /var/run/chrony
-chown -R chronyd:chronyd /var/db/chrony /var/lib/chrony /var/run/chrony
-chmod 750 /var/db/chrony /var/lib/chrony /var/run/chrony
+mkdir -p /var/db/chrony /var/lib/chrony /var/run/chrony \
+  /usr/local/etc/chrony/conf.d /var/run/chrony/conf.d \
+  /usr/local/etc/chrony/sources.d /var/run/chrony/sources.d
+
+chown -R chronyd:chronyd /var/db/chrony /var/lib/chrony /var/run/chrony \
+  /usr/local/etc/chrony/conf.d /var/run/chrony/conf.d \
+  /usr/local/etc/chrony/sources.d /var/run/chrony/sources.d
+
+chmod 750 /var/db/chrony /var/lib/chrony /var/run/chrony \
+  /usr/local/etc/chrony/conf.d /var/run/chrony/conf.d \
+  /usr/local/etc/chrony/sources.d /var/run/chrony/sources.d
diff --git a/net/chrony/src/opnsense/service/templates/OPNsense/Chrony/chrony.conf b/net/chrony/src/opnsense/service/templates/OPNsense/Chrony/chrony.conf
index 7cd4f7a16f..a85c4b2b4f 100644
--- a/net/chrony/src/opnsense/service/templates/OPNsense/Chrony/chrony.conf
+++ b/net/chrony/src/opnsense/service/templates/OPNsense/Chrony/chrony.conf
@@ -1,6 +1,8 @@
 {% if helpers.exists('OPNsense.chrony.general.enabled') and OPNsense.chrony.general.enabled == '1' %}
 
+{%   if not helpers.empty('OPNsense.chrony.general.port') %}
 port {{ OPNsense.chrony.general.port }}
+{%   endif %}
 driftfile /var/db/chrony/drift
 pidfile /var/run/chrony/chronyd.pid
 makestep 1 3
@@ -34,3 +36,11 @@ allow {{ network }}
 {%   endif %}
 
 {% endif %}
+
+
+confdir /usr/local/etc/chrony/conf.d
+confdir /var/run/chrony/conf.d
+
+sourcedir /usr/local/etc/chrony/sources.d
+sourcedir /var/run/chrony/sources.d
+