diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 340d3515750c1b3187cff82b11994f924bc7a1b0..638add0e6ce9b96627355b4940c9e3996b4278e6 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'}
@@ -137,12 +136,10 @@ default-debian-10-master-py3: {extends: '.test_instance'}
 default-debian-9-master-py3: {extends: '.test_instance'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-default-ubuntu-1604-master-py3: {extends: '.test_instance'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 default-centos-7-master-py3: {extends: '.test_instance'}
 default-fedora-34-master-py3: {extends: '.test_instance'}
 default-fedora-33-master-py3: {extends: '.test_instance'}
-default-fedora-32-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -159,7 +156,6 @@ default-amazonlinux-2-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'}
@@ -170,12 +166,10 @@ default-amazonlinux-2-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'}
@@ -188,12 +182,10 @@ default-amazonlinux-2-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'}
@@ -205,7 +197,6 @@ default-amazonlinux-2-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'}
@@ -213,7 +204,6 @@ default-amazonlinux-2-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 0d0bd198bf1717cdf1e0ba9c1005c2b7d650ea8d..db2a216d0246a42c4ca984f401ee0aba21b1c85c 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
@@ -97,12 +96,10 @@ jobs:
     - env: INSTANCE=default-debian-9-master-py3
     - env: INSTANCE=default-ubuntu-2004-master-py3
     - env: INSTANCE=default-ubuntu-1804-master-py3
-    - env: INSTANCE=default-ubuntu-1604-master-py3
     # - env: INSTANCE=default-centos-8-master-py3
     - env: INSTANCE=default-centos-7-master-py3
     - env: INSTANCE=default-fedora-34-master-py3
     - env: INSTANCE=default-fedora-33-master-py3
-    - env: INSTANCE=default-fedora-32-master-py3
     # - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
     - env: INSTANCE=default-amazonlinux-2-master-py3
@@ -119,7 +116,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
@@ -130,12 +126,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
@@ -148,12 +142,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
@@ -165,7 +157,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
@@ -173,7 +164,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 b703f9c46db4c7e1775bfe0fa9313cc0ff593613..9e1b954555f65c960c28ddb4e43da0c3ef9edfab 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
@@ -75,12 +69,6 @@ platforms:
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-32-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-32
-      provision_command:
-        - dnf -y update
-        - dnf -y reinstall udev
   - name: opensuse-leap-152-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -151,12 +139,6 @@ platforms:
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-32-3003-0-py3
-    driver:
-      image: saltimages/salt-3003.0-py3:fedora-32
-      provision_command:
-        - dnf -y update
-        - dnf -y reinstall udev
   - name: amazonlinux-2-3003-0-py3
     driver:
       image: saltimages/salt-3003.0-py3:amazonlinux-2
@@ -193,9 +175,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
@@ -214,12 +193,6 @@ platforms:
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-32-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:fedora-32
-      provision_command:
-        - dnf -y update
-        - dnf -y reinstall udev
   - name: amazonlinux-2-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:amazonlinux-2
@@ -276,9 +249,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
@@ -297,12 +267,6 @@ platforms:
       provision_command:
         - dnf -y update
         - dnf -y reinstall udev
-  - name: fedora-32-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:fedora-32
-      provision_command:
-        - dnf -y update
-        - dnf -y reinstall udev
   - name: opensuse-leap-152-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
@@ -354,9 +318,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
@@ -383,9 +344,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