diff --git a/.kitchen.yml b/.kitchen.yml
index 2c11074..f3fc5b6 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -2,7 +2,7 @@
 driver:
   name: docker
   hostname: linux.ci.local
-  use_sudo: sudo
+  use_sudo: false
 
 provisioner:
   name: salt_solo
diff --git a/linux/system/grub.sls b/linux/system/grub.sls
index d36ba47..e7e1f8c 100644
--- a/linux/system/grub.sls
+++ b/linux/system/grub.sls
@@ -6,6 +6,8 @@
     - mode: 755
     - makedirs: True
 
+{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
 grub_update:
   cmd.wait:
   - name: update-grub
+{%- endif %}
diff --git a/linux/system/hugepages.sls b/linux/system/hugepages.sls
index e382e51..af62ab8 100644
--- a/linux/system/hugepages.sls
+++ b/linux/system/hugepages.sls
@@ -11,9 +11,12 @@
     - template: jinja
     - require:
       - file: grub_d_directory
+{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
     - watch_in:
       - cmd: grub_update
 
+{%- endif %}
+
 {%- for hugepages_type, hugepages in system.kernel.hugepages.iteritems() %}
 
 {%- if hugepages.get('mount', False) or hugepages.get('default', False) %}
diff --git a/linux/system/kernel.sls b/linux/system/kernel.sls
index 0c352ef..3c7619e 100644
--- a/linux/system/kernel.sls
+++ b/linux/system/kernel.sls
@@ -13,10 +13,12 @@
     - contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT isolcpus={{ system.kernel.isolcpu }}"'
     - require:
       - file: grub_d_directory
+{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %} 
     - watch_in:
       - cmd: grub_update
 
 {%- endif %}
+{%- endif %}
 
 {%- if system.kernel.version is defined %}
 
diff --git a/linux/system/sriov.sls b/linux/system/sriov.sls
index 4421c67..2093e06 100644
--- a/linux/system/sriov.sls
+++ b/linux/system/sriov.sls
@@ -8,8 +8,10 @@
     - contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT intel_iommu=on iommu=pt"'
     - require:
       - file: grub_d_directory
+{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
     - watch_in:
       - cmd: grub_update
+{%- endif %}
 
 /etc/modprobe.d/sriov.conf:
   file.managed:
diff --git a/tests/pillar/network.sls b/tests/pillar/network.sls
index f862ed1..009228f 100644
--- a/tests/pillar/network.sls
+++ b/tests/pillar/network.sls
@@ -2,7 +2,7 @@
   system:
     enabled: true
     domain: ci.local
-    name: linux
+    name: linux.ci.local
   network:
     enabled: true
     hostname: linux