diff --git a/addons/containerd/1.5.10/Manifest b/addons/containerd/1.5.10/Manifest
index 4c3ac774f9..2a6b3b6e99 100644
--- a/addons/containerd/1.5.10/Manifest
+++ b/addons/containerd/1.5.10/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.5.10
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.5.10
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.5.10
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.5.10
 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.5.10
diff --git a/addons/containerd/1.5.10/host-preflight.yaml b/addons/containerd/1.5.10/host-preflight.yaml
index 3dc15f5696..5449373bb2 100644
--- a/addons/containerd/1.5.10/host-preflight.yaml
+++ b/addons/containerd/1.5.10/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.5.11/Manifest b/addons/containerd/1.5.11/Manifest
index 340c973e73..0056eeeb14 100644
--- a/addons/containerd/1.5.11/Manifest
+++ b/addons/containerd/1.5.11/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.5.11
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.5.11
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.5.11
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.5.11
 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.5.11
diff --git a/addons/containerd/1.5.11/host-preflight.yaml b/addons/containerd/1.5.11/host-preflight.yaml
index 3dc15f5696..5449373bb2 100644
--- a/addons/containerd/1.5.11/host-preflight.yaml
+++ b/addons/containerd/1.5.11/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.10/Manifest b/addons/containerd/1.6.10/Manifest
index a332365a7d..11664281d8 100644
--- a/addons/containerd/1.6.10/Manifest
+++ b/addons/containerd/1.6.10/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.10
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.10
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.10
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.10
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.10
diff --git a/addons/containerd/1.6.10/host-preflight.yaml b/addons/containerd/1.6.10/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.10/host-preflight.yaml
+++ b/addons/containerd/1.6.10/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.11/Manifest b/addons/containerd/1.6.11/Manifest
index b6ca7daadf..6a542cfa98 100644
--- a/addons/containerd/1.6.11/Manifest
+++ b/addons/containerd/1.6.11/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.11
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.11
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.11
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.11
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.11
diff --git a/addons/containerd/1.6.11/host-preflight.yaml b/addons/containerd/1.6.11/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.11/host-preflight.yaml
+++ b/addons/containerd/1.6.11/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.12/Manifest b/addons/containerd/1.6.12/Manifest
index 2ea5250a36..1aa6d55f33 100644
--- a/addons/containerd/1.6.12/Manifest
+++ b/addons/containerd/1.6.12/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.12
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.12
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.12
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.12
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.12
diff --git a/addons/containerd/1.6.12/host-preflight.yaml b/addons/containerd/1.6.12/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.12/host-preflight.yaml
+++ b/addons/containerd/1.6.12/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.13/Manifest b/addons/containerd/1.6.13/Manifest
index db26ce1924..bcd0feb3c9 100644
--- a/addons/containerd/1.6.13/Manifest
+++ b/addons/containerd/1.6.13/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.13
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.13
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.13
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.13
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.13
diff --git a/addons/containerd/1.6.13/host-preflight.yaml b/addons/containerd/1.6.13/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.13/host-preflight.yaml
+++ b/addons/containerd/1.6.13/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.14/Manifest b/addons/containerd/1.6.14/Manifest
index f7d9e7f6c9..5fb6d29ac9 100644
--- a/addons/containerd/1.6.14/Manifest
+++ b/addons/containerd/1.6.14/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.14
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.14
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.14
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.14
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.14
diff --git a/addons/containerd/1.6.14/host-preflight.yaml b/addons/containerd/1.6.14/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.14/host-preflight.yaml
+++ b/addons/containerd/1.6.14/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.15/Manifest b/addons/containerd/1.6.15/Manifest
index 64ec070325..f5bf4a135f 100644
--- a/addons/containerd/1.6.15/Manifest
+++ b/addons/containerd/1.6.15/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.15
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.15
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.15
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.15
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.15
diff --git a/addons/containerd/1.6.15/host-preflight.yaml b/addons/containerd/1.6.15/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.15/host-preflight.yaml
+++ b/addons/containerd/1.6.15/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.16/Manifest b/addons/containerd/1.6.16/Manifest
index 1fb9e32825..567e3f71b2 100644
--- a/addons/containerd/1.6.16/Manifest
+++ b/addons/containerd/1.6.16/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.16
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.16
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.16
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.16
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.16
diff --git a/addons/containerd/1.6.16/host-preflight.yaml b/addons/containerd/1.6.16/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.16/host-preflight.yaml
+++ b/addons/containerd/1.6.16/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.18/Manifest b/addons/containerd/1.6.18/Manifest
index 9050633b6b..50368c8792 100644
--- a/addons/containerd/1.6.18/Manifest
+++ b/addons/containerd/1.6.18/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.18
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.18
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.18
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.18
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.18
diff --git a/addons/containerd/1.6.18/host-preflight.yaml b/addons/containerd/1.6.18/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.18/host-preflight.yaml
+++ b/addons/containerd/1.6.18/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.19/Manifest b/addons/containerd/1.6.19/Manifest
index f0babec074..2d4ab49938 100644
--- a/addons/containerd/1.6.19/Manifest
+++ b/addons/containerd/1.6.19/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.19
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.19
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.19
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.19
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.19
diff --git a/addons/containerd/1.6.19/host-preflight.yaml b/addons/containerd/1.6.19/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.19/host-preflight.yaml
+++ b/addons/containerd/1.6.19/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.20/Manifest b/addons/containerd/1.6.20/Manifest
index ba84fe993b..d54ab228c8 100644
--- a/addons/containerd/1.6.20/Manifest
+++ b/addons/containerd/1.6.20/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.20
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.20
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.20
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.20
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.20
diff --git a/addons/containerd/1.6.20/host-preflight.yaml b/addons/containerd/1.6.20/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.20/host-preflight.yaml
+++ b/addons/containerd/1.6.20/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.21/Manifest b/addons/containerd/1.6.21/Manifest
index 7c3b21784b..55836a76db 100644
--- a/addons/containerd/1.6.21/Manifest
+++ b/addons/containerd/1.6.21/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.21
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.21
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.21
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.21
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.21/host-preflight.yaml b/addons/containerd/1.6.21/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.21/host-preflight.yaml
+++ b/addons/containerd/1.6.21/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.22/Manifest b/addons/containerd/1.6.22/Manifest
index aff68db5cf..3d65730c5c 100644
--- a/addons/containerd/1.6.22/Manifest
+++ b/addons/containerd/1.6.22/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.22
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.22
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.22
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.22
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.22/host-preflight.yaml b/addons/containerd/1.6.22/host-preflight.yaml
index 4cde19ff3f..4f53298f43 100644
--- a/addons/containerd/1.6.22/host-preflight.yaml
+++ b/addons/containerd/1.6.22/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.24/Manifest b/addons/containerd/1.6.24/Manifest
index b516e21705..9bf0f538ef 100644
--- a/addons/containerd/1.6.24/Manifest
+++ b/addons/containerd/1.6.24/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.24
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.24
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.24
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.24
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.24/host-preflight.yaml b/addons/containerd/1.6.24/host-preflight.yaml
index 8130a9ef49..adb0c82f0e 100644
--- a/addons/containerd/1.6.24/host-preflight.yaml
+++ b/addons/containerd/1.6.24/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.25/Manifest b/addons/containerd/1.6.25/Manifest
index 9bfae706fd..a3052e7433 100644
--- a/addons/containerd/1.6.25/Manifest
+++ b/addons/containerd/1.6.25/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.25
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.25
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.25
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.25
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.25/host-preflight.yaml b/addons/containerd/1.6.25/host-preflight.yaml
index 0953e44c43..35d7603c00 100644
--- a/addons/containerd/1.6.25/host-preflight.yaml
+++ b/addons/containerd/1.6.25/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.26/Manifest b/addons/containerd/1.6.26/Manifest
index 3b283ea36e..4b2f7cd5ab 100644
--- a/addons/containerd/1.6.26/Manifest
+++ b/addons/containerd/1.6.26/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.26
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.26
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.26
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.26
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.26/host-preflight.yaml b/addons/containerd/1.6.26/host-preflight.yaml
index b8ef431bb5..628a2f3623 100644
--- a/addons/containerd/1.6.26/host-preflight.yaml
+++ b/addons/containerd/1.6.26/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.27/Manifest b/addons/containerd/1.6.27/Manifest
index 0d0e0ba262..24105e269f 100644
--- a/addons/containerd/1.6.27/Manifest
+++ b/addons/containerd/1.6.27/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.27
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.27
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.27
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.27
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.27/host-preflight.yaml b/addons/containerd/1.6.27/host-preflight.yaml
index 5d0e4c6491..d4674227e9 100644
--- a/addons/containerd/1.6.27/host-preflight.yaml
+++ b/addons/containerd/1.6.27/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.28/Manifest b/addons/containerd/1.6.28/Manifest
index c8ee3b09f9..9a26074ade 100644
--- a/addons/containerd/1.6.28/Manifest
+++ b/addons/containerd/1.6.28/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.28
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.28
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.28
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.28
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.28/host-preflight.yaml b/addons/containerd/1.6.28/host-preflight.yaml
index 615311705d..d80f889335 100644
--- a/addons/containerd/1.6.28/host-preflight.yaml
+++ b/addons/containerd/1.6.28/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.31/Manifest b/addons/containerd/1.6.31/Manifest
index 1cce76c7d6..d652324cd0 100644
--- a/addons/containerd/1.6.31/Manifest
+++ b/addons/containerd/1.6.31/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.31
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.31
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.31
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.31
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.31/host-preflight.yaml b/addons/containerd/1.6.31/host-preflight.yaml
index 5de3f343d8..af613f264e 100644
--- a/addons/containerd/1.6.31/host-preflight.yaml
+++ b/addons/containerd/1.6.31/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.32/host-preflight.yaml b/addons/containerd/1.6.32/host-preflight.yaml
index 179fc2c88a..72a0503e62 100644
--- a/addons/containerd/1.6.32/host-preflight.yaml
+++ b/addons/containerd/1.6.32/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.33/Manifest b/addons/containerd/1.6.33/Manifest
index 9361f3cf6e..4cccea3ce5 100644
--- a/addons/containerd/1.6.33/Manifest
+++ b/addons/containerd/1.6.33/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.33
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.33
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.32
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.33
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
diff --git a/addons/containerd/1.6.33/host-preflight.yaml b/addons/containerd/1.6.33/host-preflight.yaml
index 41b84f1916..60ecb69df6 100644
--- a/addons/containerd/1.6.33/host-preflight.yaml
+++ b/addons/containerd/1.6.33/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - warn:
               when: "centos = 8"
               message: "containerd addon supports centos 8, but only up to containerd 1.6.32, which will be installed instead of 1.6.33"
diff --git a/addons/containerd/1.6.4/Manifest b/addons/containerd/1.6.4/Manifest
index 43e417e6c0..feed9948df 100644
--- a/addons/containerd/1.6.4/Manifest
+++ b/addons/containerd/1.6.4/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.4
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.4
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.4
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.4
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.4
diff --git a/addons/containerd/1.6.4/host-preflight.yaml b/addons/containerd/1.6.4/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.4/host-preflight.yaml
+++ b/addons/containerd/1.6.4/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.6/Manifest b/addons/containerd/1.6.6/Manifest
index 308dd0815e..66e9232ed2 100644
--- a/addons/containerd/1.6.6/Manifest
+++ b/addons/containerd/1.6.6/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.6
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.6
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.6
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.6
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.6
diff --git a/addons/containerd/1.6.6/host-preflight.yaml b/addons/containerd/1.6.6/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.6/host-preflight.yaml
+++ b/addons/containerd/1.6.6/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.7/Manifest b/addons/containerd/1.6.7/Manifest
index 8027e96be2..b646f941e3 100644
--- a/addons/containerd/1.6.7/Manifest
+++ b/addons/containerd/1.6.7/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.7
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.7
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.7
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.7
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.7
diff --git a/addons/containerd/1.6.7/host-preflight.yaml b/addons/containerd/1.6.7/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.7/host-preflight.yaml
+++ b/addons/containerd/1.6.7/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.8/Manifest b/addons/containerd/1.6.8/Manifest
index 6ca0887352..999b0ab4a4 100644
--- a/addons/containerd/1.6.8/Manifest
+++ b/addons/containerd/1.6.8/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.8
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.8
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.8
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.8
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.8
diff --git a/addons/containerd/1.6.8/host-preflight.yaml b/addons/containerd/1.6.8/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.8/host-preflight.yaml
+++ b/addons/containerd/1.6.8/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"
diff --git a/addons/containerd/1.6.9/Manifest b/addons/containerd/1.6.9/Manifest
index 8975762826..b43663a832 100644
--- a/addons/containerd/1.6.9/Manifest
+++ b/addons/containerd/1.6.9/Manifest
@@ -1,5 +1,7 @@
 yum libzstd
 asset runc https://github.com/opencontainers/runc/releases/download/v1.1.13/runc.amd64
+dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.9
+dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.9
 dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.9
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.9
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.9
diff --git a/addons/containerd/1.6.9/host-preflight.yaml b/addons/containerd/1.6.9/host-preflight.yaml
index c1f81e5cca..3205020404 100644
--- a/addons/containerd/1.6.9/host-preflight.yaml
+++ b/addons/containerd/1.6.9/host-preflight.yaml
@@ -8,6 +8,15 @@ spec:
   analyzers:
     - hostOS:
         outcomes:
+          - pass:
+              when: "centos = 7"
+              message: "containerd addon supports centos 7"
+          - pass:
+              when: "rhel = 7"
+              message: "containerd addon supports rhel 7"
+          - pass:
+              when: "ol = 7"
+              message: "containerd addon supports ol 7"
           - pass:
               when: "centos = 8"
               message: "containerd addon supports centos 8"