diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml
index 4467b30a9..e2fbfc737 100644
--- a/salt/firewall/assigned_hostgroups.map.yaml
+++ b/salt/firewall/assigned_hostgroups.map.yaml
@@ -611,7 +611,6 @@ role:
         hostgroups:
           sensor:
             portgroups:
-              - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           search_node:
             portgroups:
@@ -621,6 +620,7 @@ role:
             portgroups:
               - {{ portgroups.redis }}
               - {{ portgroups.syslog}}
+              - {{ portgroups.beats_5644 }}
           syslog:
             portgroups:
               - {{ portgroups.syslog }}
diff --git a/salt/logstash/pipelines/config/so/0009_input_beats.conf b/salt/logstash/pipelines/config/so/0009_input_beats.conf
index 9ca55b184..8643a64b4 100644
--- a/salt/logstash/pipelines/config/so/0009_input_beats.conf
+++ b/salt/logstash/pipelines/config/so/0009_input_beats.conf
@@ -8,4 +8,4 @@ filter {
   mutate {
     rename => {"@metadata" => "metadata"}
   }
-}
\ No newline at end of file
+}
diff --git a/salt/wazuh/files/agent/ossec.conf b/salt/wazuh/files/agent/ossec.conf
index 6ae873875..136b998b1 100644
--- a/salt/wazuh/files/agent/ossec.conf
+++ b/salt/wazuh/files/agent/ossec.conf
@@ -1,13 +1,6 @@
-{%- if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone'] %}
-  {%- set ip = salt['pillar.get']('global:managerip', '') %}
-{%- elif grains['role'] == 'so-node' or grains['role'] == 'so-heavynode' %}
-  {%- set ip = salt['pillar.get']('elasticsearch:mainip', '') %}
-{%- elif grains['role'] == 'so-sensor' %}
-  {%- set ip = salt['pillar.get']('sensor:mainip', '') %}
-{%- else %}
-  {%- set mainint = salt['pillar.get']('host:mainint') %}
-  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
-{%- endif %}
+{% set mainint = salt['pillar.get']('host:mainint') -%}
+{% set ip = salt['grains.get']('ip_interfaces').get(mainint)[0] -%}
+
 <!--
   Wazuh - Agent Configuration
   More info at: https://documentation.wazuh.com