diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 5d304df..9abdaa3 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -180,10 +180,12 @@
 /etc/criproxy:
   file.absent
 
+{%- if not common.get('containerd', {}).get('enabled') %}
 dockershim_service:
   service.dead:
   - name: dockershim
   - enable: False
+{%- endif %}
 
 criproxy_service:
   service.dead:
diff --git a/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml b/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml
index e9035e9..84d279f 100644
--- a/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml
+++ b/kubernetes/files/kube-addons/virtlet/virtlet-ds.yml
@@ -124,8 +124,6 @@
         - mountPath: /run
           mountPropagation: Bidirectional
           name: run
-        - mountPath: /var/run/docker.sock
-          name: dockersock
         - mountPath: /hostlog
           name: log
         - mountPath: /host-var-lib
@@ -262,9 +260,6 @@
           path: /run
         name: run
       - hostPath:
-          path: /var/run/docker.sock
-        name: dockersock
-      - hostPath:
           path: /var/lib/virtlet
         name: virtlet
       - hostPath: