diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27effaae7505b4acd2cd4b14d6df3a4869fde582..3e9ec95c32344e8da9cded34c5fffc5b08df60a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,6 +140,7 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 default-ubuntu-1604-master-py3: {extends: '.test_instance'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 default-centos-7-master-py3: {extends: '.test_instance'}
+default-fedora-34-master-py3: {extends: '.test_instance'}
 default-fedora-33-master-py3: {extends: '.test_instance'}
 default-fedora-32-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
@@ -149,55 +150,72 @@ default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3002-5-py3: {extends: '.test_instance'}
-# default-debian-9-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
-# default-centos-8-3002-5-py3: {extends: '.test_instance'}
-# default-centos-7-3002-5-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-5-py3: {extends: '.test_instance'}
-# default-fedora-32-3002-5-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
+# default-debian-10-3003-0-py3: {extends: '.test_instance'}
+# default-debian-9-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
+# default-centos-8-3003-0-py3: {extends: '.test_instance'}
+# default-centos-7-3003-0-py3: {extends: '.test_instance'}
+# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
+# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
+# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
+# default-debian-10-3002-6-py3: {extends: '.test_instance'}
+# default-debian-9-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
+# default-centos-8-3002-6-py3: {extends: '.test_instance'}
+# default-centos-7-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# default-debian-10-3001-6-py3: {extends: '.test_instance'}
-# default-debian-9-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
-# default-centos-8-3001-6-py3: {extends: '.test_instance'}
-# default-centos-7-3001-6-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-6-py3: {extends: '.test_instance'}
-# default-fedora-32-3001-6-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
+# default-debian-10-3001-7-py3: {extends: '.test_instance'}
+# default-debian-9-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
+# default-centos-8-3001-7-py3: {extends: '.test_instance'}
+# default-centos-7-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
-# default-debian-10-3000-8-py3: {extends: '.test_instance'}
-# default-debian-9-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
-# default-centos-8-3000-8-py3: {extends: '.test_instance'}
-# default-centos-7-3000-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
+# default-debian-10-3000-9-py3: {extends: '.test_instance'}
+# default-debian-9-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
+# default-centos-8-3000-9-py3: {extends: '.test_instance'}
+# default-centos-7-3000-9-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
-# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/kitchen.yml b/kitchen.yml
index fc7463336de5c148244a98e207fce781424c7e93..53985addcac9a3798a2170844e8fb8f9db6da908 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -63,6 +63,12 @@ platforms:
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
+  - name: fedora-34-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-34
+      provision_command:
+        - dnf -y update
+        - dnf -y reinstall udev
   - name: fedora-33-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-33
@@ -108,55 +114,123 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
-  ## SALT `3002.5`
-  - name: debian-10-3002-5-py3
+  ## SALT `3003.0`
+  - name: debian-10-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:debian-10
+  - name: debian-9-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:debian-9
+  - name: ubuntu-2004-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:ubuntu-18.04
+  - name: centos-8-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:centos-8
+  - name: centos-7-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:centos-7
+  - name: fedora-34-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:fedora-34
+      provision_command:
+        - dnf -y update
+        - dnf -y reinstall udev
+  - name: fedora-33-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:fedora-33
+      provision_command:
+        - dnf -y update
+        - dnf -y reinstall udev
+  - name: fedora-32-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:fedora-32
+      provision_command:
+        - dnf -y update
+        - dnf -y reinstall udev
+  - name: amazonlinux-2-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:oraclelinux-7
+  - name: arch-base-latest-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:arch-base-latest
+      provision_command:
+        - pacman --noconfirm -Syu systemd
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd
+
+  ## SALT `3002.6`
+  - name: debian-10-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:debian-10
+  - name: debian-9-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:debian-10
-  - name: debian-9-3002-5-py3
+      image: saltimages/salt-3002.6-py3:debian-9
+  - name: ubuntu-2004-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:debian-9
-  - name: ubuntu-2004-3002-5-py3
+      image: saltimages/salt-3002.6-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-5-py3
+      image: saltimages/salt-3002.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-18.04
-  - name: ubuntu-1604-3002-5-py3
+      image: saltimages/salt-3002.6-py3:ubuntu-16.04
+  - name: centos-8-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-16.04
-  - name: centos-8-3002-5-py3
+      image: saltimages/salt-3002.6-py3:centos-8
+  - name: centos-7-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:centos-8
-  - name: centos-7-3002-5-py3
+      image: saltimages/salt-3002.6-py3:centos-7
+  - name: fedora-34-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:centos-7
-  - name: fedora-33-3002-5-py3
+      image: saltimages/salt-3002.6-py3:fedora-34
+      provision_command:
+        - dnf -y update
+        - dnf -y reinstall udev
+  - name: fedora-33-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:fedora-33
+      image: saltimages/salt-3002.6-py3:fedora-33
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-32-3002-5-py3
+  - name: fedora-32-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:fedora-32
+      image: saltimages/salt-3002.6-py3:fedora-32
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: amazonlinux-2-3002-5-py3
+  - name: amazonlinux-2-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-5-py3
+      image: saltimages/salt-3002.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-5-py3
+      image: saltimages/salt-3002.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-7
-  - name: arch-base-latest-3002-5-py3
+      image: saltimages/salt-3002.6-py3:oraclelinux-7
+  - name: arch-base-latest-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:arch-base-latest
+      image: saltimages/salt-3002.6-py3:arch-base-latest
       provision_command:
         - pacman --noconfirm -Syu systemd
       run_command: /usr/lib/systemd/systemd
+
+  ## SALT `3002.5`
   - name: gentoo-stage3-latest-3002-5-py3
     driver:
       image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
@@ -183,71 +257,79 @@ platforms:
     transport:
       max_ssh_sessions: 1
 
-  ## SALT `3001.6`
-  - name: debian-10-3001-6-py3
+  ## SALT `3001.7`
+  - name: debian-10-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:debian-10
-  - name: debian-9-3001-6-py3
+      image: saltimages/salt-3001.7-py3:debian-10
+  - name: debian-9-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:debian-9
-  - name: ubuntu-2004-3001-6-py3
+      image: saltimages/salt-3001.7-py3:debian-9
+  - name: ubuntu-2004-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-6-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-6-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-16.04
-  - name: centos-8-3001-6-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-16.04
+  - name: centos-8-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:centos-8
-  - name: centos-7-3001-6-py3
+      image: saltimages/salt-3001.7-py3:centos-8
+  - name: centos-7-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:centos-7
-  - name: fedora-33-3001-6-py3
+      image: saltimages/salt-3001.7-py3:centos-7
+  - name: fedora-34-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:fedora-34
+      provision_command:
+        - dnf -y update
+        - dnf -y reinstall udev
+  - name: fedora-33-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:fedora-33
+      image: saltimages/salt-3001.7-py3:fedora-33
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-32-3001-6-py3
+  - name: fedora-32-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:fedora-32
+      image: saltimages/salt-3001.7-py3:fedora-32
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: opensuse-leap-152-3001-6-py3
+  - name: opensuse-leap-152-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
+      image: saltimages/salt-3001.7-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
+  - name: opensuse-tmbl-latest-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3001.7-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
+  - name: amazonlinux-2-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-6-py3
+      image: saltimages/salt-3001.7-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-6-py3
+      image: saltimages/salt-3001.7-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:oraclelinux-7
-  - name: arch-base-latest-3001-6-py3
+      image: saltimages/salt-3001.7-py3:oraclelinux-7
+  - name: arch-base-latest-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:arch-base-latest
+      image: saltimages/salt-3001.7-py3:arch-base-latest
       provision_command:
         - pacman --noconfirm -Syu systemd
       run_command: /usr/lib/systemd/systemd
+
+  ## SALT `3001.6`
   - name: gentoo-stage3-latest-3001-6-py3
     driver:
       image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
@@ -256,42 +338,56 @@ platforms:
     driver:
       image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
 
-  ## SALT `3000.8`
-  - name: debian-10-3000-8-py3
+  ## SALT `3000.9`
+  - name: debian-10-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:debian-10
-  - name: debian-9-3000-8-py3
+      image: saltimages/salt-3000.9-py3:debian-10
+  - name: debian-9-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:debian-9
-  - name: ubuntu-1804-3000-8-py3
+      image: saltimages/salt-3000.9-py3:debian-9
+  - name: ubuntu-1804-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-8-py3
+      image: saltimages/salt-3000.9-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:ubuntu-16.04
-  - name: centos-8-3000-8-py3
+      image: saltimages/salt-3000.9-py3:ubuntu-16.04
+  - name: centos-8-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:centos-8
-  - name: centos-7-3000-8-py3
+      image: saltimages/salt-3000.9-py3:centos-8
+  - name: centos-7-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:centos-7
-  - name: opensuse-leap-152-3000-8-py3
+      image: saltimages/salt-3000.9-py3:centos-7
+  - name: opensuse-leap-152-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
+      image: saltimages/salt-3000.9-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
+  - name: amazonlinux-2-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:oraclelinux-7
+  - name: ubuntu-1804-3000-9-py2
     driver:
-      image: saltimages/salt-3000.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-8-py3
+      image: saltimages/salt-3000.9-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-9-py2
     driver:
-      image: saltimages/salt-3000.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-8-py3
+      image: saltimages/salt-3000.9-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-9-py2
     driver:
-      image: saltimages/salt-3000.8-py3:oraclelinux-7
+      image: saltimages/salt-3000.9-py2:arch-base-latest
+      provision_command:
+        - pacman --noconfirm -Syu systemd
+      run_command: /usr/lib/systemd/systemd
+
+  ## SALT `3000.8`
   - name: gentoo-stage3-latest-3000-8-py3
     driver:
       image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
@@ -299,18 +395,6 @@ platforms:
   - 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
-  - name: ubuntu-1604-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-16.04
-  - name: arch-base-latest-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:arch-base-latest
-      provision_command:
-        - pacman --noconfirm -Syu systemd
-      run_command: /usr/lib/systemd/systemd
 
 provisioner:
   name: salt_solo