diff --git a/kitchen.yml b/kitchen.yml
index b1045d1..6453e67 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -69,22 +69,22 @@ platforms:
   - name: fedora-32-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-32
-  - name: opensuse-leap-152-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
+  # - name: opensuse-leap-152-master-py3
+  #   driver:
+  #     image: saltimages/salt-master-py3:opensuse-leap-15.2
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
+  # - name: opensuse-tmbl-latest-master-py3
+  #   driver:
+  #     image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
   # - name: amazonlinux-2-master-py3
   #   driver:
   #     image: saltimages/salt-master-py3:amazonlinux-2
@@ -152,22 +152,22 @@ platforms:
   #     image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
 
   ## SALT `3002.2`
-  - name: opensuse-leap-152-3002-2-py3
-    driver:
-      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3002-2-py3
-    driver:
-      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
+  # - name: opensuse-leap-152-3002-2-py3
+  #   driver:
+  #     image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
+  # - name: opensuse-tmbl-latest-3002-2-py3
+  #   driver:
+  #     image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
 
   ## SALT `3001.6`
   - name: debian-10-3001-6-py3
@@ -197,22 +197,22 @@ platforms:
   - name: fedora-32-3001-6-py3
     driver:
       image: saltimages/salt-3001.6-py3:fedora-32
-  - name: opensuse-leap-152-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
+  # - name: opensuse-leap-152-3001-6-py3
+  #   driver:
+  #     image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
+  # - name: opensuse-tmbl-latest-3001-6-py3
+  #   driver:
+  #     image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
   # - name: amazonlinux-2-3001-6-py3
   #   driver:
   #     image: saltimages/salt-3001.6-py3:amazonlinux-2
@@ -253,14 +253,14 @@ platforms:
   - name: centos-7-3000-8-py3
     driver:
       image: saltimages/salt-3000.8-py3:centos-7
-  - name: opensuse-leap-152-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
+  # - name: opensuse-leap-152-3000-8-py3
+  #   driver:
+  #     image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
+  #     run_command: /usr/lib/systemd/systemd
+  #   # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+  #   # => SCP did not finish successfully (255):  (Net::SCP::Error)
+  #   transport:
+  #     max_ssh_sessions: 1
   # - name: amazonlinux-2-3000-8-py3
   #   driver:
   #     image: saltimages/salt-3000.8-py3:amazonlinux-2