diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml b/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
index fb531b6c1..b80a40935 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
@@ -11,6 +11,10 @@
         <type>textbox</type>
         <help>List of pools, one per line in range or subnet format (e.g. 192.168.0.100 - 192.168.0.200 , 192.0.2.64/26</help>
     </field>
+    <field>
+        <type>header</type>
+        <label>DHCP option data</label>
+    </field>
     <field>
         <id>subnet4.option_data_autocollect</id>
         <label>Auto collect option data</label>
@@ -25,6 +29,12 @@
         <allownew>true</allownew>
         <help>Default gateways to offer to the clients</help>
     </field>
+    <field>
+        <id>subnet4.option_data.static_routes</id>
+        <label>Static routes</label>
+        <type>text</type>
+        <help>Static routes that the client should install in its routing cache, defined as dest-ip1,router-ip1;dest-ip2,router-ip2</help>
+    </field>
     <field>
         <id>subnet4.option_data.domain_name_servers</id>
         <label>DNS servers</label>
@@ -39,13 +49,30 @@
         <type>text</type>
         <help>The domain name to offer to the client, set to this firewall's domain name when left empty</help>
     </field>
+    <field>
+        <id>subnet4.option_data.domain_search</id>
+        <label>Domain search</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <separator>;</separator>
+        <help>Specifies a ´search list´ of Domain Names to be used by the client to locate not-fully-qualified domain names.</help>
+    </field>
     <field>
         <id>subnet4.option_data.ntp_servers</id>
         <label>NTP servers</label>
         <type>select_multiple</type>
         <style>tokenize option_data_autocollect</style>
         <allownew>true</allownew>
-        <help>NTP servers to offer to the clients</help>
+        <help>Specifies a list of IP addresses indicating NTP (RFC 5905) servers available to the client.</help>
+    </field>
+    <field>
+        <id>subnet4.option_data.time_servers</id>
+        <label>Time servers</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help>Specifies a list of RFC 868 time servers available to the client.</help>
     </field>
     <field>
         <id>subnet4.option_data.tftp_server_name</id>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
index 4deabd13c..5f2b62d81 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
@@ -47,12 +47,21 @@
                         <AsList>Y</AsList>
                         <FieldSeparator>,</FieldSeparator>
                     </domain_name_servers>
+                    <domain_search type="HostnameField">
+                        <IpAllowed>N</IpAllowed>
+                        <FieldSeparator>;</FieldSeparator>
+                        <AsList>Y</AsList>
+                        <ValidationMessage>Please specify a valid list of domains</ValidationMessage>
+                    </domain_search>
                     <routers type="NetworkField">
                         <NetMaskAllowed>N</NetMaskAllowed>
                         <AddressFamily>ipv4</AddressFamily>
                         <AsList>Y</AsList>
                         <FieldSeparator>,</FieldSeparator>
                     </routers>
+                    <static_routes type="TextField">
+                        <!-- Needs a custom validator to validate ip pairs-->
+                    </static_routes>
                     <domain_name type="HostnameField">
                         <IpAllowed>N</IpAllowed>
                     </domain_name>
@@ -62,6 +71,12 @@
                         <AsList>Y</AsList>
                         <FieldSeparator>,</FieldSeparator>
                     </ntp_servers>
+                    <time_servers type="NetworkField">
+                        <NetMaskAllowed>N</NetMaskAllowed>
+                        <AddressFamily>ipv4</AddressFamily>
+                        <AsList>Y</AsList>
+                        <FieldSeparator>,</FieldSeparator>
+                    </time_servers>
                     <tftp_server_name type="TextField">
                         <Mask>/^([^\n"])*$/u</Mask>
                     </tftp_server_name>