diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 18e8f47..9fedd93 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -43,27 +43,21 @@ jobs:
         instance:
           - py3-git-3000-freebsd-130
           - py3-git-3000-freebsd-122
-          - py3-git-3000-freebsd-114
           # - py3-git-3000-openbsd-6
           - py3-git-3001-freebsd-130
           - py3-git-3001-freebsd-122
-          - py3-git-3001-freebsd-114
           # - py3-git-3001-openbsd-6
           - py3-git-3002-freebsd-130
           - py3-git-3002-freebsd-122
-          - py3-git-3002-freebsd-114
           # - py3-git-3002-openbsd-6
           - py3-git-3003-freebsd-130
           - py3-git-3003-freebsd-122
-          - py3-git-3003-freebsd-114
           # - py3-git-3003-openbsd-6
           - py3-git-master-freebsd-130
           - py3-git-master-freebsd-122
-          - py3-git-master-freebsd-114
           # - py3-git-master-openbsd-6
           - latest-freebsd-130
           - latest-freebsd-122
-          - latest-freebsd-114
           - latest-openbsd-6
     steps:
       - name: 'Check out code'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c745705..4041f7b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,98 +44,6 @@ jobs:
           shellcheck -s sh -f tty bootstrap-salt.sh
 
 
-  py3-git-3002-almalinux-8:
-    name: AlmaLinux 8 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-almalinux-8 || bundle exec kitchen create py3-git-3002-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-almalinux-8
-
-
-  py3-git-3003-almalinux-8:
-    name: AlmaLinux 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-almalinux-8 || bundle exec kitchen create py3-git-3003-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-almalinux-8
-
-
   py3-git-master-almalinux-8:
     name: AlmaLinux 8 Master Py3 Git
     runs-on: ubuntu-latest
@@ -6024,98 +5932,6 @@ jobs:
           bundle exec kitchen destroy latest-oraclelinux-8
 
 
-  py3-git-3002-rockylinux-8:
-    name: Rocky Linux 8 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-rockylinux-8 || bundle exec kitchen create py3-git-3002-rockylinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-rockylinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-rockylinux-8
-
-
-  py3-git-3003-rockylinux-8:
-    name: Rocky Linux 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-rockylinux-8 || bundle exec kitchen create py3-git-3003-rockylinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-rockylinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-rockylinux-8
-
-
   py3-git-master-rockylinux-8:
     name: Rocky Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 3978909..fee44c9 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -96,6 +96,11 @@ BLACKLIST_3001_0 = [
     "ubuntu-2104",
 ]
 
+BLACKLIST_3002 = [
+    "almalinux-8",
+    "rockylinux-8",
+]
+
 BLACKLIST_3002_0 = [
     "almalinux-8",
     "amazon-2",
@@ -106,6 +111,11 @@ BLACKLIST_3002_0 = [
     "ubuntu-2104",
 ]
 
+BLACKLIST_3003 = [
+    "almalinux-8",
+    "rockylinux-8",
+]
+
 BLACKLIST_3003_0 = [
     "amazon-2",
 ]
@@ -275,9 +285,15 @@ def generate_test_jobs():
                     if branch == "3001-0" and distro in BLACKLIST_3001_0:
                         continue
 
+                    if branch == "3002" and distro in BLACKLIST_3002:
+                        continue
+
                     if branch == "3002-0" and distro in BLACKLIST_3002_0:
                         continue
 
+                    if branch == "3003" and distro in BLACKLIST_3003:
+                        continue
+
                     if branch == "3003-0" and distro in BLACKLIST_3003_0:
                         continue
 
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 7c80b54..1e5a4c8 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -27,9 +27,6 @@ platforms:
   - name: freebsd-122
     driver:
       box: bento/freebsd-12.2
-  - name: freebsd-114
-    driver:
-      box: bento/freebsd-11.4
   - name: openbsd-6
     driver:
       box: generic/openbsd6
diff --git a/kitchen.yml b/kitchen.yml
index 6738ee1..b96c613 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -147,7 +147,6 @@ suites:
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py2-git-master
     provisioner:
@@ -159,7 +158,6 @@ suites:
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py2-stable-3000
     provisioner:
@@ -178,7 +176,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
 
   - name: py3-git-3000
@@ -215,7 +212,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3001-0
     provisioner:
@@ -232,7 +228,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3001
     provisioner:
@@ -246,7 +241,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3002-0
     provisioner:
@@ -262,7 +256,6 @@ suites:
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3003-0
     provisioner:
@@ -271,14 +264,12 @@ suites:
     excludes:
       - opensuse-15
       - opensuse-tumbleweed
-      - debian-11
       - fedora-33
       - arch
       - gentoo
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3002
     provisioner:
@@ -290,7 +281,6 @@ suites:
       - arch
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3003
     provisioner:
@@ -302,7 +292,6 @@ suites:
       - arch
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-git-master
     provisioner: