diff --git a/security/wazuh-agent/src/opnsense/mvc/app/controllers/OPNsense/WazuhAgent/forms/settings.xml b/security/wazuh-agent/src/opnsense/mvc/app/controllers/OPNsense/WazuhAgent/forms/settings.xml
index 8c92582f1..18f9d6196 100644
--- a/security/wazuh-agent/src/opnsense/mvc/app/controllers/OPNsense/WazuhAgent/forms/settings.xml
+++ b/security/wazuh-agent/src/opnsense/mvc/app/controllers/OPNsense/WazuhAgent/forms/settings.xml
@@ -15,6 +15,13 @@
         <type>text</type>
         <help>Specifies the IP address or the hostname of the Wazuh manager.</help>
     </field>
+    <field>
+        <id>agent.general.agent_name</id>
+        <label>Agent hostname</label>
+        <type>text</type>
+        <advanced>true</advanced>
+        <help>Specifies the hostname of this agent.</help>
+    </field>
     <field>
         <id>agent.general.protocol</id>
         <label>Protocol</label>
diff --git a/security/wazuh-agent/src/opnsense/mvc/app/models/OPNsense/WazuhAgent/WazuhAgent.xml b/security/wazuh-agent/src/opnsense/mvc/app/models/OPNsense/WazuhAgent/WazuhAgent.xml
index 79697b050..678fed08c 100644
--- a/security/wazuh-agent/src/opnsense/mvc/app/models/OPNsense/WazuhAgent/WazuhAgent.xml
+++ b/security/wazuh-agent/src/opnsense/mvc/app/models/OPNsense/WazuhAgent/WazuhAgent.xml
@@ -12,6 +12,10 @@
                 <Required>Y</Required>
                 <IpAllowed>Y</IpAllowed>
             </server_address>
+            <agent_name type="HostnameField">
+                <Required>N</Required>
+                <IpAllowed>N</IpAllowed>
+            </agent_name>
             <protocol type="OptionField">
                 <default>tcp</default>
                 <Required>Y</Required>
diff --git a/security/wazuh-agent/src/opnsense/service/templates/OPNsense/WazuhAgent/ossec.conf b/security/wazuh-agent/src/opnsense/service/templates/OPNsense/WazuhAgent/ossec.conf
index 2cddc9323..5abdacd54 100644
--- a/security/wazuh-agent/src/opnsense/service/templates/OPNsense/WazuhAgent/ossec.conf
+++ b/security/wazuh-agent/src/opnsense/service/templates/OPNsense/WazuhAgent/ossec.conf
@@ -7,6 +7,9 @@
     </server>
     <crypto_method>aes</crypto_method>
     <enrollment>
+{%   if not helpers.empty('OPNsense.WazuhAgent.general.agent_name') %}
+      <agent_name>{{ OPNsense.WazuhAgent.general.agent_name }}</agent_name>
+{%   endif %}
       <port>{{OPNsense.WazuhAgent.auth.port}}</port>
     </enrollment>
   </client>