diff --git a/gerrit/client/service.sls b/gerrit/client/service.sls
index b2678d4..0ad991b 100644
--- a/gerrit/client/service.sls
+++ b/gerrit/client/service.sls
@@ -33,21 +33,14 @@
     - /etc/github
   - makedirs: true
 
-/etc/salt/minion.d/_gerrit.conf:
-  file.managed:
-  - source: salt://gerrit/files/_gerrit.conf
-  - template: jinja
-
 {%- if client.get('try_login', False) %}
 {#-
   Ugly workaround to provision user which is possible only over web UI
   See https://groups.google.com/forum/#!topic/repo-discuss/I0SiBjbaojk
 #}
 gerrit_try_login:
-  cmd.wait:
+  cmd.run:
     - name: curl -svr -X POST --data "username={{ client.server.user }}&password={{ client.server.password }}" {{ client.server.protocol|default('http') }}://{{ client.server.host }}:{{ client.server.http_port|default(80) }}/login
-    - watch:
-      - file: /etc/salt/minion.d/_gerrit.conf
 {%- endif %}
 
 /etc/github/github-projects.secure.config:
diff --git a/gerrit/files/_gerrit.conf b/gerrit/files/_gerrit.conf
deleted file mode 100644
index 68764b5..0000000
--- a/gerrit/files/_gerrit.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-{%- from "gerrit/map.jinja" import client with context %}
-gerrit:
-  host: {{ client.server.host }}
-  user: {{ client.server.user }}
-  auth_method: {{ client.server.get('auth_method', 'digest') }}
-  {%- if client.server.protocol is defined %}
-  protocol: {{ client.server.protocol }}
-  {%- endif %}
-  {%- if client.server.http_port is defined %}
-  http_port: {{ client.server.http_port }}
-  {%- endif %}
-  {%- if client.server.password is defined %}
-  password: {{ client.server.password }}
-  {%- endif %}
-  {%- if client.server.key is defined %}
-  keyfile: {{ client.config.key }}
-  {%- endif %}
diff --git a/gerrit/meta/salt.yml b/gerrit/meta/salt.yml
new file mode 100644
index 0000000..259da62
--- /dev/null
+++ b/gerrit/meta/salt.yml
@@ -0,0 +1,21 @@
+minion:
+  {%- if pillar.gerrit.client is defined %}
+  gerrit:
+    {%- from "gerrit/map.jinja" import client with context %}
+    gerrit:
+      host: {{ client.server.host }}
+      user: {{ client.server.user }}
+      auth_method: {{ client.server.get('auth_method', 'digest') }}
+      {%- if client.server.protocol is defined %}
+      protocol: {{ client.server.protocol }}
+      {%- endif %}
+      {%- if client.server.http_port is defined %}
+      http_port: {{ client.server.http_port }}
+      {%- endif %}
+      {%- if client.server.password is defined %}
+      password: {{ client.server.password }}
+      {%- endif %}
+      {%- if client.server.key is defined %}
+      keyfile: {{ client.config.key }}
+      {%- endif %}
+  {%- endif %}