diff --git a/kitchen.yml b/kitchen.yml
index 4d9e7f8..33fbdc0 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -94,13 +94,13 @@ platforms:
   # - name: oraclelinux-7-master-py3
   #   driver:
   #     image: saltimages/salt-master-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-systemd
+  # - name: gentoo-stage3-latest-master-py3
+  #   driver:
+  #     image: saltimages/salt-master-py3:gentoo-stage3-latest
+  #     run_command: /sbin/init
+  # - name: gentoo-stage3-systemd-master-py3
+  #   driver:
+  #     image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
   ## SALT `3002.5`
   - name: debian-10-3002-5-py3
@@ -143,13 +143,13 @@ platforms:
   #   driver:
   #     image: saltimages/salt-3002.5-py3:arch-base-latest
   #     run_command: /usr/lib/systemd/systemd
-  - name: gentoo-stage3-latest-3002-5-py3
-    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-5-py3
-    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
+  # - name: gentoo-stage3-latest-3002-5-py3
+  #   driver:
+  #     image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
+  #     run_command: /sbin/init
+  # - name: gentoo-stage3-systemd-3002-5-py3
+  #   driver:
+  #     image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
 
   ## SALT `3002.2`
   - name: opensuse-leap-152-3002-2-py3
@@ -226,13 +226,13 @@ platforms:
   #   driver:
   #     image: saltimages/salt-3001.6-py3:arch-base-latest
   #     run_command: /usr/lib/systemd/systemd
-  - name: gentoo-stage3-latest-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
+  # - name: gentoo-stage3-latest-3001-6-py3
+  #   driver:
+  #     image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
+  #     run_command: /sbin/init
+  # - name: gentoo-stage3-systemd-3001-6-py3
+  #   driver:
+  #     image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
 
   ## SALT `3000.8`
   - name: debian-10-3000-8-py3
@@ -270,13 +270,13 @@ platforms:
   # - name: oraclelinux-7-3000-8-py3
   #   driver:
   #     image: saltimages/salt-3000.8-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
+  # - name: gentoo-stage3-latest-3000-8-py3
+  #   driver:
+  #     image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
+  #     run_command: /sbin/init
+  # - name: gentoo-stage3-systemd-3000-8-py3
+  #   driver:
+  #     image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
   - name: ubuntu-1804-3000-8-py2
     driver:
       image: saltimages/salt-3000.8-py2:ubuntu-18.04
@@ -336,33 +336,33 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
-  - name: gentoo
-    includes:
-      - gentoo-stage3-latest-master-py3
-      - gentoo-stage3-systemd-master-py3
-      - gentoo-stage3-latest-3002-5-py3
-      - gentoo-stage3-systemd-3002-5-py3
-      - gentoo-stage3-latest-3001-6-py3
-      - gentoo-stage3-systemd-3001-6-py3
-      - gentoo-stage3-latest-3000-8-py3
-      - gentoo-stage3-systemd-3000-8-py3
-    provisioner:
-      state_top:
-        base:
-          '*':
-            - nsd._mapdata
-            - nsd
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - nsd
-              - gentoo
-              - define_roles
-      pillars_from_files:
-        nsd.sls: pillar.example
-        gentoo.sls: test/salt/pillar/gentoo.sls
-        define_roles.sls: test/salt/pillar/define_roles.sls
-    verifier:
-      inspec_tests:
-        - path: test/integration/default
+  # - name: gentoo
+  #   includes:
+  #     - gentoo-stage3-latest-master-py3
+  #     - gentoo-stage3-systemd-master-py3
+  #     - gentoo-stage3-latest-3002-5-py3
+  #     - gentoo-stage3-systemd-3002-5-py3
+  #     - gentoo-stage3-latest-3001-6-py3
+  #     - gentoo-stage3-systemd-3001-6-py3
+  #     - gentoo-stage3-latest-3000-8-py3
+  #     - gentoo-stage3-systemd-3000-8-py3
+  #   provisioner:
+  #     state_top:
+  #       base:
+  #         '*':
+  #           - nsd._mapdata
+  #           - nsd
+  #     pillars:
+  #       top.sls:
+  #         base:
+  #           '*':
+  #             - nsd
+  #             - gentoo
+  #             - define_roles
+  #     pillars_from_files:
+  #       nsd.sls: pillar.example
+  #       gentoo.sls: test/salt/pillar/gentoo.sls
+  #       define_roles.sls: test/salt/pillar/define_roles.sls
+  #   verifier:
+  #     inspec_tests:
+  #       - path: test/integration/default