diff --git a/states/clickhouse/config.sls b/states/clickhouse/config.sls
index 0e5e5b0..8dc532b 100644
--- a/states/clickhouse/config.sls
+++ b/states/clickhouse/config.sls
@@ -5,56 +5,13 @@ clickhouse-config-folder:
     - name: /etc/clickhouse-server/config.d
     - clean: True
 
-clickhouse-config-file-settings:
+{% for file in clickhouse.config.files %}
+clickhouse-config-file-{{ file }}:
   file.managed:
-    - name: /etc/clickhouse-server/config.d/settings.xml
-    - source: salt://clickhouse/templates/settings.xml.j2
-    - user: clickhouse
-    - group: clickhouse
-    - mode: 600
-    - template: jinja
-
-clickhouse-config-file-macros:
-  file.managed:
-    - name: /etc/clickhouse-server/config.d/macros.xml
-    - source: salt://clickhouse/templates/macros.xml.j2
-    - user: clickhouse
-    - group: clickhouse
-    - mode: 600
-    - template: jinja
-
-clickhouse-config-file-replica:
-  file.managed:
-    - name: /etc/clickhouse-server/config.d/replica.xml
-    - source: salt://clickhouse/templates/replica.xml.j2
-    - user: clickhouse
-    - group: clickhouse
-    - mode: 600
-    - template: jinja
-
-clickhouse-config-file-keeper:
-  file.managed:
-    - name: /etc/clickhouse-server/config.d/keeper.xml
-    - source: salt://clickhouse/templates/keeper.xml.j2
-    - user: clickhouse
-    - group: clickhouse
-    - mode: 600
-    - template: jinja
-
-clickhouse-config-file-tls:
-  file.managed:
-    - name: /etc/clickhouse-server/config.d/tls.xml
-    - source: salt://clickhouse/templates/tls.xml.j2
-    - user: clickhouse
-    - group: clickhouse
-    - mode: 600
-    - template: jinja
-
-clickhouse-config-file-prometheus:
-  file.managed:
-    - name: /etc/clickhouse-server/config.d/prometheus.xml
-    - source: salt://clickhouse/templates/prometheus.xml.j2
+    - name: /etc/clickhouse-server/config.d/file.xml
+    - source: salt://clickhouse/templates/file.xml.j2
     - user: clickhouse
     - group: clickhouse
     - mode: 600
     - template: jinja
+{% endfor %}
diff --git a/states/clickhouse/defaults.yaml b/states/clickhouse/defaults.yaml
index 991f875..60a272e 100644
--- a/states/clickhouse/defaults.yaml
+++ b/states/clickhouse/defaults.yaml
@@ -6,6 +6,14 @@ clickhouse:
     - clickhouse-client
   databases: {}
   users: {}
+  config:
+    files:
+      - keeper
+      - macros
+      - prometheus
+      - replica
+      - settings
+      - tls
   cluster: paulbsd
   clusters:
     paulbsd: