diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 3d59fbf..b4762a1 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -115,6 +115,13 @@
   - onlyif: /bin/false
   {%- endif %}
 
+{%- else %}
+
+dockershim_service:
+  service.dead:
+  - name: dockershim
+  - enable: False
+
 {%- endif %}
 
 /usr/bin/criproxy:
@@ -164,6 +171,10 @@
     - file: /etc/systemd/system/criproxy.service
     - file: /etc/criproxy/node.conf
     - file: /usr/bin/criproxy
+  - require:
+    - file: /etc/systemd/system/criproxy.service
+    - file: /etc/criproxy/node.conf
+    - file: /usr/bin/criproxy
   {%- if grains.get('noservices') %}
   - onlyif: /bin/false
   {%- endif %}
diff --git a/kubernetes/control/init.sls b/kubernetes/control/init.sls
index 18d8b11..0469403 100644
--- a/kubernetes/control/init.sls
+++ b/kubernetes/control/init.sls
@@ -1,5 +1,8 @@
 {% from "kubernetes/map.jinja" import control with context %}
 include:
+  {%- if control.endpoints is defined %}
+  - kubernetes.control.endpoint
+  {%- endif %}
   {%- if control.job is defined %}
   - kubernetes.control.job
   {%- endif %}
@@ -15,9 +18,6 @@
   {%- if control.priorityclass is defined %}
   - kubernetes.control.priorityclass
   {%- endif %}
-  {%- if control.endpoints is defined %}
-  - kubernetes.control.endpoint
-  {%- endif %}
   {%- if control.ingress is defined %}
   - kubernetes.control.ingress
   {%- endif %}