diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 993c607..9defea0 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -88,6 +88,21 @@
 
 {%- endif %}
 
+manifest_dir_create:
+  file.directory:
+    - name: /etc/kubernetes/manifests
+    - user: root
+    - group: root
+    - mode: 0751
+
+/etc/kubernetes/kubelet.kubeconfig:
+  file.managed:
+    - source: salt://kubernetes/files/kubelet/kubelet.kubeconfig
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - makedirs: true
 
 kubelet_service:
   service.running:
@@ -97,5 +112,6 @@
     - file: /etc/default/kubelet
     - file: /usr/bin/hyperkube
     - file: /etc/kubernetes/kubelet.kubeconfig
+    - file: manifest_dir_create
 
 {% endif %}
diff --git a/kubernetes/pool/kubelet.sls b/kubernetes/pool/kubelet.sls
index 292ef96..6581ab2 100644
--- a/kubernetes/pool/kubelet.sls
+++ b/kubernetes/pool/kubelet.sls
@@ -1,22 +1,6 @@
 {%- from "kubernetes/map.jinja" import pool with context %}
 {%- if pool.enabled %}
 
-/etc/kubernetes/kubelet.kubeconfig:
-  file.managed:
-    - source: salt://kubernetes/files/kubelet/kubelet.kubeconfig
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-
-manifest-dir-create:
-  file.directory:
-    - name: /etc/kubernetes/manifests
-    - user: root
-    - group: root
-    - mode: 0751
-
 {%- if pool.host.label is defined %}
 
 {%- for name,label in pool.host.label.iteritems() %}