diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b17bc9..c7a7aa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,7 +127,6 @@ rubocop:
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
 # default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -149,10 +148,6 @@ repo-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # archive-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # source-ubuntu-1804-master-py3: {extends: '.test_instance'}
 repo-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
-# archive-ubuntu-1604-master-py3: {extends: '.test_instance'}
-# source-ubuntu-1604-master-py3: {extends: '.test_instance'}
-repo-ubuntu-1604-master-py3: {extends: '.test_instance'}
 default-centos-8-master-py3: {extends: '.test_instance'}
 # archive-centos-8-master-py3: {extends: '.test_instance'}
 # source-centos-8-master-py3: {extends: '.test_instance'}
@@ -169,10 +164,6 @@ default-fedora-33-master-py3: {extends: '.test_instance'}
 # archive-fedora-33-master-py3: {extends: '.test_instance'}
 # source-fedora-33-master-py3: {extends: '.test_instance'}
 # repo-fedora-33-master-py3: {extends: '.test_instance'}
-default-fedora-32-master-py3: {extends: '.test_instance'}
-# archive-fedora-32-master-py3: {extends: '.test_instance'}
-# source-fedora-32-master-py3: {extends: '.test_instance'}
-# repo-fedora-32-master-py3: {extends: '.test_instance'}
 default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # archive-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # source-opensuse-leap-152-master-py3: {extends: '.test_instance'}
@@ -213,7 +204,6 @@ default-arch-base-latest-master-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'}
@@ -224,12 +214,10 @@ default-arch-base-latest-master-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'}
@@ -242,12 +230,10 @@ default-arch-base-latest-master-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'}
@@ -259,7 +245,6 @@ default-arch-base-latest-master-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'}
@@ -267,7 +252,6 @@ default-arch-base-latest-master-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'}
diff --git a/.travis.yml b/.travis.yml
index 62f1859..1a43def 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,6 @@ jobs:
     # - env: INSTANCE=default-debian-9-tiamat-py3
     # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
     # - env: INSTANCE=default-centos-8-tiamat-py3
     # - env: INSTANCE=default-centos-7-tiamat-py3
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
@@ -109,10 +108,6 @@ jobs:
     # - env: INSTANCE=archive-ubuntu-1804-master-py3
     # - env: INSTANCE=source-ubuntu-1804-master-py3
     - env: INSTANCE=repo-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-ubuntu-1604-master-py3
-    # - env: INSTANCE=archive-ubuntu-1604-master-py3
-    # - env: INSTANCE=source-ubuntu-1604-master-py3
-    - env: INSTANCE=repo-ubuntu-1604-master-py3
     - env: INSTANCE=default-centos-8-master-py3
     # - env: INSTANCE=archive-centos-8-master-py3
     # - env: INSTANCE=source-centos-8-master-py3
@@ -129,10 +124,6 @@ jobs:
     # - env: INSTANCE=archive-fedora-33-master-py3
     # - env: INSTANCE=source-fedora-33-master-py3
     # - env: INSTANCE=repo-fedora-33-master-py3
-    - env: INSTANCE=default-fedora-32-master-py3
-    # - env: INSTANCE=archive-fedora-32-master-py3
-    # - env: INSTANCE=source-fedora-32-master-py3
-    # - env: INSTANCE=repo-fedora-32-master-py3
     - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - env: INSTANCE=archive-opensuse-leap-152-master-py3
     # - env: INSTANCE=source-opensuse-leap-152-master-py3
@@ -173,7 +164,6 @@ jobs:
     # - env: INSTANCE=default-centos-7-3003-0-py3
     # - env: INSTANCE=default-fedora-34-3003-0-py3
     # - env: INSTANCE=default-fedora-33-3003-0-py3
-    # - env: INSTANCE=default-fedora-32-3003-0-py3
     # - env: INSTANCE=default-amazonlinux-2-3003-0-py3
     # - env: INSTANCE=default-oraclelinux-8-3003-0-py3
     # - env: INSTANCE=default-oraclelinux-7-3003-0-py3
@@ -184,12 +174,10 @@ jobs:
     # - env: INSTANCE=default-debian-9-3002-6-py3
     # - env: INSTANCE=default-ubuntu-2004-3002-6-py3
     # - env: INSTANCE=default-ubuntu-1804-3002-6-py3
-    # - env: INSTANCE=default-ubuntu-1604-3002-6-py3
     # - env: INSTANCE=default-centos-8-3002-6-py3
     # - env: INSTANCE=default-centos-7-3002-6-py3
     # - env: INSTANCE=default-fedora-34-3002-6-py3
     # - env: INSTANCE=default-fedora-33-3002-6-py3
-    # - env: INSTANCE=default-fedora-32-3002-6-py3
     # - env: INSTANCE=default-amazonlinux-2-3002-6-py3
     # - env: INSTANCE=default-oraclelinux-8-3002-6-py3
     # - env: INSTANCE=default-oraclelinux-7-3002-6-py3
@@ -202,12 +190,10 @@ jobs:
     # - env: INSTANCE=default-debian-9-3001-7-py3
     # - env: INSTANCE=default-ubuntu-2004-3001-7-py3
     # - env: INSTANCE=default-ubuntu-1804-3001-7-py3
-    # - env: INSTANCE=default-ubuntu-1604-3001-7-py3
     # - env: INSTANCE=default-centos-8-3001-7-py3
     # - env: INSTANCE=default-centos-7-3001-7-py3
     # - env: INSTANCE=default-fedora-34-3001-7-py3
     # - env: INSTANCE=default-fedora-33-3001-7-py3
-    # - env: INSTANCE=default-fedora-32-3001-7-py3
     # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
     # - env: INSTANCE=default-amazonlinux-2-3001-7-py3
@@ -219,7 +205,6 @@ jobs:
     # - env: INSTANCE=default-debian-10-3000-9-py3
     # - env: INSTANCE=default-debian-9-3000-9-py3
     # - env: INSTANCE=default-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=default-ubuntu-1604-3000-9-py3
     # - env: INSTANCE=default-centos-8-3000-9-py3
     # - env: INSTANCE=default-centos-7-3000-9-py3
     # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
@@ -227,7 +212,6 @@ jobs:
     # - env: INSTANCE=default-oraclelinux-8-3000-9-py3
     # - env: INSTANCE=default-oraclelinux-7-3000-9-py3
     # - env: INSTANCE=default-ubuntu-1804-3000-9-py2
-    # - env: INSTANCE=default-ubuntu-1604-3000-9-py2
     # - env: INSTANCE=default-arch-base-latest-3000-9-py2
     # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
diff --git a/kitchen.yml b/kitchen.yml
index e912999..60b2f55 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -22,9 +22,6 @@ platforms:
   - name: ubuntu-1804-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
-  - name: ubuntu-1604-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-16.04
   - name: centos-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-8
@@ -54,9 +51,6 @@ platforms:
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
-  - name: ubuntu-1604-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-16.04
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
@@ -69,9 +63,6 @@ platforms:
   - name: fedora-33-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-33
-  - name: fedora-32-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-32
   - name: opensuse-leap-152-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -134,9 +125,6 @@ platforms:
   - name: fedora-33-3003-0-py3
     driver:
       image: saltimages/salt-3003.0-py3:fedora-33
-  - name: fedora-32-3003-0-py3
-    driver:
-      image: saltimages/salt-3003.0-py3:fedora-32
   - name: amazonlinux-2-3003-0-py3
     driver:
       image: saltimages/salt-3003.0-py3:amazonlinux-2
@@ -171,9 +159,6 @@ platforms:
   - name: ubuntu-1804-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:ubuntu-18.04
-  - name: ubuntu-1604-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-16.04
   - name: centos-8-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:centos-8
@@ -186,9 +171,6 @@ platforms:
   - name: fedora-33-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:fedora-33
-  - name: fedora-32-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:fedora-32
   - name: amazonlinux-2-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:amazonlinux-2
@@ -243,9 +225,6 @@ platforms:
   - name: ubuntu-1804-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-16.04
   - name: centos-8-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:centos-8
@@ -258,9 +237,6 @@ platforms:
   - name: fedora-33-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:fedora-33
-  - name: fedora-32-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:fedora-32
   - name: opensuse-leap-152-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
@@ -310,9 +286,6 @@ platforms:
   - name: ubuntu-1804-3000-9-py3
     driver:
       image: saltimages/salt-3000.9-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-16.04
   - name: centos-8-3000-9-py3
     driver:
       image: saltimages/salt-3000.9-py3:centos-8
@@ -339,9 +312,6 @@ platforms:
   - name: ubuntu-1804-3000-9-py2
     driver:
       image: saltimages/salt-3000.9-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-9-py2
-    driver:
-      image: saltimages/salt-3000.9-py2:ubuntu-16.04
   - name: arch-base-latest-3000-9-py2
     driver:
       image: saltimages/salt-3000.9-py2:arch-base-latest