diff --git a/tomcat/cluster.sls b/tomcat/cluster.sls
index 7c3681b02bac30b2cd30bad168774941bfa590d3..1b2fc34a341be145c4257c8716a89c49d31aa2ae 100644
--- a/tomcat/cluster.sls
+++ b/tomcat/cluster.sls
@@ -3,8 +3,17 @@
 include:
   - tomcat.config
 
+{#- TODO: Upon fixing `name` below, this section is only working for Tomcat 7.
+          The `server.xml` template needs adapting for later versions.
+          Refer back to the following resources:
+            * http://tomcat.apache.org/tomcat-7.0-doc/cluster-howto.html
+            * http://tomcat.apache.org/tomcat-8.0-doc/cluster-howto.html
+            * http://tomcat.apache.org/tomcat-9.0-doc/cluster-howto.html
+#}
+{%- if tomcat.ver == 7 %}
 tomcat 600_server_xml:
   file.accumulated:
+    - name: 600_server_xml
     - filename: {{ tomcat.conf_dir }}/server.xml
     {% if tomcat.cluster is defined %}
     - text: {{ tomcat.cluster }}
@@ -12,3 +21,4 @@ tomcat 600_server_xml:
     - require_in:
       - file: tomcat server_xml
     - unless: test "`uname`" = "Darwin"
+{%- endif %}