diff --git a/templates/instances.xml.j2 b/templates/instances.xml.j2
index e4cfdc3..e970be5 100644
--- a/templates/instances.xml.j2
+++ b/templates/instances.xml.j2
@@ -1,118 +1,24 @@
+
 <?xml version="1.0"?>
 <!-- {{ ansible_managed }} -->
 <yandex>
     <remote_servers>
-        <distributed_cluster>
+{% for clusters_name, shards_name in clickhouse_clusters.items() | list %}
+        <{{ clusters_name }}>
+{% for shard_name, replicas  in shards_name.items() %}
             <shard>
             <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard01'] %}
+{% for replica in replicas %}
                 <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
+                    <host>{{ replica['host'] }}</host>
+                    <port>{{ replica['port'] }}</port>
+                    <user>{{ clickhouse_distributed_user }}</user>
                     <password></password>
-                 </replica>
-            {% endfor %}
+	        </replica>
+{% endfor %}
             </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard02'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard03'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard04'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard05'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard06'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard07'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard08'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard09'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-            <shard>
-            <internal_replication>true</internal_replication>
-            {% for node_hostname in groups['clickhouse_ip-shard10'] %}
-                <replica>
-                    <host>{{ node_hostname }}</host>
-                    <port>{{ clickhouse_tcp_port }}</port>
-                    <user>app_sib</user>
-                    <password></password>
-                 </replica>
-            {% endfor %}
-            </shard>
-        </distributed_cluster>
+{% endfor %}
+        </{{ clusters_name }}>
+{% endfor %}
     </remote_servers>
 </yandex>
diff --git a/templates/macros.xml.j2 b/templates/macros.xml.j2
index a59d8a7..c96360d 100644
--- a/templates/macros.xml.j2
+++ b/templates/macros.xml.j2
@@ -2,38 +2,9 @@
 <!-- {{ ansible_managed }} -->
 <yandex>
     <macros>
-        <cluster>{{ clickhouse_display_name | default('clickhouse') }}</cluster>
-        {% if inventory_hostname in groups['clickhouse_shard01'] %}
-        <shard>01</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard02'] %}
-        <shard>02</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard03'] %}
-        <shard>03</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard04'] %}
-        <shard>04</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard05'] %}
-        <shard>05</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard06'] %}
-        <shard>06</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard07'] %}
-        <shard>07</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard08'] %}
-        <shard>08</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard09'] %}
-        <shard>09</shard>
-        {% endif %}
-        {% if inventory_hostname in groups['clickhouse_shard10'] %}
-        <shard>10</shard>
-        {% endif %}
+        <cluster>{{ cluster }}</cluster>
+        <shard>{{ shard }}</shard>
         <replica>{{ inventory_hostname }}</replica>
-        <distributed_clusters>distributed_cluster</distributed_clusters>
+        <distributed_clusters>{{ distributed_cluster }}</distributed_clusters>
     </macros>
 </yandex>