diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index 04d1130..44aef3f 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -26,7 +26,7 @@
     {% endif -%}
 
     {# Confluence versions 7.13 and newer #}
-    {% if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 %}
+    {%- if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 -%}
     <property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property>
     <property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property>
     <property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property>
@@ -35,7 +35,7 @@
     <property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property>
     <property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property>
     <property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property>
-    {% else %}
+    {%- else -%}
     <property name="hibernate.hikari.idleTimeout">{{ atl_db_timeout }}</property>
     <property name="hibernate.hikari.maximumPoolSize">{{ atl_db_poolmaxsize }}</property>
     <property name="hibernate.hikari.minimumIdle">{{ atl_db_poolminsize }}</property>
@@ -54,21 +54,24 @@
     <property name="confluence.cluster.join.type">aws</property>
     <property name="confluence.cluster.name">{{ atl_aws_stack_name }}</property>
     <property name="confluence.cluster.ttl">1</property>
-    {% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %}
+    {%- if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' -%}
         <property name="confluence.webapp.context.path">{{ atl_tomcat_contextpath }}</property>
     {% endif %}
     {# config specific to opensearch #}
-    {% if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %}
+    {%- if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %}
     {# if password provided set password and user but NOT region #}
     {% if atl_opensearch_password is defined and atl_opensearch_password != '' %}
+
     <property name="opensearch.password">{{ atl_opensearch_password }}</property>
     <property name="opensearch.user">{{ atl_opensearch_user }}</property>
-    {% else %}
+    {%- else %}
+
     <property name="opensearch.aws.region">{{ atl_hazelcast_network_aws_iam_region }}</property>
     {% endif %}
+
     <property name="opensearch.http.url">https://{{ atl_opensearch_endpoint }}</property>
     <property name="search.platform">opensearch</property>
-    {% endif %}
-    {% endif %}
+    {%- endif %}
+
   </properties>
 </confluence-configuration>
\ No newline at end of file