diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 92e5e9c..9dd435a 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -41,25 +41,23 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - py3-git-3000-freebsd-130
-          - py3-git-3000-freebsd-122
-          - py3-git-3000-freebsd-114
+          # - py3-git-3000-freebsd-130
+          # - py3-git-3000-freebsd-122
           # - 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-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/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
index 4329d43..8906328 100644
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@@ -46,6 +46,7 @@ jobs:
         instance:
           - py3-stable-3001-windows-2019
           - py3-stable-3002-windows-2019
+          - py3-stable-3003-windows-2019
           - latest-windows-2019
     steps:
       - name: 'Check out code'
@@ -102,6 +103,7 @@ jobs:
         instance:
           - py3-stable-3001-windows-2016
           - py3-stable-3002-windows-2016
+          - py3-stable-3003-windows-2016
           - latest-windows-2016
     steps:
       - name: 'Check out code'
diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index 8134361..b23b392 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -284,6 +284,98 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-gentoo
 
 
+  py3-stable-3003-gentoo:
+    name: Gentoo v3003 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    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-stable-3003-gentoo || bundle exec kitchen create py3-stable-3003-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-gentoo
+
+
+  py3-git-3003-gentoo:
+    name: Gentoo v3003 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    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-gentoo || bundle exec kitchen create py3-git-3003-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-gentoo
+
+
   py3-git-master-gentoo:
     name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
@@ -652,6 +744,98 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-gentoo-systemd
 
 
+  py3-stable-3003-gentoo-systemd:
+    name: Gentoo (systemd) v3003 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    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-stable-3003-gentoo-systemd || bundle exec kitchen create py3-stable-3003-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-gentoo-systemd
+
+
+  py3-git-3003-gentoo-systemd:
+    name: Gentoo (systemd) v3003 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    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-gentoo-systemd || bundle exec kitchen create py3-git-3003-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-gentoo-systemd
+
+
   py3-git-master-gentoo-systemd:
     name: Gentoo (systemd) Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 445861b..1d345a8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,8 +44,8 @@ jobs:
           shellcheck -s sh -f tty bootstrap-salt.sh
 
 
-  py3-git-3002-almalinux-8:
-    name: AlmaLinux 8 v3002 Py3 Git
+  py3-stable-3003-almalinux-8:
+    name: AlmaLinux 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -78,16 +78,108 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-almalinux-8 || bundle exec kitchen create py3-git-3002-almalinux-8
+          bundle exec kitchen create py3-stable-3003-almalinux-8 || bundle exec kitchen create py3-stable-3003-almalinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-almalinux-8
+          bundle exec kitchen verify py3-stable-3003-almalinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-almalinux-8
+          bundle exec kitchen destroy py3-stable-3003-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-stable-3003-0-almalinux-8:
+    name: AlmaLinux 8 v3003.0 Py3 Stable
+    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-stable-3003-0-almalinux-8 || bundle exec kitchen create py3-stable-3003-0-almalinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-almalinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-almalinux-8
 
 
   py3-git-master-almalinux-8:
@@ -366,52 +458,6 @@ jobs:
           bundle exec kitchen destroy py3-git-3001-amazon-2
 
 
-  py3-stable-3001-0-amazon-2:
-    name: Amazon 2 v3001.0 Py3 Stable
-    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-stable-3001-0-amazon-2 || bundle exec kitchen create py3-stable-3001-0-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-amazon-2
-
-
   py3-stable-3002-amazon-2:
     name: Amazon 2 v3002 Py3 Stable
     runs-on: ubuntu-latest
@@ -504,8 +550,8 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-amazon-2
 
 
-  py3-stable-3002-0-amazon-2:
-    name: Amazon 2 v3002.0 Py3 Stable
+  py3-stable-3003-amazon-2:
+    name: Amazon 2 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -538,16 +584,62 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-amazon-2 || bundle exec kitchen create py3-stable-3002-0-amazon-2
+          bundle exec kitchen create py3-stable-3003-amazon-2 || bundle exec kitchen create py3-stable-3003-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-amazon-2
+          bundle exec kitchen verify py3-stable-3003-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-amazon-2
+          bundle exec kitchen destroy py3-stable-3003-amazon-2
+
+
+  py3-git-3003-amazon-2:
+    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-git-3003-amazon-2
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-amazon-2
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-amazon-2
 
 
   py3-git-master-amazon-2:
@@ -734,6 +826,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-arch
 
 
+  py3-git-3003-arch:
+    name: Arch 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-arch || bundle exec kitchen create py3-git-3003-arch
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-arch
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-arch
+
+
   py3-git-master-arch:
     name: Arch Master Py3 Git
     runs-on: ubuntu-latest
@@ -1194,6 +1332,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-centos-7
 
 
+  py3-stable-3003-centos-7:
+    name: CentOS 7 v3003 Py3 Stable
+    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-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-centos-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-centos-7
+
+
+  py3-git-3003-centos-7:
+    name: CentOS 7 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-centos-7 || bundle exec kitchen create py3-git-3003-centos-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-centos-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-centos-7
+
+
+  py3-stable-3003-0-centos-7:
+    name: CentOS 7 v3003.0 Py3 Stable
+    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-stable-3003-0-centos-7 || bundle exec kitchen create py3-stable-3003-0-centos-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-centos-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-centos-7
+
+
   py3-git-master-centos-7:
     name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
@@ -1654,6 +1930,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-centos-8
 
 
+  py3-stable-3003-centos-8:
+    name: CentOS 8 v3003 Py3 Stable
+    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-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-centos-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-centos-8
+
+
+  py3-git-3003-centos-8:
+    name: CentOS 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-centos-8 || bundle exec kitchen create py3-git-3003-centos-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-centos-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-centos-8
+
+
+  py3-stable-3003-0-centos-8:
+    name: CentOS 8 v3003.0 Py3 Stable
+    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-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-centos-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-centos-8
+
+
   py3-git-master-centos-8:
     name: CentOS 8 Master Py3 Git
     runs-on: ubuntu-latest
@@ -2114,6 +2528,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-debian-10
 
 
+  py3-stable-3003-debian-10:
+    name: Debian 10 v3003 Py3 Stable
+    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-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-debian-10
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-debian-10
+
+
+  py3-git-3003-debian-10:
+    name: Debian 10 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-debian-10 || bundle exec kitchen create py3-git-3003-debian-10
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-debian-10
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-debian-10
+
+
+  py3-stable-3003-0-debian-10:
+    name: Debian 10 v3003.0 Py3 Stable
+    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-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-debian-10
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-debian-10
+
+
   py3-git-master-debian-10:
     name: Debian 10 Master Py3 Git
     runs-on: ubuntu-latest
@@ -2298,6 +2850,144 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-debian-11
 
 
+  py3-stable-3003-debian-11:
+    name: Debian 11 v3003 Py3 Stable
+    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-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-debian-11
+
+
+  py3-git-3003-debian-11:
+    name: Debian 11 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-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-debian-11
+
+
+  py3-stable-3003-0-debian-11:
+    name: Debian 11 v3003.0 Py3 Stable
+    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-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-debian-11
+
+
   py3-git-master-debian-11:
     name: Debian 11 Master Py3 Git
     runs-on: ubuntu-latest
@@ -2758,6 +3448,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-debian-9
 
 
+  py3-stable-3003-debian-9:
+    name: Debian 9 v3003 Py3 Stable
+    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-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-debian-9
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-debian-9
+
+
+  py3-git-3003-debian-9:
+    name: Debian 9 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-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-debian-9
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-debian-9
+
+
+  py3-stable-3003-0-debian-9:
+    name: Debian 9 v3003.0 Py3 Stable
+    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-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-debian-9
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-debian-9
+
+
   py3-git-master-debian-9:
     name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
@@ -2942,6 +3770,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-fedora-33
 
 
+  py3-git-3003-fedora-33:
+    name: Fedora 33 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-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-fedora-33
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-fedora-33
+
+
   py3-git-master-fedora-33:
     name: Fedora 33 Master Py3 Git
     runs-on: ubuntu-latest
@@ -3126,6 +4000,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-fedora-34
 
 
+  py3-git-3003-fedora-34:
+    name: Fedora 34 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-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-fedora-34
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-fedora-34
+
+
   py3-git-master-fedora-34:
     name: Fedora 34 Master Py3 Git
     runs-on: ubuntu-latest
@@ -3310,6 +4230,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-fedora-35
 
 
+  py3-git-3003-fedora-35:
+    name: Fedora 35 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-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-fedora-35
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-fedora-35
+
+
   py3-git-master-fedora-35:
     name: Fedora 35 Master Py3 Git
     runs-on: ubuntu-latest
@@ -3540,6 +4506,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-opensuse-15
 
 
+  py3-git-3003-opensuse-15:
+    name: Opensuse 15 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-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-opensuse-15
+
+
   py3-git-master-opensuse-15:
     name: Opensuse 15 Master Py3 Git
     runs-on: ubuntu-latest
@@ -3724,6 +4736,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
 
 
+  py3-git-3003-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed 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-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed
+
+
   py3-git-master-opensuse-tumbleweed:
     name: Opensuse Tumbleweed Master Py3 Git
     runs-on: ubuntu-latest
@@ -4184,6 +5242,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
 
 
+  py3-stable-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Stable
+    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-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
+
+
+  py3-git-3003-oraclelinux-7:
+    name: Oracle Linux 7 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-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
+
+
+  py3-stable-3003-0-oraclelinux-7:
+    name: Oracle Linux 7 v3003.0 Py3 Stable
+    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-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7
+
+
   py3-git-master-oraclelinux-7:
     name: Oracle Linux 7 Master Py3 Git
     runs-on: ubuntu-latest
@@ -4644,6 +5840,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8
 
 
+  py3-stable-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Stable
+    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-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
+
+
+  py3-git-3003-oraclelinux-8:
+    name: Oracle 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-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
+
+
+  py3-stable-3003-0-oraclelinux-8:
+    name: Oracle Linux 8 v3003.0 Py3 Stable
+    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-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8
+
+
   py3-git-master-oraclelinux-8:
     name: Oracle Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
@@ -4736,52 +6070,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-master-rockylinux-8:
     name: Rocky Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
@@ -5242,6 +6530,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
 
 
+  py3-stable-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Stable
+    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-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
+
+
+  py3-git-3003-ubuntu-1804:
+    name: Ubuntu 18.04 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-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-ubuntu-1804
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
+
+
+  py3-stable-3003-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3003.0 Py3 Stable
+    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-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804
+
+
   py3-git-master-ubuntu-1804:
     name: Ubuntu 18.04 Master Py3 Git
     runs-on: ubuntu-latest
@@ -5610,6 +7036,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004
 
 
+  py3-stable-3003-ubuntu-2004:
+    name: Ubuntu 20.04 v3003 Py3 Stable
+    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-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2004
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2004
+
+
+  py3-git-3003-ubuntu-2004:
+    name: Ubuntu 20.04 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-ubuntu-2004 || bundle exec kitchen create py3-git-3003-ubuntu-2004
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-ubuntu-2004
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-ubuntu-2004
+
+
+  py3-stable-3003-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3003.0 Py3 Stable
+    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-stable-3003-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2004
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2004
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2004
+
+
   py3-git-master-ubuntu-2004:
     name: Ubuntu 20.04 Master Py3 Git
     runs-on: ubuntu-latest
@@ -5794,6 +7358,144 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-ubuntu-2104
 
 
+  py3-stable-3003-ubuntu-2104:
+    name: Ubuntu 21.04 v3003 Py3 Stable
+    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-stable-3003-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2104
+
+
+  py3-git-3003-ubuntu-2104:
+    name: Ubuntu 21.04 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-ubuntu-2104 || bundle exec kitchen create py3-git-3003-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-ubuntu-2104
+
+
+  py3-stable-3003-0-ubuntu-2104:
+    name: Ubuntu 21.04 v3003.0 Py3 Stable
+    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-stable-3003-0-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2104
+
+
   py3-git-master-ubuntu-2104:
     name: Ubuntu 21.04 Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index e0cb317..f0c9f54 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -31,6 +31,7 @@ LINUX_DISTROS = [
 OSX = WINDOWS = []
 
 STABLE_DISTROS = [
+    "almalinux-8",
     "amazon-2",
     "centos-7",
     "centos-8",
@@ -88,6 +89,7 @@ BLACKLIST_3001 = [
 
 BLACKLIST_3001_0 = [
     "almalinux-8",
+    "amazon-2",
     "debian-11",
     "gentoo",
     "gentoo-systemd",
@@ -95,8 +97,14 @@ BLACKLIST_3001_0 = [
     "ubuntu-2104",
 ]
 
+BLACKLIST_3002 = [
+    "almalinux-8",
+    "rockylinux-8",
+]
+
 BLACKLIST_3002_0 = [
     "almalinux-8",
+    "amazon-2",
     "debian-11",
     "gentoo",
     "gentoo-systemd",
@@ -104,12 +112,25 @@ BLACKLIST_3002_0 = [
     "ubuntu-2104",
 ]
 
+BLACKLIST_3003 = [
+    "rockylinux-8",
+]
+
+BLACKLIST_3003_0 = [
+    "amazon-2",
+    "gentoo",
+    "gentoo-systemd",
+    "rockylinux-8",
+]
+
 SALT_BRANCHES = [
     "3000",
     "3001",
     "3001-0",
     "3002",
     "3002-0",
+    "3003",
+    "3003-0",
     "master",
     "latest",
 ]
@@ -120,6 +141,8 @@ BRANCH_DISPLAY_NAMES = {
     "3001-0": "v3001.0",
     "3002": "v3002",
     "3002-0": "v3002.0",
+    "3003": "v3003",
+    "3003-0": "v3003.0",
     "master": "Master",
     "latest": "Latest",
 }
@@ -265,9 +288,18 @@ 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
+
                     if python_version == "py2" and distro in PY2_BLACKLIST:
                         continue
 
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 0499fcc..3424e38 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -20,6 +20,7 @@ Andrew Dean                 ndrwdn                 ndrwdn@gmail.com
 Andy Boff                   caelor                 github@plek.me.uk
 Angelo Gründler             plueschopath           angelo.gruendler@w1r3.net
 Ari Aosved                  devaos                 ari.aosved@gmail.com
+Ari Maniatis                ari                    ari@ish.com.au
 Ashok Raja R                ashokrajar             ashokrajar@users.noreply.github.com
 Beau Hargis                 beaucephus             beau@customermobile.com
 Benjamin Drung              bdrung                 bdrung@debian.org
diff --git a/ChangeLog b/ChangeLog
index 83030cd..c40e1d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Version TBD (In Progress on the Develop Branch):
 
+Version 2021.08.19:
+    * Update README with instructions to use salt-bootstrap custom version (ari) #1580
+    * Remove unsupported versions (bryceml) #1578
+    * Update FreeBSD default Python version to 3.8 (myii) #1574
+
 Version 2021.06.23:
 	* Use salt.list instead of saltstack.list (bryceml) #1563
 	* Use fetch_url function for curl (xeacott) #1562
diff --git a/README.rst b/README.rst
index c0fba69..3be7ce2 100644
--- a/README.rst
+++ b/README.rst
@@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2021.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665``
 - 2021.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758``
 - 2020.10.20: ``b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2``
 - 2020.10.19: ``f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52``
@@ -527,6 +528,23 @@ UNIX systems
 
 - SmartOS (2015Q4 and later)
 
+
+Using a custom salt bootstrap
+-----------------------------
+
+By default the ``salt-cloud -p`` provisioning command will use the latest release from this 
+repository to bootstrap new minions. If 
+
+- your needs are not met by that script,
+- you want to lock salt bootstrap to a specific release, or
+- you want to use an unreleased development version of this script
+
+you can add your bootstrap-salt script to your salt cloud configuration and point to it with the
+``script`` attribute.
+
+`Read more`: https://docs.saltproject.io/en/latest/topics/cloud/deploy.html
+
+
 Unsupported Distributions
 -------------------------
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 09b6f7f..4735ad9 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2021.06.23"
+__ScriptVersion="2021.08.19"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -1642,8 +1642,8 @@ __check_end_of_life_versions() {
             ;;
 
         centos)
-            # CentOS versions lower than 6 are no longer supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
+            # CentOS versions lower than 7 are no longer supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    http://wiki.centos.org/Download"
@@ -1652,8 +1652,8 @@ __check_end_of_life_versions() {
             ;;
 
         red_hat*linux)
-            # Red Hat (Enterprise) Linux versions lower than 6 are no longer supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
+            # Red Hat (Enterprise) Linux versions lower than 7 are no longer supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://access.redhat.com/support/policy/updates/errata/"
@@ -1662,8 +1662,8 @@ __check_end_of_life_versions() {
             ;;
 
         oracle*linux)
-            # Oracle Linux versions lower than 6 are no longer supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
+            # Oracle Linux versions lower than 7 are no longer supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    http://www.oracle.com/us/support/library/elsp-lifetime-069338.pdf"
@@ -1672,8 +1672,8 @@ __check_end_of_life_versions() {
             ;;
 
         scientific*linux)
-            # Scientific Linux versions lower than 6 are no longer supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
+            # Scientific Linux versions lower than 7 are no longer supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://www.scientificlinux.org/downloads/sl-versions/"
@@ -1682,8 +1682,8 @@ __check_end_of_life_versions() {
             ;;
 
         cloud*linux)
-            # Cloud Linux versions lower than 6 are no longer supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
+            # Cloud Linux versions lower than 7 are no longer supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://docs.cloudlinux.com/index.html?cloudlinux_life-cycle.html"
@@ -1692,9 +1692,9 @@ __check_end_of_life_versions() {
             ;;
 
         amazon*linux*ami)
-            # Amazon Linux versions lower than 2012.0X no longer supported
+            # Amazon Linux versions 2018.XX and lower no longer supported
             # Except for Amazon Linux 2, which reset the major version counter
-            if [ "$DISTRO_MAJOR_VERSION" -lt 2012 ] && [ "$DISTRO_MAJOR_VERSION" -gt 10 ]; then
+            if [ "$DISTRO_MAJOR_VERSION" -le 2018 ] && [ "$DISTRO_MAJOR_VERSION" -gt 10 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://aws.amazon.com/amazon-linux-ami/"
@@ -5843,15 +5843,15 @@ install_freebsd_git_deps() {
 
     if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
 
-        SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py37-salt)
+        SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py38-salt)
         # shellcheck disable=SC2086
         /usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1
 
-        /usr/local/sbin/pkg install -y py37-requests || return 1
-        /usr/local/sbin/pkg install -y py37-tornado4 || return 1
+        /usr/local/sbin/pkg install -y py38-requests || return 1
+        /usr/local/sbin/pkg install -y py38-tornado4 || return 1
 
     else
-        /usr/local/sbin/pkg install -y python py37-pip py37-setuptools libzmq4 libunwind || return 1
+        /usr/local/sbin/pkg install -y python py38-pip py38-setuptools libzmq4 libunwind || return 1
     fi
 
     echodebug "Adapting paths to FreeBSD"
@@ -5897,7 +5897,7 @@ install_freebsd_stable() {
 # installing latest version of salt from FreeBSD CURRENT ports repo
 #
     # shellcheck disable=SC2086
-    /usr/local/sbin/pkg install -y py37-salt || return 1
+    /usr/local/sbin/pkg install -y py38-salt || return 1
 
     return 0
 }
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.windows.yml b/kitchen.windows.yml
index cfcaa6f..993dbff 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -23,6 +23,9 @@ suites:
   - name: py3-stable-3002
     provisioner:
       salt_version: 3002
+  - name: py3-stable-3003
+    provisioner:
+      salt_version: 3003
   - name: latest
     provisioner:
       salt_version: latest
diff --git a/kitchen.yml b/kitchen.yml
index c1468b0..c707c3f 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -9,6 +9,7 @@ driver:
     - sys_admin
   disable_upstart: false
   use_internal_docker_network: false
+  run_command: /usr/lib/systemd/systemd
 
 provisioner:
   name: salt_solo
@@ -29,111 +30,77 @@ provisioner:
 
 platforms:
   - name: almalinux-8
-    driver_config:
-      run_command: /usr/lib/systemd/systemd
   - name: amazon-2
-    driver_config:
+    driver:
       image: amazonlinux:2
       platform: rhel
-      run_command: /usr/lib/systemd/systemd
       provision_command:
         - yum -y install procps-ng
   - name: arch
-    driver_config:
+    driver:
       image: archlinux/archlinux
-      run_command: /usr/lib/systemd/systemd
       provision_command:
         - pacman -Syu --noconfirm --needed systemd grep awk procps which
         - systemctl enable sshd
-    provisioner:
-      salt_bootstrap_options: -MPfq -D -y -x python2 git %s
   - name: centos-8
-    driver_config:
-      run_command: /usr/lib/systemd/systemd
   - name: centos-7
-    driver_config:
-      run_command: /usr/lib/systemd/systemd
   - name: debian-9
-    driver_config:
+    driver:
       run_command: /lib/systemd/systemd
   - name: debian-10
-    driver_config:
+    driver:
       run_command: /lib/systemd/systemd
   - name: debian-11
-    driver_config:
+    driver:
       image: debian:bullseye
       run_command: /lib/systemd/systemd
   - name: fedora-33
-    driver_config:
-      image: fedora:33
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
+    driver:
+      provision_command: &fedora_provision_command
         - dnf -y install procps-ng
         - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
   - name: fedora-34
-    driver_config:
-      image: fedora:34
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - dnf -y install procps-ng
-        - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
+    driver:
+      provision_command: *fedora_provision_command
   - name: fedora-35
-    driver_config:
-      image: fedora:35
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - dnf -y install procps-ng
-        - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
+    driver:
+      provision_command: *fedora_provision_command
   - name: gentoo
-    driver_config:
-      image: ksmanis/stage3:latest
+    driver:
+      image: gentoo/stage3:latest
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
   - name: gentoo-systemd
-    driver_config:
-      image: ksmanis/stage3:systemd
+    driver:
+      image: gentoo/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service
   - name: opensuse-15
-    driver_config:
-      image: opensuse/leap:15.1
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - zypper --non-interactive install --auto-agree-with-licenses dbus-1
-        - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl
-        - systemctl enable sshd.service
-    provisioner:
-      salt_bootstrap_options: -MPfq -y -x python2 git %s
-  - name: opensuse-tumbleweed
-    driver_config:
-      image: opensuse/tumbleweed:latest
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
+    driver:
+      image: opensuse/leap:15.3
+      provision_command: &opensuse_provision_command
         - zypper --non-interactive install --auto-agree-with-licenses dbus-1
         - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
         - systemctl enable sshd.service
-    provisioner:
-      salt_bootstrap_options: -MPfq -y -x python3 git %s
+  - name: opensuse-tumbleweed
+    driver:
+      image: opensuse/tumbleweed:latest
+      provision_command: *opensuse_provision_command
   - name: oraclelinux-8
-    driver_config:
-      run_command: /usr/lib/systemd/systemd
   - name: oraclelinux-7
-    driver_config:
-      run_command: /usr/lib/systemd/systemd
   - name: rockylinux-8
-    driver_config:
+    driver:
       image: rockylinux/rockylinux
-      run_command: /usr/lib/systemd/systemd
   - name: ubuntu-21.04
-    driver_config:
+    driver:
       run_command: /lib/systemd/systemd
   - name: ubuntu-20.04
-    driver_config:
+    driver:
       run_command: /lib/systemd/systemd
   - name: ubuntu-18.04
-    driver_config:
+    driver:
       run_command: /lib/systemd/systemd
 
 suites:
@@ -147,7 +114,6 @@ suites:
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py2-git-master
     provisioner:
@@ -159,7 +125,6 @@ suites:
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py2-stable-3000
     provisioner:
@@ -178,7 +143,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
 
   - name: py3-git-3000
@@ -198,6 +162,10 @@ suites:
     provisioner:
       salt_version: 3002
       salt_bootstrap_options: -x python3 -MPfq git %s
+  - name: py3-git-3003
+    provisioner:
+      salt_version: 3003
+      salt_bootstrap_options: -x python3 -MPfq git %s
   - name: py3-stable-3000
     provisioner:
       salt_version: 3000
@@ -211,7 +179,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3001-0
     provisioner:
@@ -228,7 +195,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3001
     provisioner:
@@ -242,7 +208,6 @@ suites:
       - ubuntu-2104
       - freebsd-130
       - freebsd-122
-      - freebsd-114
       - openbsd-6
   - name: py3-stable-3002-0
     provisioner:
@@ -258,7 +223,20 @@ suites:
       - gentoo-systemd
       - freebsd-130
       - freebsd-122
-      - freebsd-114
+      - openbsd-6
+  - name: py3-stable-3003-0
+    provisioner:
+      salt_version: 3003
+      salt_bootstrap_options: -x python3 -MP stable 3003.0
+    excludes:
+      - opensuse-15
+      - opensuse-tumbleweed
+      - fedora-33
+      - arch
+      - gentoo
+      - gentoo-systemd
+      - freebsd-130
+      - freebsd-122
       - openbsd-6
   - name: py3-stable-3002
     provisioner:
@@ -270,7 +248,17 @@ suites:
       - arch
       - freebsd-130
       - freebsd-122
-      - freebsd-114
+      - openbsd-6
+  - name: py3-stable-3003
+    provisioner:
+      salt_version: 3003
+      salt_bootstrap_options: -x python3 -MP stable %s
+    excludes:
+      - opensuse-15
+      - opensuse-tumbleweed
+      - arch
+      - freebsd-130
+      - freebsd-122
       - openbsd-6
   - name: py3-git-master
     provisioner: