diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index d1c17a3a..8b839877 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -64,8 +64,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "chore: standardise structure [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/317'
+            title: "ci(kitchen+gitlab): adjust matrix to add '`'3003'`' [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/318'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -160,7 +160,7 @@ ssf_node_anchors:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.2,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         # To deal with excessive instances when mimicking `kitchen list -b`
         # If values are set, only use these as commented entries in the matrix
         platforms_matrix_commented_includes: []
@@ -325,6 +325,13 @@ ssf:
     ### `windows`
     - [windows      ,   10   ,   latest,      3]  # wind-10.0-latest-py3
     - [windows      ,    8.1 ,   latest,      3]  # wind-08.1-latest-py3
+  saltimages_proposed:
+    ### Already available but not using across the Formulas' org until released
+    # - [fedora       ,   35   ,   tiamat,      3]  # fedo-35.0-tiamat-py3
+    - [fedora       ,   35   ,   master,      3]  # fedo-35.0-master-py3
+    - [fedora       ,   35   ,   3003.0,      3]  # fedo-35.0-3003.0-py3
+    - [fedora       ,   35   ,   3002.6,      3]  # fedo-35.0-3002.6-py3
+    - [fedora       ,   35   ,   3001.7,      3]  # fedo-35.0-3001.7-py3
   saltimages:
     ### `tiamat-py3`
     - [debian       ,   10   ,   tiamat,      3]  # debi-10.0-tiamat-py3
@@ -335,6 +342,7 @@ ssf:
     - [centos       ,    8   ,   tiamat,      3]  # cent-08.0-tiamat-py3
     - [centos       ,    7   ,   tiamat,      3]  # cent-07.0-tiamat-py3
     # # Not available at the current time
+    # - [fedora       ,   34   ,   tiamat,      3]  # fedo-34.0-tiamat-py3
     # - [fedora       ,   33   ,   tiamat,      3]  # fedo-33.0-tiamat-py3
     # - [fedora       ,   32   ,   tiamat,      3]  # fedo-32.0-tiamat-py3
     # - [opensuse/leap,   15.2 ,   tiamat,      3]  # opsu-15.2-tiamat-py3
@@ -351,6 +359,7 @@ ssf:
     - [ubuntu       ,   16.04,   master,      3]  # ubun-16.0-master-py3
     - [centos       ,    8   ,   master,      3]  # cent-08.0-master-py3
     - [centos       ,    7   ,   master,      3]  # cent-07.0-master-py3
+    - [fedora       ,   34   ,   master,      3]  # fedo-34.0-master-py3
     - [fedora       ,   33   ,   master,      3]  # fedo-33.0-master-py3
     - [fedora       ,   32   ,   master,      3]  # fedo-32.0-master-py3
     - [opensuse/leap,   15.2 ,   master,      3]  # opsu-15.2-master-py3
@@ -361,70 +370,117 @@ ssf:
     - [gentoo/stage3,  latest,   master,      3]  # gent-late-master-py3
     - [gentoo/stage3, systemd,   master,      3]  # gent-sysd-master-py3
 
+    ### `3003.0-py3`
+    - [debian       ,   10   ,   3003.0,      3]  # debi-10.0-3003.0-py3
+    - [debian       ,    9   ,   3003.0,      3]  # debi-09.0-3003.0-py3
+    - [ubuntu       ,   20.04,   3003.0,      3]  # ubun-20.0-3003.0-py3
+    - [ubuntu       ,   18.04,   3003.0,      3]  # ubun-18.0-3003.0-py3
+    - [centos       ,    8   ,   3003.0,      3]  # cent-08.0-3003.0-py3
+    - [centos       ,    7   ,   3003.0,      3]  # cent-07.0-3003.0-py3
+    - [fedora       ,   34   ,   3003.0,      3]  # fedo-34.0-3003.0-py3
+    - [fedora       ,   33   ,   3003.0,      3]  # fedo-33.0-3003.0-py3
+    - [fedora       ,   32   ,   3003.0,      3]  # fedo-32.0-3003.0-py3
+    # - [opensuse/leap,   15.2 ,   3003.0,      3]  # opsu-15.2-3003.0-py3
+    # - [opensuse/tmbl,  latest,   3003.0,      3]  # opsu-tmbl-3003.0-py3
+    - [amazonlinux  ,    2   ,   3003.0,      3]  # amaz-02.0-3003.0-py3
+    - [oraclelinux  ,    8   ,   3003.0,      3]  # orac-08.0-3003.0-py3
+    - [oraclelinux  ,    7   ,   3003.0,      3]  # orac-07.0-3003.0-py3
+    - [arch-base    ,  latest,   3003.0,      3]  # arch-late-3003.0-py3
+    - [gentoo/stage3,  latest,   3003.0,      3]  # gent-late-3003.0-py3
+    - [gentoo/stage3, systemd,   3003.0,      3]  # gent-sysd-3003.0-py3
+
+    ### `3002.6-py3`
+    - [debian       ,   10   ,   3002.6,      3]  # debi-10.0-3002.6-py3
+    - [debian       ,    9   ,   3002.6,      3]  # debi-09.0-3002.6-py3
+    - [ubuntu       ,   20.04,   3002.6,      3]  # ubun-20.0-3002.6-py3
+    - [ubuntu       ,   18.04,   3002.6,      3]  # ubun-18.0-3002.6-py3
+    - [ubuntu       ,   16.04,   3002.6,      3]  # ubun-16.0-3002.6-py3
+    - [centos       ,    8   ,   3002.6,      3]  # cent-08.0-3002.6-py3
+    - [centos       ,    7   ,   3002.6,      3]  # cent-07.0-3002.6-py3
+    - [fedora       ,   34   ,   3002.6,      3]  # fedo-34.0-3002.6-py3
+    - [fedora       ,   33   ,   3002.6,      3]  # fedo-33.0-3002.6-py3
+    - [fedora       ,   32   ,   3002.6,      3]  # fedo-32.0-3002.6-py3
+    # - [opensuse/leap,   15.2 ,   3002.6,      3]  # opsu-15.2-3002.6-py3
+    # - [opensuse/tmbl,  latest,   3002.6,      3]  # opsu-tmbl-3002.6-py3
+    - [amazonlinux  ,    2   ,   3002.6,      3]  # amaz-02.0-3002.6-py3
+    - [oraclelinux  ,    8   ,   3002.6,      3]  # orac-08.0-3002.6-py3
+    - [oraclelinux  ,    7   ,   3002.6,      3]  # orac-07.0-3002.6-py3
+    - [arch-base    ,  latest,   3002.6,      3]  # arch-late-3002.6-py3
+    # - [gentoo/stage3,  latest,   3002.6,      3]  # gent-late-3002.6-py3
+    # - [gentoo/stage3, systemd,   3002.6,      3]  # gent-sysd-3002.6-py3
     ### `3002.5-py3`
-    - [debian       ,   10   ,   3002.5,      3]  # debi-10.0-3002.5-py3
-    - [debian       ,    9   ,   3002.5,      3]  # debi-09.0-3002.5-py3
-    - [ubuntu       ,   20.04,   3002.5,      3]  # ubun-20.0-3002.5-py3
-    - [ubuntu       ,   18.04,   3002.5,      3]  # ubun-18.0-3002.5-py3
-    - [ubuntu       ,   16.04,   3002.5,      3]  # ubun-16.0-3002.5-py3
-    - [centos       ,    8   ,   3002.5,      3]  # cent-08.0-3002.5-py3
-    - [centos       ,    7   ,   3002.5,      3]  # cent-07.0-3002.5-py3
-    - [fedora       ,   33   ,   3002.5,      3]  # fedo-33.0-3002.5-py3
-    - [fedora       ,   32   ,   3002.5,      3]  # fedo-32.0-3002.5-py3
-    # - [opensuse/leap,   15.2 ,   3002.5,      3]  # opsu-15.2-3002.5-py3
-    # - [opensuse/tmbl,  latest,   3002.5,      3]  # opsu-tmbl-3002.5-py3
-    - [amazonlinux  ,    2   ,   3002.5,      3]  # amaz-02.0-3002.5-py3
-    - [oraclelinux  ,    8   ,   3002.5,      3]  # orac-08.0-3002.5-py3
-    - [oraclelinux  ,    7   ,   3002.5,      3]  # orac-07.0-3002.5-py3
-    - [arch-base    ,  latest,   3002.5,      3]  # arch-late-3002.5-py3
     - [gentoo/stage3,  latest,   3002.5,      3]  # gent-late-3002.5-py3
     - [gentoo/stage3, systemd,   3002.5,      3]  # gent-sysd-3002.5-py3
     ### `3002.2-py3`
     - [opensuse/leap,   15.2 ,   3002.2,      3]  # opsu-15.2-3002.2-py3
     - [opensuse/tmbl,  latest,   3002.2,      3]  # opsu-tmbl-3002.2-py3
 
+    ### `3001.7-py3`
+    - [debian       ,   10   ,   3001.7,      3]  # debi-10.0-3001.7-py3
+    - [debian       ,    9   ,   3001.7,      3]  # debi-09.0-3001.7-py3
+    - [ubuntu       ,   20.04,   3001.7,      3]  # ubun-20.0-3001.7-py3
+    - [ubuntu       ,   18.04,   3001.7,      3]  # ubun-18.0-3001.7-py3
+    - [ubuntu       ,   16.04,   3001.7,      3]  # ubun-16.0-3001.7-py3
+    - [centos       ,    8   ,   3001.7,      3]  # cent-08.0-3001.7-py3
+    - [centos       ,    7   ,   3001.7,      3]  # cent-07.0-3001.7-py3
+    - [fedora       ,   34   ,   3001.7,      3]  # fedo-34.0-3001.7-py3
+    - [fedora       ,   33   ,   3001.7,      3]  # fedo-33.0-3001.7-py3
+    - [fedora       ,   32   ,   3001.7,      3]  # fedo-32.0-3001.7-py3
+    - [opensuse/leap,   15.2 ,   3001.7,      3]  # opsu-15.2-3001.7-py3
+    - [opensuse/tmbl,  latest,   3001.7,      3]  # opsu-tmbl-3001.7-py3
+    - [amazonlinux  ,    2   ,   3001.7,      3]  # amaz-02.0-3001.7-py3
+    - [oraclelinux  ,    8   ,   3001.7,      3]  # orac-08.0-3001.7-py3
+    - [oraclelinux  ,    7   ,   3001.7,      3]  # orac-07.0-3001.7-py3
+    - [arch-base    ,  latest,   3001.7,      3]  # arch-late-3001.7-py3
+    # - [gentoo/stage3,  latest,   3001.7,      3]  # gent-late-3001.7-py3
+    # - [gentoo/stage3, systemd,   3001.7,      3]  # gent-sysd-3001.7-py3
     ### `3001.6-py3`
-    - [debian       ,   10   ,   3001.6,      3]  # debi-10.0-3001.6-py3
-    - [debian       ,    9   ,   3001.6,      3]  # debi-09.0-3001.6-py3
-    - [ubuntu       ,   20.04,   3001.6,      3]  # ubun-20.0-3001.6-py3
-    - [ubuntu       ,   18.04,   3001.6,      3]  # ubun-18.0-3001.6-py3
-    - [ubuntu       ,   16.04,   3001.6,      3]  # ubun-16.0-3001.6-py3
-    - [centos       ,    8   ,   3001.6,      3]  # cent-08.0-3001.6-py3
-    - [centos       ,    7   ,   3001.6,      3]  # cent-07.0-3001.6-py3
-    - [fedora       ,   33   ,   3001.6,      3]  # fedo-33.0-3001.6-py3
-    - [fedora       ,   32   ,   3001.6,      3]  # fedo-32.0-3001.6-py3
-    - [opensuse/leap,   15.2 ,   3001.6,      3]  # opsu-15.2-3001.6-py3
-    - [opensuse/tmbl,  latest,   3001.6,      3]  # opsu-tmbl-3001.6-py3
-    - [amazonlinux  ,    2   ,   3001.6,      3]  # amaz-02.0-3001.6-py3
-    - [oraclelinux  ,    8   ,   3001.6,      3]  # orac-08.0-3001.6-py3
-    - [oraclelinux  ,    7   ,   3001.6,      3]  # orac-07.0-3001.6-py3
-    - [arch-base    ,  latest,   3001.6,      3]  # arch-late-3001.6-py3
     - [gentoo/stage3,  latest,   3001.6,      3]  # gent-late-3001.6-py3
     - [gentoo/stage3, systemd,   3001.6,      3]  # gent-sysd-3001.6-py3
 
+    ### `3000.9-py3`
+    - [debian       ,   10   ,   3000.9,      3]  # debi-10.0-3000.9-py3
+    - [debian       ,    9   ,   3000.9,      3]  # debi-09.0-3000.9-py3
+    - [ubuntu       ,   18.04,   3000.9,      3]  # ubun-18.0-3000.9-py3
+    - [ubuntu       ,   16.04,   3000.9,      3]  # ubun-16.0-3000.9-py3
+    - [centos       ,    8   ,   3000.9,      3]  # cent-08.0-3000.9-py3
+    - [centos       ,    7   ,   3000.9,      3]  # cent-07.0-3000.9-py3
+    - [opensuse/leap,   15.2 ,   3000.9,      3]  # opsu-15.2-3000.9-py3
+    - [amazonlinux  ,    2   ,   3000.9,      3]  # amaz-02.0-3000.9-py3
+    - [oraclelinux  ,    8   ,   3000.9,      3]  # orac-08.0-3000.9-py3
+    - [oraclelinux  ,    7   ,   3000.9,      3]  # orac-07.0-3000.9-py3
+    # - [gentoo/stage3,  latest,   3000.9,      3]  # gent-late-3000.9-py3
+    # - [gentoo/stage3, systemd,   3000.9,      3]  # gent-sysd-3000.9-py3
+    ### `3000.9-py2`
+    - [ubuntu       ,   18.04,   3000.9,      2]  # ubun-18.0-3000.9-py2
+    - [ubuntu       ,   16.04,   3000.9,      2]  # ubun-16.0-3000.9-py2
+    - [arch-base    ,  latest,   3000.9,      2]  # arch-late-3000.9-py2
     ### `3000.8-py3`
-    - [debian       ,   10   ,   3000.8,      3]  # debi-10.0-3000.8-py3
-    - [debian       ,    9   ,   3000.8,      3]  # debi-09.0-3000.8-py3
-    - [ubuntu       ,   18.04,   3000.8,      3]  # ubun-18.0-3000.8-py3
-    - [ubuntu       ,   16.04,   3000.8,      3]  # ubun-16.0-3000.8-py3
-    - [centos       ,    8   ,   3000.8,      3]  # cent-08.0-3000.8-py3
-    - [centos       ,    7   ,   3000.8,      3]  # cent-07.0-3000.8-py3
-    - [opensuse/leap,   15.2 ,   3000.8,      3]  # opsu-15.2-3000.8-py3
-    - [amazonlinux  ,    2   ,   3000.8,      3]  # amaz-02.0-3000.8-py3
-    - [oraclelinux  ,    8   ,   3000.8,      3]  # orac-08.0-3000.8-py3
-    - [oraclelinux  ,    7   ,   3000.8,      3]  # orac-07.0-3000.8-py3
     - [gentoo/stage3,  latest,   3000.8,      3]  # gent-late-3000.8-py3
     - [gentoo/stage3, systemd,   3000.8,      3]  # gent-sysd-3000.8-py3
-    ### `3000.8-py2`
-    - [ubuntu       ,   18.04,   3000.8,      2]  # ubun-18.0-3000.8-py2
-    - [ubuntu       ,   16.04,   3000.8,      2]  # ubun-16.0-3000.8-py2
-    - [arch-base    ,  latest,   3000.8,      2]  # arch-late-3000.8-py2
 
   saltimages_deprecated:
     ### Deprecated, no longer being built but still available in Docker Hub
     ### `master-py3`
     - [fedora       ,   31   ,   master,      3]  # fedo-31.0-master-py3
 
+    ### `3002.5-py3`
+    - [debian       ,   10   ,   3002.5,      3]  # debi-10.0-3002.5-py3
+    - [debian       ,    9   ,   3002.5,      3]  # debi-09.0-3002.5-py3
+    - [ubuntu       ,   20.04,   3002.5,      3]  # ubun-20.0-3002.5-py3
+    - [ubuntu       ,   18.04,   3002.5,      3]  # ubun-18.0-3002.5-py3
+    - [ubuntu       ,   16.04,   3002.5,      3]  # ubun-16.0-3002.5-py3
+    - [centos       ,    8   ,   3002.5,      3]  # cent-08.0-3002.5-py3
+    - [centos       ,    7   ,   3002.5,      3]  # cent-07.0-3002.5-py3
+    - [fedora       ,   34   ,   3002.5,      3]  # fedo-34.0-3002.5-py3
+    - [fedora       ,   33   ,   3002.5,      3]  # fedo-33.0-3002.5-py3
+    - [fedora       ,   32   ,   3002.5,      3]  # fedo-32.0-3002.5-py3
+    # - [opensuse/leap,   15.2 ,   3002.5,      3]  # opsu-15.2-3002.5-py3
+    # - [opensuse/tmbl,  latest,   3002.5,      3]  # opsu-tmbl-3002.5-py3
+    - [amazonlinux  ,    2   ,   3002.5,      3]  # amaz-02.0-3002.5-py3
+    - [oraclelinux  ,    8   ,   3002.5,      3]  # orac-08.0-3002.5-py3
+    - [oraclelinux  ,    7   ,   3002.5,      3]  # orac-07.0-3002.5-py3
+    - [arch-base    ,  latest,   3002.5,      3]  # arch-late-3002.5-py3
     ### `3002.2-py3`
     - [debian       ,   10   ,   3002.2,      3]  # debi-10.0-3002.2-py3
     - [debian       ,    9   ,   3002.2,      3]  # debi-09.0-3002.2-py3
@@ -481,6 +537,23 @@ ssf:
     - [gentoo/stage3,  latest,   3002.0,      3]  # gent-late-3002.0-py3
     - [gentoo/stage3, systemd,   3002.0,      3]  # gent-sysd-3002.0-py3
 
+    ### `3001.6-py3`
+    - [debian       ,   10   ,   3001.6,      3]  # debi-10.0-3001.6-py3
+    - [debian       ,    9   ,   3001.6,      3]  # debi-09.0-3001.6-py3
+    - [ubuntu       ,   20.04,   3001.6,      3]  # ubun-20.0-3001.6-py3
+    - [ubuntu       ,   18.04,   3001.6,      3]  # ubun-18.0-3001.6-py3
+    - [ubuntu       ,   16.04,   3001.6,      3]  # ubun-16.0-3001.6-py3
+    - [centos       ,    8   ,   3001.6,      3]  # cent-08.0-3001.6-py3
+    - [centos       ,    7   ,   3001.6,      3]  # cent-07.0-3001.6-py3
+    - [fedora       ,   34   ,   3001.6,      3]  # fedo-34.0-3001.6-py3
+    - [fedora       ,   33   ,   3001.6,      3]  # fedo-33.0-3001.6-py3
+    - [fedora       ,   32   ,   3001.6,      3]  # fedo-32.0-3001.6-py3
+    - [opensuse/leap,   15.2 ,   3001.6,      3]  # opsu-15.2-3001.6-py3
+    - [opensuse/tmbl,  latest,   3001.6,      3]  # opsu-tmbl-3001.6-py3
+    - [amazonlinux  ,    2   ,   3001.6,      3]  # amaz-02.0-3001.6-py3
+    - [oraclelinux  ,    8   ,   3001.6,      3]  # orac-08.0-3001.6-py3
+    - [oraclelinux  ,    7   ,   3001.6,      3]  # orac-07.0-3001.6-py3
+    - [arch-base    ,  latest,   3001.6,      3]  # arch-late-3001.6-py3
     ### `3001.4-py3`
     - [debian       ,   10   ,   3001.4,      3]  # debi-10.0-3001.4-py3
     - [debian       ,    9   ,   3001.4,      3]  # debi-09.0-3001.4-py3
@@ -556,6 +629,21 @@ ssf:
     - [gentoo/stage3,  latest,   3001  ,      3]  # gent-late-3001.0-py3
     - [gentoo/stage3, systemd,   3001  ,      3]  # gent-sysd-3001.0-py3
 
+    ### `3000.8-py3`
+    - [debian       ,   10   ,   3000.8,      3]  # debi-10.0-3000.8-py3
+    - [debian       ,    9   ,   3000.8,      3]  # debi-09.0-3000.8-py3
+    - [ubuntu       ,   18.04,   3000.8,      3]  # ubun-18.0-3000.8-py3
+    - [ubuntu       ,   16.04,   3000.8,      3]  # ubun-16.0-3000.8-py3
+    - [centos       ,    8   ,   3000.8,      3]  # cent-08.0-3000.8-py3
+    - [centos       ,    7   ,   3000.8,      3]  # cent-07.0-3000.8-py3
+    - [opensuse/leap,   15.2 ,   3000.8,      3]  # opsu-15.2-3000.8-py3
+    - [amazonlinux  ,    2   ,   3000.8,      3]  # amaz-02.0-3000.8-py3
+    - [oraclelinux  ,    8   ,   3000.8,      3]  # orac-08.0-3000.8-py3
+    - [oraclelinux  ,    7   ,   3000.8,      3]  # orac-07.0-3000.8-py3
+    ### `3000.8-py2`
+    - [ubuntu       ,   18.04,   3000.8,      2]  # ubun-18.0-3000.8-py2
+    - [ubuntu       ,   16.04,   3000.8,      2]  # ubun-16.0-3000.8-py2
+    - [arch-base    ,  latest,   3000.8,      2]  # arch-late-3000.8-py2
     ### `3000.6-py3`
     - [debian       ,   10   ,   3000.6,      3]  # debi-10.0-3000.6-py3
     - [debian       ,    9   ,   3000.6,      3]  # debi-09.0-3000.6-py3
@@ -1123,14 +1211,17 @@ ssf:
           <<: *isk_default
           0:
             <<: *isk_suite_default
-            name: 'v3002-py3'
+            name: 'v3003-py3'
           1:
             <<: *isk_suite_default
-            name: 'v3001-py3'
+            name: 'v3002-py3'
           2:
             <<: *isk_suite_default
-            name: 'v3000-py3'
+            name: 'v3001-py3'
           3:
+            <<: *isk_suite_default
+            name: 'v3000-py3'
+          4:
             <<: *isk_suite_default
             name: 'v3000-py2'
     sqldeveloper: *formula_default
diff --git a/ssf/files/default/kitchen.vagrant.yml b/ssf/files/default/kitchen.vagrant.yml
index 98ff9a9d..abe1de73 100644
--- a/ssf/files/default/kitchen.vagrant.yml
+++ b/ssf/files/default/kitchen.vagrant.yml
@@ -28,9 +28,6 @@ platforms:
            (os == 'openbsd' and not testing_openbsd.active) or
            (os == 'windows' and not testing_windows.active) %}
   {%-     continue %}
-  {#-   Avoid `master` boxes for the `salt-formula` #}
-  {%-   elif [semrel_formula, salt_ver] == ['salt', 'master'] %}
-  {%-     continue %}
   {%-   endif %}
   - name: {{ os | replace('/', '-') }}-{{ os_ver | replace('.', '') }}-{{ salt_ver | replace('.', '-') }}-py{{ py_ver }}
     driver:
diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml
index ae409604..ce7c00ba 100644
--- a/ssf/files/default/kitchen.yml
+++ b/ssf/files/default/kitchen.yml
@@ -127,12 +127,6 @@ image: {{ 'saltimages' if [os, os_ver, salt_ver, py_ver] in saltimages else 'net
 {%-       elif os in ['arch-base'] %}
 {%-         do prov_cmds.append('- pacman --noconfirm -Syu systemd') %}
 {%-       endif %}
-{%-     elif semrel_formula == 'libvirt' %}
-{%-       if [os, os_ver] in [['fedora', 33]] %}
-{%-         do prov_cmds.append('- dnf -y update') %}
-{%-         do prov_cmds.append('- dnf install -y crypto-policies-scripts') %}
-{%-         do prov_cmds.append('- update-crypto-policies --set LEGACY') %}
-{%-       endif %}
 {%-     elif semrel_formula == 'docker' %}
 {%-       if os in ['debian', 'ubuntu'] %}
 {%-         do prov_cmds.append('- apt-get update') %}
@@ -149,6 +143,25 @@ image: {{ 'saltimages' if [os, os_ver, salt_ver, py_ver] in saltimages else 'net
 {%-       elif os in ['gentoo/stage3'] %}
 {%-         do prov_cmds.append('emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools') %}
 {%-       endif %}
+{%-     elif semrel_formula == 'locale' %}
+{%-       if os in ['arch-base'] %}
+{%-         do prov_cmds.append('- sed -i -e "/locale/s/^/#/" /etc/pacman.conf') %}
+{%-         do prov_cmds.append('- pacman --noconfirm -Syu glibc') %}
+{%-       endif %}
+{%-     endif %}
+{#-     Specific to newer versions of Fedora (from `33`) across some of the formulas #}
+{#-     These instances install `crypto-policies-scripts` during the `kitchen converge`, #}
+{#-     which then results in the `kitchen verify` hitting the SSH authentication error #}
+{%-     if os == 'fedora' %}
+{%-       if [semrel_formula, os_ver] in [
+            ['libvirt', 33],
+            ['libvirt', 34],
+            ['sysstat', 34],
+          ] %}
+{%-         do prov_cmds.append('- dnf -y update') %}
+{%-         do prov_cmds.append('- dnf install -y crypto-policies-scripts') %}
+{%-         do prov_cmds.append('- update-crypto-policies --set LEGACY') %}
+{%-       endif %}
 {%-     endif %}
 {#-     Prepare the commands if available#}
 {%-     if prov_cmds %}
diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
index 25ac5b59..bc1300ea 100644
--- a/ssf/formulas.yaml
+++ b/ssf/formulas.yaml
@@ -138,7 +138,7 @@ ssf_node_anchors:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         # yamllint disable-line rule:line-length
         platforms_matrix_without_arch_and_tumbleweed: &platforms_matrix_without_arch_and_tumbleweed
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
@@ -151,7 +151,7 @@ ssf_node_anchors:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         platforms_matrix_without_gentoo: &platforms_matrix_without_gentoo
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
           - [debian       ,    0   ,   master,      0,         default]
@@ -163,7 +163,7 @@ ssf_node_anchors:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         # yamllint disable-line rule:line-length
         platforms_matrix_without_gentoo_non_systemd: &platforms_matrix_without_gentoo_non_systemd
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
@@ -176,7 +176,7 @@ ssf_node_anchors:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3, systemd,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         # yamllint disable-line rule:line-length
         platforms_matrix_without_centos_and_oracle: &platforms_matrix_without_centos_and_oracle
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
@@ -189,7 +189,7 @@ ssf_node_anchors:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         platforms_matrix_without_rhel8: &platforms_matrix_without_rhel8
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
           - [debian       ,    0   ,   master,      0,         default]
@@ -203,7 +203,7 @@ ssf_node_anchors:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         # yamllint disable-line rule:line-length
         platforms_matrix_without_rhel8_and_gentoo: &platforms_matrix_without_rhel8_and_gentoo
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
@@ -218,7 +218,7 @@ ssf_node_anchors:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         platforms_matrix_jetbrains: &platforms_matrix_jetbrains
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
           - [debian       ,    0   ,   master,      0,         default]
@@ -233,7 +233,7 @@ ssf_node_anchors:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,            arch]
+          - [arch-base    ,    0   ,   3003.0,      0,            arch]
         # yamllint disable-line rule:line-length
         travis_do_not_use_single_job_for_linters: &travis_do_not_use_single_job_for_linters
           use_single_job_for_linters: false
@@ -423,7 +423,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,              '']  # modules
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         modules]  # POSSIBLE
+          - [arch-base    ,    0   ,   3003.0,      0,         modules]  # POSSIBLE
           - [freebsd      ,    0   ,   master,      3,              '']
         testing_freebsd:
           active: true
@@ -770,7 +770,7 @@ ssf:
           # - [oraclelinux  ,    7   ,   master,      0,           shell]
           # - [oraclelinux  ,    7   ,   master,      0,       keepstore]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.2,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
         yamllint:
           ignore:
@@ -819,7 +819,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         travis: *travis_do_not_use_single_job_for_linters
         yamllint:
           rules:
@@ -901,7 +901,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_default
     consul:
       context:
@@ -979,7 +979,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
       semrel_files: *semrel_files_default
     devstack:
@@ -1050,7 +1050,7 @@ ssf:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_inc_map_jinja_verifier
     django:
       context:
@@ -1083,7 +1083,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_default
     docker:
       context:
@@ -1144,7 +1144,7 @@ ssf:
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
           - [gentoo/stage3, systemd,   master,      0,         archive]
           - [gentoo/stage3, systemd,   master,      0,           clean]
-          - [arch-base    ,    0   ,   3002.5,      0,              '']
+          - [arch-base    ,    0   ,   3003.0,      0,              '']
         use_tofs: true
         yamllint:
           ignore:
@@ -1297,7 +1297,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_inc_map_jinja_verifier
     golang:
       context:
@@ -1342,7 +1342,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,              '']
           - [oraclelinux  ,    0   ,   master,      0,              '']
           # # - [gentoo/stage3,    0   ,   master,      0,              '']
-          - [arch-base    ,    0   ,   3002.5,      0,              '']
+          - [arch-base    ,    0   ,   3003.0,      0,              '']
           - [freebsd      ,    0   ,   master,      3,              '']
           - [openbsd      ,    0   ,   3001.1,      3,         package]
           - [windows      ,    0   ,   latest,      3,              '']
@@ -1468,7 +1468,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_github_actions: true
         yamllint:
           ignore:
@@ -1545,7 +1545,7 @@ ssf:
           - [oraclelinux  ,    8   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,              '']
           - [gentoo/stage3,    0   ,   master,      0,              '']
-          - [arch-base    ,    0   ,   3002.5,      0,              '']
+          - [arch-base    ,    0   ,   3003.0,      0,              '']
         yamllint:
           rules:
             key-duplicates:
@@ -2046,7 +2046,7 @@ ssf:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,            arch]
+          - [arch-base    ,    0   ,   3003.0,      0,            arch]
         use_tofs: true
         yamllint:
           ignore:
@@ -2586,7 +2586,7 @@ ssf:
           # # - [oraclelinux  ,    0   ,   master,      0,             rpm]
           - [oraclelinux  ,    8   ,   master,      0,             rpm]
           - [gentoo/stage3,    0   ,   master,      0,             git]
-          - [arch-base    ,    0   ,   3002.5,      0,             git]
+          - [arch-base    ,    0   ,   3003.0,      0,             git]
       semrel_files: *semrel_files_default
     libvirt:
       context:
@@ -2638,7 +2638,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_libsaltcli: true
         use_tofs: true
       semrel_files: *semrel_files_default
@@ -2689,7 +2689,7 @@ ssf:
           # - https://gitlab.com/myii/locale-formula/-/jobs/1040056073
           # # - [oraclelinux  ,    7   ,   master,      0,          redhat]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_default
     logrotate:
       context:
@@ -2806,7 +2806,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,              '']
           - [oraclelinux  ,    0   ,   master,      0,              '']
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
       semrel_files: *semrel_files_default
     maven:
@@ -2893,7 +2893,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
         yamllint:
           ignore:
@@ -2955,7 +2955,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         yamllint:
           ignore:
             additional:
@@ -3022,7 +3022,7 @@ ssf:
           - [oraclelinux  ,    8   ,   master,      0,              '']
           - [oraclelinux  ,    7   ,   master,      0,         default]
           - [gentoo/stage3, systemd,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
           - [freebsd      ,    0   ,   master,      3,         default]
         testing_freebsd:
           active: true
@@ -3060,7 +3060,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
       semrel_files: *semrel_files_default
     node:
@@ -3118,7 +3118,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         archive]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         # Use this to start adopting the latest `platforms_matrix`
         use_tofs: true
         yamllint:
@@ -3201,7 +3201,7 @@ ssf:
           - [oraclelinux  ,    0   ,   master,      0,              '']
           - [gentoo/stage3,  latest,   master,      3,    mode-eq-none]
           - [gentoo/stage3, systemd,   master,      0,              '']
-          - [arch-base    ,    0   ,   3002.5,      0,              '']
+          - [arch-base    ,    0   ,   3003.0,      0,              '']
         use_tofs: true
         yamllint:
           ignore:
@@ -3249,7 +3249,7 @@ ssf:
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
           # Not configured at all for `arch-base`
           # https://wiki.archlinux.org/index.php/OpenLDAP
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_default
     openntpd:
       context:
@@ -3282,7 +3282,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
       semrel_files: *semrel_files_inc_map_jinja_verifier
     openssh:
       context:
@@ -3319,7 +3319,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.2,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
           - [freebsd      ,    0   ,   master,      3,         default]
           - [openbsd      ,    0   ,   3001.1,      3,         default]
         testing_freebsd:
@@ -3372,7 +3372,7 @@ ssf:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
           # # TODO: Fix 2 failing states in order to enable this
           # # - [freebsd      ,    0   ,   master,      3,         default]
           - [windows      ,    0   ,   latest,      3,         default]
@@ -3563,7 +3563,7 @@ ssf:
           - [oraclelinux  ,    8   ,   master,      0,         redhat8]
           - [oraclelinux  ,    7   ,   master,      0,          centos]
           - [gentoo/stage3,    0   ,   master,      0,          gentoo]
-          - [arch-base    ,    0   ,   3002.5,      0,            arch]
+          - [arch-base    ,    0   ,   3003.0,      0,            arch]
           - [windows      ,    0   ,   latest,      3,         windows]
         testing_windows:
           active: true
@@ -3665,7 +3665,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,          redhat]
           - [oraclelinux  ,    0   ,   master,      0,          redhat]
           # # - [gentoo/stage3,    0   ,   master,      0,          gentoo]
-          # # - [arch-base    ,    0   ,   3002.5,      0,            arch]
+          # # - [arch-base    ,    0   ,   3003.0,      0,            arch]
           - [freebsd      ,    0   ,   master,      3,         freebsd]
         testing_freebsd:
           active: true
@@ -3737,7 +3737,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
           - [freebsd      ,    0   ,   master,      3,         default]
           # # - [openbsd      ,    0   ,   3001.1,      3,         default]
           # # - [windows      ,    0   ,   latest,      3,         default]
@@ -3798,7 +3798,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         yamllint:
           ignore:
             additional:
@@ -3909,7 +3909,7 @@ ssf:
           # Gentoo (OpenRC): Service `proftpd' needs non existent service `net'
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
           - [gentoo/stage3, systemd,   master,      0,          gentoo]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         yamllint:
           ignore:
             additional:
@@ -3965,7 +3965,7 @@ ssf:
           # - [oraclelinux  ,    8   ,   master,      0,         default]
           # - [oraclelinux  ,    7   ,   master,      0,              '']
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
         yamllint:
           ignore:
@@ -4007,7 +4007,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.2,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_libsaltcli: true
         use_tofs: true
       semrel_files: *semrel_files_inc_map_jinja_verifier
@@ -4083,7 +4083,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,          redhat]
           - [oraclelinux  ,    0   ,   master,      0,          redhat]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         travis: *travis_do_not_use_single_job_for_linters
         use_tofs: true
       semrel_files: *semrel_files_default
@@ -4139,7 +4139,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         yamllint:
           ignore:
             additional:
@@ -4171,9 +4171,26 @@ ssf:
           0:
             includes:
               # [os           ,  os_ver, salt_ver, py_ver]
-              - [0            ,    0   ,   3002.5,      3]
-              - [freebsd      ,    0   ,   3002.6,      3]
+              - [0            ,    0   ,   3003.0,      3]
               - [windows      ,    0   ,   latest,      3]
+            inspec_yml:
+              summary: >-
+                Verify that Salt `v3003-py3` is setup and configured
+            provisioner:
+              pillars:
+                - '*':
+                    - .
+                    - v3003-py3
+              pillars_from_files:
+                - .sls: 'test/salt/pillar/salt.sls'
+                - v3003-py3.sls: 'test/salt/pillar/v3003-py3.sls'
+              state_top: *state_top_salt
+          1:
+            includes:
+              # [os           ,  os_ver, salt_ver, py_ver]
+              - [0            ,    0   ,   3002.6,      3]
+              - [0            ,    0   ,   3002.5,      3]
+              - [0            ,    0   ,   3002.2,      3]
             inspec_yml:
               summary: >-
                 Verify that Salt `v3002-py3` is setup and configured
@@ -4186,10 +4203,10 @@ ssf:
                 - .sls: 'test/salt/pillar/salt.sls'
                 - v3002-py3.sls: 'test/salt/pillar/v3002-py3.sls'
               state_top: *state_top_salt
-          1:
+          2:
             includes:
               # [os           ,  os_ver, salt_ver, py_ver]
-              - [0            ,    0   ,   3001.6,      3]
+              - [0            ,    0   ,   3001.7,      3]
               - [openbsd      ,    0   ,   3001.1,      3]
             inspec_yml:
               summary: >-
@@ -4203,10 +4220,10 @@ ssf:
                 - .sls: 'test/salt/pillar/salt.sls'
                 - v3001-py3.sls: 'test/salt/pillar/v3001-py3.sls'
               state_top: *state_top_salt
-          2:
+          3:
             includes:
               # [os           ,  os_ver, salt_ver, py_ver]
-              - [0            ,    0   ,   3000.8,      3]
+              - [0            ,    0   ,   3000.9,      3]
             inspec_yml:
               summary: >-
                 Verify that Salt `v3000-py3` is setup and configured
@@ -4219,10 +4236,10 @@ ssf:
                 - .sls: 'test/salt/pillar/salt.sls'
                 - v3000-py3.sls: 'test/salt/pillar/v3000-py3.sls'
               state_top: *state_top_salt
-          3:
+          4:
             includes:
               # [os           ,  os_ver, salt_ver, py_ver]
-              - [0            ,    0   ,   3000.8,      2]
+              - [0            ,    0   ,   3000.9,      2]
             inspec_yml:
               summary: >-
                 Verify that Salt `v3000-py2` is setup and configured
@@ -4236,6 +4253,7 @@ ssf:
                 - v3000-py2.sls: 'test/salt/pillar/v3000-py2.sls'
               state_top: *state_top_salt
         inspec_suites_matrix:
+          - v3003-py3
           - v3002-py3
           - v3001-py3
           - v3000-py3
@@ -4245,65 +4263,94 @@ ssf:
             import: ['salt_settings', 'formulas_settings']
         platforms_matrix:
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,   10   ,   3002.5,      3,       v3002-py3]
-          - [debian       ,    9   ,   3002.5,      3,       v3002-py3]
-          - [ubuntu       ,   20.04,   3002.5,      3,       v3002-py3]
-          - [ubuntu       ,   18.04,   3002.5,      3,       v3002-py3]
-          - [ubuntu       ,   16.04,   3002.5,      3,       v3002-py3]
-          - [centos       ,    8   ,   3002.5,      3,       v3002-py3]
-          - [centos       ,    7   ,   3002.5,      3,       v3002-py3]
-          - [fedora       ,   33   ,   3002.5,      3,       v3002-py3]
-          # # Still installs `3001.6-1.fc32`
-          # # - [fedora       ,   32   ,   3002.5,      3,       v3002-py3]
-          # # TODO: Fix when `3002.5` released
-          # - [opensuse/leap,   15.2 ,   3002.5,      3,       v3002-py3]
-          # - [opensuse/tmbl,  latest,   3002.5,      3,       v3002-py3]
+          ### `v3003-py3`
+          - [debian       ,   10   ,   3003.0,      3,       v3003-py3]
+          # - [debian       ,    9   ,   3003.0,      3,       v3003-py3]
+          - [ubuntu       ,   20.04,   3003.0,      3,       v3003-py3]
+          # - [ubuntu       ,   18.04,   3003.0,      3,       v3003-py3]
+          - [centos       ,    8   ,   3003.0,      3,       v3003-py3]
+          # - [centos       ,    7   ,   3003.0,      3,       v3003-py3]
+          # # No builds for `3003.0` yet, probably won't be available for `32`
+          # # - [fedora       ,   34   ,   3003.0,      3,       v3003-py3]
+          # # - [fedora       ,   33   ,   3003.0,      3,       v3003-py3]
+          # # - [fedora       ,   32   ,   3003.0,      3,       v3003-py3]
+          # # TODO: Fix when `3003.0` released
+          # # - [opensuse/leap,   15.2 ,   3003.0,      3,       v3003-py3]
+          # # - [opensuse/tmbl,  latest,   3003.0,      3,       v3003-py3]
+          - [amazonlinux  ,    2   ,   3003.0,      3,       v3003-py3]
+          - [oraclelinux  ,    8   ,   3003.0,      3,       v3003-py3]
+          # - [oraclelinux  ,    7   ,   3003.0,      3,       v3003-py3]
+          - [arch-base    ,  latest,   3003.0,      3,       v3003-py3]
+          - [gentoo/stage3,  latest,   3003.0,      3,       v3003-py3]
+          - [gentoo/stage3, systemd,   3003.0,      3,       v3003-py3]
+          - [windows      ,    0   ,   latest,      3,       v3003-py3]
+
+          ### `v3002-py3`
+          # - [debian       ,   10   ,   3002.6,      3,       v3002-py3]
+          - [debian       ,    9   ,   3002.6,      3,       v3002-py3]
+          # - [ubuntu       ,   20.04,   3002.6,      3,       v3002-py3]
+          - [ubuntu       ,   18.04,   3002.6,      3,       v3002-py3]
+          # - [ubuntu       ,   16.04,   3002.6,      3,       v3002-py3]
+          # - [centos       ,    8   ,   3002.6,      3,       v3002-py3]
+          - [centos       ,    7   ,   3002.6,      3,       v3002-py3]
+          - [fedora       ,   34   ,   3002.6,      3,       v3002-py3]
+          - [fedora       ,   33   ,   3002.6,      3,       v3002-py3]
+          # # Still installs `3001.X`
+          # # - [fedora       ,   32   ,   3002.6,      3,       v3002-py3]
+          # # Note, `3002.2` is the last in this series for openSUSE
           - [opensuse/leap,   15.2 ,   3002.2,      3,       v3002-py3]
           - [opensuse/tmbl,  latest,   3002.2,      3,       v3002-py3]
-          - [amazonlinux  ,    2   ,   3002.5,      3,       v3002-py3]
-          - [oraclelinux  ,    8   ,   3002.5,      3,       v3002-py3]
-          - [oraclelinux  ,    7   ,   3002.5,      3,       v3002-py3]
-          - [arch-base    ,  latest,   3002.5,      3,       v3002-py3]
-          - [gentoo/stage3,  latest,   3002.5,      3,       v3002-py3]
-          - [gentoo/stage3, systemd,   3002.5,      3,       v3002-py3]
+          - [amazonlinux  ,    2   ,   3002.6,      3,       v3002-py3]
+          # - [oraclelinux  ,    8   ,   3002.6,      3,       v3002-py3]
+          - [oraclelinux  ,    7   ,   3002.6,      3,       v3002-py3]
+          # # - [arch-base    ,  latest,   3002.6,      3,       v3002-py3]
+          # # Note, `3002.6` hasn't been released yet for Gentoo
+          # - [gentoo/stage3,  latest,   3002.5,      3,       v3002-py3]
+          # - [gentoo/stage3, systemd,   3002.5,      3,       v3002-py3]
           - [freebsd      ,    0   ,   3002.6,      3,       v3002-py3]
-          - [windows      ,    0   ,   latest,      3,       v3002-py3]
-          - [debian       ,   10   ,   3001.6,      3,       v3001-py3]
-          # - [debian       ,    9   ,   3001.6,      3,       v3001-py3]
-          - [ubuntu       ,   20.04,   3001.6,      3,       v3001-py3]
-          # - [ubuntu       ,   18.04,   3001.6,      3,       v3001-py3]
-          # - [ubuntu       ,   16.04,   3001.6,      3,       v3001-py3]
-          - [centos       ,    8   ,   3001.6,      3,       v3001-py3]
-          # - [centos       ,    7   ,   3001.6,      3,       v3001-py3]
+
+          ### `v3001-py3`
+          - [debian       ,   10   ,   3001.7,      3,       v3001-py3]
+          # - [debian       ,    9   ,   3001.7,      3,       v3001-py3]
+          - [ubuntu       ,   20.04,   3001.7,      3,       v3001-py3]
+          # - [ubuntu       ,   18.04,   3001.7,      3,       v3001-py3]
+          # - [ubuntu       ,   16.04,   3001.7,      3,       v3001-py3]
+          - [centos       ,    8   ,   3001.7,      3,       v3001-py3]
+          # - [centos       ,    7   ,   3001.7,      3,       v3001-py3]
           # # Probably doesn't work with Python 3.9
-          # # - [fedora       ,   33   ,   3001.6,      3,       v3001-py3]
-          - [fedora       ,   32   ,   3001.6,      3,       v3001-py3]
-          # # Installs `3002.5`
-          # # - [opensuse/leap,   15.2 ,   3001.6,      3,       v3001-py3]
-          # # - [opensuse/tmbl,  latest,   3001.6,      3,       v3001-py3]
-          # - [amazonlinux  ,    2   ,   3001.6,      3,       v3001-py3]
-          - [oraclelinux  ,    8   ,   3001.6,      3,       v3001-py3]
-          # - [oraclelinux  ,    7   ,   3001.6,      3,       v3001-py3]
-          # # - [arch-base    ,  latest,   3001.6,      3,       v3001-py3]
-          # - [gentoo/stage3,  latest,   3001.6,      3,       v3001-py3]
-          # - [gentoo/stage3, systemd,   3001.6,      3,       v3001-py3]
+          # # - [fedora       ,   34   ,   3001.7,      3,       v3001-py3]
+          # # - [fedora       ,   33   ,   3001.7,      3,       v3001-py3]
+          - [fedora       ,   32   ,   3001.7,      3,       v3001-py3]
+          # # Installs `3002.X`
+          # # - [opensuse/leap,   15.2 ,   3001.7,      3,       v3001-py3]
+          # # - [opensuse/tmbl,  latest,   3001.7,      3,       v3001-py3]
+          # - [amazonlinux  ,    2   ,   3001.7,      3,       v3001-py3]
+          - [oraclelinux  ,    8   ,   3001.7,      3,       v3001-py3]
+          # - [oraclelinux  ,    7   ,   3001.7,      3,       v3001-py3]
+          # # - [arch-base    ,  latest,   3001.7,      3,       v3001-py3]
+          # - [gentoo/stage3,  latest,   3001.7,      3,       v3001-py3]
+          # - [gentoo/stage3, systemd,   3001.7,      3,       v3001-py3]
           - [openbsd      ,    0   ,   3001.1,      3,       v3001-py3]
-          # - [debian       ,   10   ,   3000.8,      3,       v3000-py3]
-          - [debian       ,    9   ,   3000.8,      3,       v3000-py3]
-          - [ubuntu       ,   18.04,   3000.8,      3,       v3000-py3]
-          # - [ubuntu       ,   16.04,   3000.8,      3,       v3000-py3]
-          # - [centos       ,    8   ,   3000.8,      3,       v3000-py3]
-          - [centos       ,    7   ,   3000.8,      3,       v3000-py3]
-          # # Installs `3002.5`
-          # # - [opensuse/leap,   15.2 ,   3000.8,      3,       v3000-py3]
-          # - [amazonlinux  ,    2   ,   3000.8,      3,       v3000-py3]
-          # - [oraclelinux  ,    8   ,   3000.8,      3,       v3000-py3]
-          - [oraclelinux  ,    7   ,   3000.8,      3,       v3000-py3]
-          # - [gentoo/stage3,  latest,   3000.8,      3,       v3000-py3]
-          # - [gentoo/stage3, systemd,   3000.8,      3,       v3000-py3]
-          # - [ubuntu       ,   18.04,   3000.8,      2,       v3000-py2]
-          - [ubuntu       ,   16.04,   3000.8,      2,       v3000-py2]
-          # # - [arch-base    ,  latest,   3000.8,      2,       v3000-py2]
+
+          ### `v3000-py3`
+          # - [debian       ,   10   ,   3000.9,      3,       v3000-py3]
+          - [debian       ,    9   ,   3000.9,      3,       v3000-py3]
+          - [ubuntu       ,   18.04,   3000.9,      3,       v3000-py3]
+          # - [ubuntu       ,   16.04,   3000.9,      3,       v3000-py3]
+          # - [centos       ,    8   ,   3000.9,      3,       v3000-py3]
+          - [centos       ,    7   ,   3000.9,      3,       v3000-py3]
+          # # Installs `3002.X`
+          # # - [opensuse/leap,   15.2 ,   3000.9,      3,       v3000-py3]
+          # - [amazonlinux  ,    2   ,   3000.9,      3,       v3000-py3]
+          # - [oraclelinux  ,    8   ,   3000.9,      3,       v3000-py3]
+          - [oraclelinux  ,    7   ,   3000.9,      3,       v3000-py3]
+          # - [gentoo/stage3,  latest,   3000.9,      3,       v3000-py3]
+          # - [gentoo/stage3, systemd,   3000.9,      3,       v3000-py3]
+
+          ### `v3000-py2`
+          # - [ubuntu       ,   18.04,   3000.9,      2,       v3000-py2]
+          - [ubuntu       ,   16.04,   3000.9,      2,       v3000-py2]
+          # # - [arch-base    ,  latest,   3000.9,      2,       v3000-py2]
         testing_freebsd:
           active: true
         testing_openbsd:
@@ -4313,7 +4360,7 @@ ssf:
           github:
             platforms:
               provisioner:
-                salt_bootstrap_options: '-pythonVersion 3 -version 3002.5'
+                salt_bootstrap_options: '-pythonVersion 3 -version 3003'
           winrepo_ng: ['salt-minion-py3']
         use_tofs: true
         yamllint:
@@ -4569,7 +4616,7 @@ ssf:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    8   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         yamllint:
           ignore:
             additional:
@@ -4694,7 +4741,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
       semrel_files: *semrel_files_default
     telegraf:
@@ -4725,7 +4772,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
       semrel_files: *semrel_files_default
     template:
@@ -4789,7 +4836,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    0   ,   master,      0,         default]
           - [gentoo/stage3,    0   ,   master,      0,          gentoo]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_libsaltcli: true
         use_tofs: true
       semrel_files:
@@ -4930,7 +4977,7 @@ ssf:
           - [oraclelinux  ,    8   ,   master,      0,         default]
           - [oraclelinux  ,    7   ,   master,      0,    without-ipv6]
           - [gentoo/stage3,    0   ,   master,      0,    without-ipv6]
-          - [arch-base    ,    0   ,   3002.5,      0,    without-ipv6]
+          - [arch-base    ,    0   ,   3003.0,      0,    without-ipv6]
         use_tofs: true
       semrel_files: *semrel_files_default
     users:
@@ -4989,7 +5036,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,           vimrc]
           - [oraclelinux  ,    0   ,   master,      0,           vimrc]
           # # - [gentoo/stage3,    0   ,   master,      0,           vimrc]
-          # # - [arch-base    ,    0   ,   3002.5,      0,           vimrc]
+          # # - [arch-base    ,    0   ,   3003.0,      0,           vimrc]
       semrel_files: *semrel_files_default
     varnish:
       context:
@@ -5051,7 +5098,7 @@ ssf:
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           - [oraclelinux  ,    8   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          - [arch-base    ,    0   ,   3002.5,      0,         default]
+          - [arch-base    ,    0   ,   3003.0,      0,         default]
         # TODO: Upgrade to latest TOFS in a subsequent PR, since a legacy version
         # is active for the time being (needs to be checked for regressions)
         use_tofs: legacy
@@ -5116,7 +5163,7 @@ ssf:
           - [amazonlinux  ,    0   ,   master,      0,              '']
           - [oraclelinux  ,    0   ,   master,      0,              '']
           # # - [gentoo/stage3,    0   ,   master,      0,              '']
-          - [arch-base    ,    0   ,   3002.5,      0,              '']
+          - [arch-base    ,    0   ,   3003.0,      0,              '']
       semrel_files: *semrel_files_default
     vim:
       context:
@@ -5197,7 +5244,7 @@ ssf:
           # # - [amazonlinux  ,    0   ,   master,      0,         default]
           # # - [oraclelinux  ,    0   ,   master,      0,         default]
           # # - [gentoo/stage3,    0   ,   master,      0,         default]
-          # # - [arch-base    ,    0   ,   3002.5,      0,         default]
+          # # - [arch-base    ,    0   ,   3003.0,      0,         default]
         use_tofs: true
         yamllint:
           rules:
diff --git a/ssf/libcimatrix.jinja b/ssf/libcimatrix.jinja
index cb9d3ed5..c0bc7dcd 100644
--- a/ssf/libcimatrix.jinja
+++ b/ssf/libcimatrix.jinja
@@ -170,7 +170,7 @@
 {%-                 set comment = '# ' %}
 {#-                 Only include commented instances from the main platforms #}
 {#-                 Otherwise only use the first suite for the other platforms #}
-{%-                 if not (salt_ver == 'master' or [os, salt_ver] == ['arch-base', 3002.5]) %}
+{%-                 if not (salt_ver == 'master' or [os, salt_ver] == ['arch-base', 3003.0]) %}
 {%-                   if platform not in commented_platform_done %}
 {%-                     do commented_platform_done.append(platform) %}
 {%-                   else %}