diff --git a/.kitchen.yml b/.kitchen.yml
deleted file mode 100644
index dccef7f..0000000
--- a/.kitchen.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-driver:
-  name: vagrant
-  vm_hostname: artifactory.ci.local
-  use_sudo: false
-  customize:
-    memory: 512
-
-
-provisioner:
-  name: salt_solo
-  salt_install: bootstrap
-  salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: latest
-  formula: artifactory
-  log_level: info
-  state_top:
-    base:
-      "*":
-        - artifactory
-  pillars:
-    top.sls:
-      base:
-        "*":
-          - artifactory
-  grains:
-    noservices: False
-
-
-verifier:
-  name: inspec
-  sudo: true
-
-
-platforms:
-  - name: ubuntu-14.04
-  - name: ubuntu-16.04
-  - name: centos-7.1
-
-
-suites:
-  - name: default
-  #  provisioner:
-  #    pillars-from-files:
-  #      artifactory.sls: tests/pillar/default.sls
-
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/artifactory/client.sls b/artifactory/client.sls
index 3aad497..dfedfd9 100644
--- a/artifactory/client.sls
+++ b/artifactory/client.sls
@@ -5,11 +5,6 @@
   pkg.installed:
   - names: {{ client.pkgs }}
 
-/etc/salt/minion.d/_artifactory.conf:
-  file.managed:
-  - source: salt://artifactory/files/_artifactory.conf
-  - template: jinja
-
 {%- for repo_name, repo in client.repo.iteritems() %}
 
 artifactory_client_repo_{{ repo_name }}:
diff --git a/artifactory/files/_artifactory.conf b/artifactory/files/_artifactory.conf
deleted file mode 100644
index 92e5f84..0000000
--- a/artifactory/files/_artifactory.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-{%- from "artifactory/map.jinja" import client with context %}
-artifactory:
-  host: {{ client.server.host }}
-  port: {{ client.server.port }}
-  proto: {{ client.server.proto|default('http') }}
-  ssl_verify: {{ client.server.ssl_verify|default(True) }}
-  {%- if client.server.user is defined %}
-  user: {{ client.server.user }}
-  password: {{ client.server.password }}
-  {%- endif %}
diff --git a/artifactory/meta/salt.yml b/artifactory/meta/salt.yml
new file mode 100644
index 0000000..a190b6c
--- /dev/null
+++ b/artifactory/meta/salt.yml
@@ -0,0 +1,14 @@
+minion:
+  {%- if pillar.artifactory.client is defined %}
+  artifactory:
+    {%- from "artifactory/map.jinja" import client with context %}
+    artifactory:
+      host: {{ client.server.host }}
+      port: {{ client.server.port }}
+      proto: {{ client.server.proto|default('http') }}
+      ssl_verify: {{ client.server.ssl_verify|default(True) }}
+      {%- if client.server.user is defined %}
+      user: {{ client.server.user }}
+      password: {{ client.server.password }}
+      {%- endif %}
+  {%- endif %}