diff --git a/.travis.yml b/.travis.yml
index 1d889f1..69a5362 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ jobs:
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
-        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
+        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
                        | xargs -I {} salt-lint {}
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
@@ -62,31 +62,33 @@ jobs:
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
     - env: INSTANCE=default-debian-10-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-develop-py3
-    # - env: INSTANCE=default-centos-7-develop-py3
-    # - env: INSTANCE=default-fedora-30-develop-py3
-    # - env: INSTANCE=default-opensuse-leap-15-develop-py3
-    # - env: INSTANCE=default-amazonlinux-2-develop-py2
-    # - env: INSTANCE=default-arch-base-latest-develop-py2
+    # - env: INSTANCE=default-ubuntu-1804-master-py3
+    # - env: INSTANCE=default-centos-8-master-py3
+    # - env: INSTANCE=default-fedora-31-master-py3
+    # - env: INSTANCE=default-opensuse-leap-151-master-py3
+    # - env: INSTANCE=default-amazonlinux-2-master-py2
+    # - env: INSTANCE=default-arch-base-latest-master-py2
+    # - env: INSTANCE=default-debian-10-2019-2-py3
     # - env: INSTANCE=default-debian-9-2019-2-py3
     - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    - env: INSTANCE=default-centos-7-2019-2-py3
-    # - env: INSTANCE=default-fedora-30-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
+    - env: INSTANCE=default-centos-8-2019-2-py3
+    # - env: INSTANCE=default-fedora-31-2019-2-py3
+    # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
+    # - env: INSTANCE=default-centos-7-2019-2-py2
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py2
     - env: INSTANCE=default-arch-base-latest-2019-2-py2
+    - env: INSTANCE=default-fedora-30-2018-3-py3
     # - env: INSTANCE=default-debian-9-2018-3-py2
     # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
     # - env: INSTANCE=default-centos-7-2018-3-py2
-    - env: INSTANCE=default-fedora-29-2018-3-py2
-    - env: INSTANCE=default-opensuse-leap-15-2018-3-py2
+    - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
     # - env: INSTANCE=default-amazonlinux-2-2018-3-py2
     # - env: INSTANCE=default-arch-base-latest-2018-3-py2
     # - env: INSTANCE=default-debian-8-2017-7-py2
     # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
     - env: INSTANCE=default-centos-6-2017-7-py2
-    # - env: INSTANCE=default-fedora-29-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
+    # - env: INSTANCE=default-fedora-30-2017-7-py2
+    # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
     # - env: INSTANCE=default-amazonlinux-2-2017-7-py2
     # - env: INSTANCE=default-arch-base-latest-2017-7-py2
 
diff --git a/kitchen.yml b/kitchen.yml
index 0f99fac..d1c0df7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -11,88 +11,83 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
-  ## SALT `develop` => `master`
+  ## SALT `master`
   - name: debian-10-master-py3
     driver:
       image: netmanagers/salt-master-py3:debian-10
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
         - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
-  - name: ubuntu-1804-develop-py3
+  - name: ubuntu-1804-master-py3
     driver:
-      image: netmanagers/salt-develop-py3:ubuntu-18.04
+      image: netmanagers/salt-master-py3:ubuntu-18.04
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
-  - name: centos-7-develop-py3
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
+  - name: centos-8-master-py3
     driver:
-      image: netmanagers/salt-develop-py3:centos-7
+      image: netmanagers/salt-master-py3:centos-8
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
-  - name: fedora-30-develop-py3
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
+  - name: fedora-31-master-py3
     driver:
-      image: netmanagers/salt-develop-py3:fedora-30
+      image: netmanagers/salt-master-py3:fedora-31
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
-  - name: opensuse-leap-15-develop-py3
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
+  - name: opensuse-leap-151-master-py3
     driver:
-      image: opensuse/leap:15
+      image: netmanagers/salt-master-py3:opensuse-leap-15.1
       provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
-        - systemctl enable sshd.service
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
       run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python3 git develop
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # 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-develop-py2
+  - name: amazonlinux-2-master-py2
     driver:
-      image: netmanagers/salt-develop-py2:amazonlinux-2
+      image: netmanagers/salt-master-py2:amazonlinux-2
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
-  - name: arch-base-latest-develop-py2
+        - sh bootstrap-salt.sh -XdPbfrq -x python2 git master
+  - name: arch-base-latest-master-py2
     driver:
-      image: netmanagers/salt-develop-py2:arch-base-latest
+      image: netmanagers/salt-master-py2:arch-base-latest
       provision_command:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
+        - sh bootstrap-salt.sh -XdPbfrq -x python2 git master
       run_command: /usr/lib/systemd/systemd
 
   ## SALT `2019.2`
+  - name: debian-10-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:debian-10
   - name: debian-9-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:debian-9
   - name: ubuntu-1804-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:ubuntu-18.04
-  - name: centos-7-2019-2-py3
+  - name: centos-8-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:centos-7
-  - name: fedora-30-2019-2-py3
+      image: netmanagers/salt-2019.2-py3:centos-8
+  - name: fedora-31-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:fedora-30
-  - name: opensuse-leap-15-2019-2-py3
+      image: netmanagers/salt-2019.2-py3:fedora-31
+  - name: opensuse-leap-151-2019-2-py3
     driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
-        - systemctl enable sshd.service
+      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
       run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # 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: centos-7-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:centos-7
   - name: amazonlinux-2-2019-2-py2
     driver:
       image: netmanagers/salt-2019.2-py2:amazonlinux-2
@@ -102,6 +97,9 @@ platforms:
       run_command: /usr/lib/systemd/systemd
 
   ## SALT `2018.3`
+  - name: fedora-30-2018-3-py3
+    driver:
+      image: netmanagers/salt-2018.3-py3:fedora-30
   - name: debian-9-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:debian-9
@@ -111,21 +109,11 @@ platforms:
   - name: centos-7-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:centos-7
-  - name: fedora-29-2018-3-py2
+  - name: opensuse-leap-151-2018-3-py2
     driver:
-      image: netmanagers/salt-2018.3-py2:fedora-29
-  - name: opensuse-leap-15-2018-3-py2
-    driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
-        - systemctl enable sshd.service
+      image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
       run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
@@ -148,21 +136,14 @@ platforms:
     driver:
       image: netmanagers/salt-2017.7-py2:centos-6
       run_command: /sbin/init
-  - name: fedora-29-2017-7-py2
+  - name: fedora-30-2017-7-py2
     driver:
-      image: netmanagers/salt-2017.7-py2:fedora-29
-  - name: opensuse-leap-15-2017-7-py2
+      image: netmanagers/salt-2017.7-py2:fedora-30
+  - name: opensuse-leap-151-2017-7-py2
     driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
-        - systemctl enable sshd.service
+      image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
       run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1