diff --git a/templates/cache-ispn.xml.j2 b/templates/cache-ispn.xml.j2
index 2e58d76..cfc7926 100644
--- a/templates/cache-ispn.xml.j2
+++ b/templates/cache-ispn.xml.j2
@@ -49,7 +49,7 @@
     </jgroups>
 {% endif %}
     <cache-container name="keycloak">
-        <transport cluster="{{ keycloak_cache_container_name }}"{% if keycloak_jgroups_extended_stack %}   stack="{{ keycloak_jgroups_extended_stack_name }}"{% endif %} node-name="{{ keycloak_jgroups_cache_hostname }}" lock-timeout="60000"/>
+        <transport cluster="{{ keycloak_cache_container_name }}"{% if keycloak_jgroups_extended_stack %} stack="{{ keycloak_jgroups_extended_stack_name }}"{% endif %} node-name="{{ keycloak_jgroups_cache_hostname }}" lock-timeout="60000"/>
         <local-cache name="realms">
             <encoding>
                 <key media-type="application/x-java-object"/>
diff --git a/templates/keycloak.service.j2 b/templates/keycloak.service.j2
index 592cc30..d07c263 100644
--- a/templates/keycloak.service.j2
+++ b/templates/keycloak.service.j2
@@ -17,7 +17,9 @@ Before=apache2.service
 Environment=JAVA={{ keycloak_openjdk_bin }}
 Environment=JAVA_HOME=/usr/lib/jvm/java-{{ keycloak_openjdk_runtime_version}}-openjdk-amd64
 Environment=JAVA_OPTS="{{ keycloak_java_opts }}"
+{% if not keycloak_jgroups_extended_stack %}
 Environment=JAVA_OPTS_APPEND="-Djgroups.mcast_addr={{ keycloak_jgroups_multicast_address}} -Djgroups.mcast_port={{ keycloak_jgroups_multicast_port }}"
+{% endif %}
 User={{ keycloak_user }}
 Group={{ keycloak_user }}
 SuccessExitStatus=0 143