diff --git a/CHANGELOG.md b/CHANGELOG.md
index b79af861..412a513b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Fix mismatched tags in .j2 template files ([#1930](https://github.com/wazuh/wazuh-ansible/pull/1930))
 - Address Misconfiguration of indexer_cluster_nodes Parameter ([#1929](https://github.com/wazuh/wazuh-ansible/pull/1929))
 - Remove meta yamls that prevent indexer and agent role installation from PR #1806 ([#1921](https://github.com/wazuh/wazuh-ansible/pull/1921))
 - Ensure boolean condition evaluations - from community PR #1897 ([#1916](https://github.com/wazuh/wazuh-ansible/pull/1916))
diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
index 450922eb..f2cff4ca 100644
--- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
+++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
@@ -410,7 +410,7 @@
      <location>{{ localfile.location }}</location>
      {% if localfile.format == 'eventchannel' %}
      {% if localfile.only_future_events is defined %}
-     <only-future-events>{{ localfile.only_future_events }}</only_future_events>
+     <only-future-events>{{ localfile.only_future_events }}</only-future-events>
      {% endif %}
      {% if localfile.query is defined %}
      <query>{{ localfile.query }}</query>
@@ -448,7 +448,7 @@
      <location>{{ localfile.location }}</location>
      {% if localfile.format == 'eventchannel' %}
      {% if localfile.only_future_events is defined %}
-     <only-future-events>{{ localfile.only_future_events }}</only_future_events>
+     <only-future-events>{{ localfile.only_future_events }}</only-future-events>
      {% endif %}
      {% if localfile.query is defined %}
      <query>{{ localfile.query }}</query>
@@ -487,7 +487,7 @@
      <location>{{ localfile.location }}</location>
      {% if localfile.format == 'eventchannel' %}
      {% if localfile.only_future_events is defined %}
-     <only-future-events>{{ localfile.only_future_events }}</only_future_events>
+     <only-future-events>{{ localfile.only_future_events }}</only-future-events>
      {% endif %}
      {% if localfile.query is defined %}
      <query>{{ localfile.query }}</query>
@@ -614,7 +614,7 @@
       {% if wazuh_manager_config.authd.force.enabled is not none %}
       <enabled>{{wazuh_manager_config.authd.force.enabled}}</enabled>
       {% else %}
-      <enabledport>yes</enabled>
+      <enabledport>yes</enabledport>
       {% endif %}
       {% if wazuh_manager_config.authd.force.key_mismatch is not none %}
       <key_mismatch>{{wazuh_manager_config.authd.force.key_mismatch}}</key_mismatch>
diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2
index 7af5e3f3..0f805eee 100644
--- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2
+++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2
@@ -59,7 +59,7 @@
          <location>{{ localfile.location }}</location>
          {% if localfile.format == 'eventchannel' %}
          {% if localfile.only_future_events is defined %}
-         <only-future-events>{{ localfile.only_future_events }}</only_future_events>
+         <only-future-events>{{ localfile.only_future_events }}</only-future-events>
          {% endif %}
          {% if localfile.query is defined %}
          <query>{{ localfile.query }}</query>