diff --git a/README.rst b/README.rst
index 09d860b..9effd38 100644
--- a/README.rst
+++ b/README.rst
@@ -71,7 +71,8 @@
       master:
         mode: EXCLUSIVE
         java_args: -Xms256m -Xmx1g
-        # Do not manage config.xml from Salt, use UI instead
+        # Do not manage any xml config files via Salt, use UI instead
+        # Including config.xml and any plugin xml's.
         no_config: true
         slaves:
           - name: slave01
diff --git a/jenkins/meta/config.yml b/jenkins/meta/config.yml
index f111ae3..23c8c85 100644
--- a/jenkins/meta/config.yml
+++ b/jenkins/meta/config.yml
@@ -3,7 +3,6 @@
   {%- from "jenkins/map.jinja" import master with context %}
 
   {%- if master.get('no_config', True) == False %}
-
   config.xml:
     path: {{ master.home }}/config.xml
     source: "salt://jenkins/files/config.xml"
diff --git a/jenkins/meta/salt.yml b/jenkins/meta/salt.yml
index 4cad34d..3be4783 100644
--- a/jenkins/meta/salt.yml
+++ b/jenkins/meta/salt.yml
@@ -13,9 +13,9 @@
   {%- endif %}
 dependency:
   {%- if pillar.get('jenkins', {}).get('client') %}
-  {% from "jenkins/map.jinja" import client with context %}
-  {%- if client.enabled %}
+    {% from "jenkins/map.jinja" import client with context %}
+    {%- if client.enabled %}
   engine: pkg
   pkgs: {{ client.pkgs }}
-  {%- endif %}
+    {%- endif %}
   {%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 4a6a4cc..0e33c9e 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -12,7 +12,7 @@
       backupninja:
         enabled: true
       config:
-        enabled: true
+        enabled: false
       grafana:
         enabled: true
       prometheus: