diff --git a/.travis.yml b/.travis.yml
index 7071db7..56fb832 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,13 +58,13 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    - env: INSTANCE=v3000-py3-debian-10-3000-py3
-    - env: INSTANCE=v3000-py3-ubuntu-1804-3000-py3
-    - env: INSTANCE=v3000-py3-centos-8-3000-py3
-    - env: INSTANCE=v3000-py3-fedora-31-3000-py3
-    # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-py3
-    - env: INSTANCE=v3000-py3-amazonlinux-2-3000-py3
-    # - env: INSTANCE=v3000-py2-arch-base-latest-3000-py2
+    - env: INSTANCE=v3000-py3-debian-10-3000-1-py3
+    - env: INSTANCE=v3000-py3-ubuntu-1804-3000-1-py3
+    - env: INSTANCE=v3000-py3-centos-8-3000-1-py3
+    - env: INSTANCE=v3000-py3-fedora-31-3000-1-py3
+    # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-1-py3
+    - env: INSTANCE=v3000-py3-amazonlinux-2-3000-1-py3
+    # - env: INSTANCE=v3000-py2-arch-base-latest-3000-1-py2
     # - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
     - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
     # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
diff --git a/kitchen.yml b/kitchen.yml
index 7cf0df0..1e7335b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -11,33 +11,33 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
-  ## SALT `3000`
-  - name: debian-10-3000-py3
+  ## SALT `3000.1`
+  - name: debian-10-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:debian-10
-  - name: ubuntu-1804-3000-py3
+      image: netmanagers/salt-3000.1-py3:debian-10
+  - name: ubuntu-1804-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:ubuntu-18.04
-  - name: centos-8-3000-py3
+      image: netmanagers/salt-3000.1-py3:ubuntu-18.04
+  - name: centos-8-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:centos-8
-  - name: fedora-31-3000-py3
+      image: netmanagers/salt-3000.1-py3:centos-8
+  - name: fedora-31-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:fedora-31
-  - name: opensuse-leap-151-3000-py3
+      image: netmanagers/salt-3000.1-py3:fedora-31
+  - name: opensuse-leap-151-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:opensuse-leap-15.1
+      image: netmanagers/salt-3000.1-py3:opensuse-leap-15.1
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-py3
+  - name: amazonlinux-2-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:amazonlinux-2
-  - name: arch-base-latest-3000-py2
+      image: netmanagers/salt-3000.1-py3:amazonlinux-2
+  - name: arch-base-latest-3000-1-py2
     driver:
-      image: netmanagers/salt-3000-py2:arch-base-latest
+      image: netmanagers/salt-3000.1-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
   ## SALT `2019.2`
@@ -118,12 +118,12 @@ verifier:
 suites:
   - name: v3000-py3
     includes:
-      - debian-10-3000-py3
-      - ubuntu-1804-3000-py3
-      - centos-8-3000-py3
-      - fedora-31-3000-py3
-      - opensuse-leap-151-3000-py3
-      - amazonlinux-2-3000-py3
+      - debian-10-3000-1-py3
+      - ubuntu-1804-3000-1-py3
+      - centos-8-3000-1-py3
+      - fedora-31-3000-1-py3
+      - opensuse-leap-151-3000-1-py3
+      - amazonlinux-2-3000-1-py3
     provisioner:
       state_top:
         base:
@@ -145,7 +145,7 @@ suites:
         - path: test/integration/v3000-py3
   - name: v3000-py2
     includes:
-      - arch-base-latest-3000-py2
+      - arch-base-latest-3000-1-py2
     provisioner:
       state_top:
         base: