diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e4d63f..c2e5015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -135,12 +135,12 @@ rubocop:
 ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################
diff --git a/.travis.yml b/.travis.yml
index e8ff63c..fdcdc0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,12 +87,12 @@ jobs:
     - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3004-0-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3004-0-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3004-1-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3004-1-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-4-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3003-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-8-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3002-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index f381103..596876f 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -40,34 +40,34 @@ platforms:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3004.0`
-  - name: ubuntu-2004-3004-0-py3
+  ## SALT `3004.1`
+  - name: ubuntu-2004-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-0-py3
+  - name: ubuntu-1804-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3003.3`
-  - name: ubuntu-2004-3003-3-py3
+  ## SALT `3003.4`
+  - name: ubuntu-2004-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-20.04
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-3-py3
+  - name: ubuntu-1804-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3002.7`
-  - name: ubuntu-2004-3002-7-py3
+  ## SALT `3002.8`
+  - name: ubuntu-2004-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-20.04
+      image: saltimages/salt-3002.8-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-7-py3
+  - name: ubuntu-1804-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-18.04
+      image: saltimages/salt-3002.8-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
 verifier: