diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7aa989665f97138f6d37331efb5951203e6550b..704d4f12f950bd53f556c992f258ca2df9b85d90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,21 +155,25 @@ default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3003-1-py3: {extends: '.test_instance'}
-# default-debian-10-3003-1-py3: {extends: '.test_instance'}
-# default-debian-9-3003-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
-# default-centos-8-3003-1-py3: {extends: '.test_instance'}
-# default-centos-7-3003-1-py3: {extends: '.test_instance'}
-# default-fedora-34-3003-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3003-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
+# default-debian-11-3003-2-py3: {extends: '.test_instance'}
+# default-debian-10-3003-2-py3: {extends: '.test_instance'}
+# default-debian-9-3003-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
+# default-centos-8-3003-2-py3: {extends: '.test_instance'}
+# default-centos-7-3003-2-py3: {extends: '.test_instance'}
+# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
+# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
 # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index d974f3fcc24de3c2ad92f9914ac1e4e65b83663b..3bdc11a263d6bc784072f0306e41b1f1e6be4ddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,21 +115,25 @@ jobs:
     # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=default-almalinux-8-master-py3
     # - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-debian-11-3003-1-py3
-    # - env: INSTANCE=default-debian-10-3003-1-py3
-    # - env: INSTANCE=default-debian-9-3003-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-1-py3
-    # - env: INSTANCE=default-centos-8-3003-1-py3
-    # - env: INSTANCE=default-centos-7-3003-1-py3
-    # - env: INSTANCE=default-fedora-34-3003-1-py3
-    # - env: INSTANCE=default-fedora-33-3003-1-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-1-py3
+    # - env: INSTANCE=default-debian-11-3003-2-py3
+    # - env: INSTANCE=default-debian-10-3003-2-py3
+    # - env: INSTANCE=default-debian-9-3003-2-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-2-py3
+    # - env: INSTANCE=default-centos-8-3003-2-py3
+    # - env: INSTANCE=default-centos-7-3003-2-py3
+    # - env: INSTANCE=default-fedora-34-3003-2-py3
+    # - env: INSTANCE=default-fedora-33-3003-2-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-2-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-2-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-2-py3
+    # - env: INSTANCE=default-arch-base-latest-3003-2-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3
+    # - env: INSTANCE=default-almalinux-8-3003-2-py3
     # - env: INSTANCE=default-arch-base-latest-3003-1-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
diff --git a/kitchen.yml b/kitchen.yml
index 576a1185743559e94bc500238cb77abdb576a20e..f1d7cd4a511b2198bbcb4901ab377ceb3fc7b56b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -150,75 +150,92 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3003.1`
-  - name: debian-11-3003-1-py3
+  ## SALT `3003.2`
+  - name: debian-11-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:debian-11
+      image: saltimages/salt-3003.2-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3003-1-py3
+  - name: debian-10-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:debian-10
+      image: saltimages/salt-3003.2-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3003-1-py3
+  - name: debian-9-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:debian-9
+      image: saltimages/salt-3003.2-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-1-py3
+  - name: ubuntu-2004-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:ubuntu-20.04
+      image: saltimages/salt-3003.2-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-1-py3
+  - name: ubuntu-1804-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:ubuntu-18.04
+      image: saltimages/salt-3003.2-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3003-1-py3
+  - name: centos-8-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:centos-8
-  - name: centos-7-3003-1-py3
+      image: saltimages/salt-3003.2-py3:centos-8
+  - name: centos-7-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:centos-7
-  - name: fedora-34-3003-1-py3
+      image: saltimages/salt-3003.2-py3:centos-7
+  - name: fedora-34-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:fedora-34
+      image: saltimages/salt-3003.2-py3:fedora-34
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-33-3003-1-py3
+  - name: fedora-33-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:fedora-33
+      image: saltimages/salt-3003.2-py3:fedora-33
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: opensuse-leap-153-3003-1-py3
+  - name: opensuse-leap-153-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
+      image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3003-1-py3
+  - name: opensuse-leap-152-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
+      image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
     # 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-3003-1-py3
+  - name: opensuse-tmbl-latest-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
     # 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-3003-1-py3
+  - name: amazonlinux-2-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:oraclelinux-7
+  - name: arch-base-latest-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:arch-base-latest
+      provision_command:
+        - pacman --noconfirm -Syu systemd
+  - name: gentoo-stage3-latest-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-1-py3
+      image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-1-py3
+      image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:oraclelinux-7
+      image: saltimages/salt-3003.2-py3:almalinux-8
+
+  ## SALT `3003.1`
   - name: arch-base-latest-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:arch-base-latest