diff --git a/templates/haproxy.yaml b/templates/haproxy.yaml
index 9372b3d..7e9e602 100644
--- a/templates/haproxy.yaml
+++ b/templates/haproxy.yaml
@@ -7,21 +7,21 @@ resources:
     values:
       ip: '{{node}}::ip'
       config:protocol:
-        {% for config in service_configs %}
+        #% for config in service_configs %#
         - {{config}}::protocol
-        {% endfor %}
+        #% endfor %#
       config:listen_port:
-        {% for config in service_configs %}
+        #% for config in service_configs %#
         - {{config}}::listen_port
-        {% endfor %}
+        #% endfor %#
       config:name:
-        {% for config in service_configs %}
+        #% for config in service_configs %#
         - {{config}}::name
-        {% endfor %}
+        #% endfor %#
       config:backends:
-        {% for config in service_configs %}
+        #% for config in service_configs %#
         - {{config}}::backends
-        {% endfor %}
+        #% endfor %#
 
   - id: haproxy_service{{index}}
     location: {{node}}
diff --git a/templates/nodes.yaml b/templates/nodes.yaml
index 5129ab4..5455cb9 100644
--- a/templates/nodes.yaml
+++ b/templates/nodes.yaml
@@ -1,7 +1,7 @@
 id: simple_riak_with_transports
 resources:
-{% for i in range(count|int) %}
-   {% set j = i +1 %}
+#% for i in range(count|int) %#
+   #% set j = i +1 %#
   - id: ssh_transport{{j}}
     from: resources/transport_ssh
     values:
@@ -34,4 +34,4 @@ resources:
     from: resources/hosts_file
     location: node{{j}}
     tags: ['location=node{{j}}']
-{% endfor %}
+#% endfor %#
diff --git a/templates/nodes_network.yaml b/templates/nodes_network.yaml
index 3044492..3d2a88d 100644
--- a/templates/nodes_network.yaml
+++ b/templates/nodes_network.yaml
@@ -3,7 +3,7 @@ id: simple_multinode_gre
 # eth1 - mgmt 10.0.0.0/24,
 # eth3 - ext 10.2.0.0/24
 resources:
-{% for i in range(count|int) %}
+#% for i in range(count|int) %#
   - id: node{{i}}_sdn
     from: resources/node_network_puppet
     values:
@@ -68,4 +68,4 @@ resources:
           ex: br-ex
           neutron/floating: br-floating
           fw-admin: br-fw-admin
-{% endfor %}
+#% endfor %#
diff --git a/templates/nodes_with_transports.yaml b/templates/nodes_with_transports.yaml
index a185b19..7d56bf9 100644
--- a/templates/nodes_with_transports.yaml
+++ b/templates/nodes_with_transports.yaml
@@ -1,6 +1,6 @@
 id: simple_multinode_with_transports
 resources:
-{% for i in range(count|int) %}
+#% for i in range(count|int) %#
   - id: ssh_transport{{i}}
     from: resources/transport_ssh
     values:
@@ -29,4 +29,4 @@ resources:
       ip: '10.0.0.{{i + 3}}'
       transports_id: transports{{i}}::transports_id
       name: node{{i}}
-{% endfor %}
+#% endfor %#
diff --git a/templates/not_provisioned_nodes.yaml b/templates/not_provisioned_nodes.yaml
index 0bd69b3..6d5e78e 100644
--- a/templates/not_provisioned_nodes.yaml
+++ b/templates/not_provisioned_nodes.yaml
@@ -1,7 +1,7 @@
 id: not_provisioned_nodes
 resources:
-{% for node in nodes %}
-  {% set id = node.id | replace(':', '_') %}
+#% for node in nodes %#
+  #% set id = node.id | replace(':', '_') %#
   - id: ssh_transport{{ id }}
     from: resources/transport_ssh
     values:
@@ -21,7 +21,7 @@ resources:
       transports_id: transports{{id}}::transports_id
       name: node_{{id}}
       admin_mac: {{node.mac}}
-{% endfor %}
+#% endfor %#
 
   - id: ssh_transport_master
     from: resources/transport_ssh
diff --git a/templates/openstack_base.yaml b/templates/openstack_base.yaml
index db34acf..62c1989 100644
--- a/templates/openstack_base.yaml
+++ b/templates/openstack_base.yaml
@@ -41,11 +41,11 @@ resources:
   - id: keystone_service_endpoint
     from: resources/keystone_service_endpoint
     values:
-     {% raw %}
+     #% raw %#
       adminurl: 'http://{{admin_ip}}:{{admin_port}}/v2.0'
       internalurl: 'http://{{internal_ip}}:{{internal_port}}/v2.0'
       publicurl: 'http://{{public_ip}}:{{public_port}}/v2.0'
-     {% endraw %}
+     #% endraw %#
       description: 'OpenStack Identity Service'
       type: 'identity'
       endpoint_name: 'keystone'