diff --git a/ansible-role-elasticsearch/defaults/main.yml b/ansible-role-elasticsearch/defaults/main.yml
index ace0aeed..93feb04f 100644
--- a/ansible-role-elasticsearch/defaults/main.yml
+++ b/ansible-role-elasticsearch/defaults/main.yml
@@ -3,5 +3,5 @@ elasticsearch_cluster_name: wazuh
 elasticsearch_node_name: node-1
 elasticsearch_http_port: 9200
 elasticsearch_network_host: 127.0.0.1
-elasticsearch_jvm_xms: 1g
+elasticsearch_jvm_xms: 2000
 elastic_stack_version: 5.5.0
diff --git a/ansible-role-elasticsearch/templates/jvm.options.j2 b/ansible-role-elasticsearch/templates/jvm.options.j2
index 1eed34ef..10829b90 100644
--- a/ansible-role-elasticsearch/templates/jvm.options.j2
+++ b/ansible-role-elasticsearch/templates/jvm.options.j2
@@ -1,3 +1,4 @@
+#jinja2: trim_blocks:False
 # {{ ansible_managed }}
 ## JVM configuration
 
@@ -19,9 +20,18 @@
 
 # Xms represents the initial size of total heap space
 # Xmx represents the maximum size of total heap space
-
--Xms{{ elasticsearch_jvm_xms }}
--Xmx{{ elasticsearch_jvm_xms }}
+{% if elasticsearch_jvm_xms is defined %}
+{% if elasticsearch_jvm_xms < 32000 %}
+-Xms{{ elasticsearch_jvm_xms }}m
+-Xmx{{ elasticsearch_jvm_xms }}m
+{% else %}
+-Xms32000m
+-Xmx32000m
+{% endif %}
+{% else %}
+-Xms{% if ansible_memtotal_mb < 64000 %}{{ ((ansible_memtotal_mb|int)/2)|int }}m{% else %}32000m{% endif %}
+-Xmx{% if ansible_memtotal_mb < 64000 %}{{ ((ansible_memtotal_mb|int)/2)|int }}m{% else %}32000m{% endif %}
+{% endif %}
 
 ################################################################
 ## Expert settings