diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-4.2.0-rc8.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-4.2.0-rc8.tgz
new file mode 100644
index 0000000000..ce2fe092c4
Binary files /dev/null and b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-4.2.0-rc8.tgz differ
diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-4.2.0-rc8.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-4.2.0-rc8.tgz
new file mode 100644
index 0000000000..68aa0a5cd0
Binary files /dev/null and b/assets/rancher-cis-benchmark/rancher-cis-benchmark-4.2.0-rc8.tgz differ
diff --git a/charts/rancher-cis-benchmark-crd/4.2.0-rc8/Chart.yaml b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/Chart.yaml
new file mode 100644
index 0000000000..50e3de5fa8
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/Chart.yaml
@@ -0,0 +1,10 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/namespace: cis-operator-system
+  catalog.cattle.io/release-name: rancher-cis-benchmark-crd
+apiVersion: v1
+description: Installs the CRDs for rancher-cis-benchmark.
+name: rancher-cis-benchmark-crd
+type: application
+version: 4.2.0-rc8
diff --git a/charts/rancher-cis-benchmark-crd/4.2.0-rc8/README.md b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/README.md
new file mode 100644
index 0000000000..f6d9ef621f
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/README.md
@@ -0,0 +1,2 @@
+# rancher-cis-benchmark-crd
+A Rancher chart that installs the CRDs used by rancher-cis-benchmark.
diff --git a/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscan.yaml b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscan.yaml
new file mode 100644
index 0000000000..3cbb0ffcd3
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscan.yaml
@@ -0,0 +1,148 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscans.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScan
+    plural: clusterscans
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .status.lastRunScanProfileName
+      name: ClusterScanProfile
+      type: string
+    - jsonPath: .status.summary.total
+      name: Total
+      type: string
+    - jsonPath: .status.summary.pass
+      name: Pass
+      type: string
+    - jsonPath: .status.summary.fail
+      name: Fail
+      type: string
+    - jsonPath: .status.summary.skip
+      name: Skip
+      type: string
+    - jsonPath: .status.summary.warn
+      name: Warn
+      type: string
+    - jsonPath: .status.summary.notApplicable
+      name: Not Applicable
+      type: string
+    - jsonPath: .status.lastRunTimestamp
+      name: LastRunTimestamp
+      type: string
+    - jsonPath: .spec.scheduledScanConfig.cronSchedule
+      name: CronSchedule
+      type: string
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              scanProfileName:
+                nullable: true
+                type: string
+              scheduledScanConfig:
+                nullable: true
+                properties:
+                  cronSchedule:
+                    nullable: true
+                    type: string
+                  retentionCount:
+                    type: integer
+                  scanAlertRule:
+                    nullable: true
+                    properties:
+                      alertOnComplete:
+                        type: boolean
+                      alertOnFailure:
+                        type: boolean
+                    type: object
+                type: object
+              scoreWarning:
+                enum:
+                - pass
+                - fail
+                nullable: true
+                type: string
+            type: object
+          status:
+            properties:
+              NextScanAt:
+                nullable: true
+                type: string
+              ScanAlertingRuleName:
+                nullable: true
+                type: string
+              conditions:
+                items:
+                  properties:
+                    lastTransitionTime:
+                      nullable: true
+                      type: string
+                    lastUpdateTime:
+                      nullable: true
+                      type: string
+                    message:
+                      nullable: true
+                      type: string
+                    reason:
+                      nullable: true
+                      type: string
+                    status:
+                      nullable: true
+                      type: string
+                    type:
+                      nullable: true
+                      type: string
+                  type: object
+                nullable: true
+                type: array
+              display:
+                nullable: true
+                properties:
+                  error:
+                    type: boolean
+                  message:
+                    nullable: true
+                    type: string
+                  state:
+                    nullable: true
+                    type: string
+                  transitioning:
+                    type: boolean
+                type: object
+              lastRunScanProfileName:
+                nullable: true
+                type: string
+              lastRunTimestamp:
+                nullable: true
+                type: string
+              observedGeneration:
+                type: integer
+              summary:
+                nullable: true
+                properties:
+                  fail:
+                    type: integer
+                  notApplicable:
+                    type: integer
+                  pass:
+                    type: integer
+                  skip:
+                    type: integer
+                  total:
+                    type: integer
+                  warn:
+                    type: integer
+                type: object
+            type: object
+        type: object
diff --git a/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanbenchmark.yaml b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanbenchmark.yaml
new file mode 100644
index 0000000000..fd291f8c33
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanbenchmark.yaml
@@ -0,0 +1,54 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscanbenchmarks.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScanBenchmark
+    plural: clusterscanbenchmarks
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.clusterProvider
+      name: ClusterProvider
+      type: string
+    - jsonPath: .spec.minKubernetesVersion
+      name: MinKubernetesVersion
+      type: string
+    - jsonPath: .spec.maxKubernetesVersion
+      name: MaxKubernetesVersion
+      type: string
+    - jsonPath: .spec.customBenchmarkConfigMapName
+      name: customBenchmarkConfigMapName
+      type: string
+    - jsonPath: .spec.customBenchmarkConfigMapNamespace
+      name: customBenchmarkConfigMapNamespace
+      type: string
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              clusterProvider:
+                nullable: true
+                type: string
+              customBenchmarkConfigMapName:
+                nullable: true
+                type: string
+              customBenchmarkConfigMapNamespace:
+                nullable: true
+                type: string
+              maxKubernetesVersion:
+                nullable: true
+                type: string
+              minKubernetesVersion:
+                nullable: true
+                type: string
+            type: object
+        type: object
diff --git a/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanprofile.yaml b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanprofile.yaml
new file mode 100644
index 0000000000..1e75501b7c
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanprofile.yaml
@@ -0,0 +1,36 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscanprofiles.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScanProfile
+    plural: clusterscanprofiles
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              benchmarkVersion:
+                nullable: true
+                type: string
+              skipTests:
+                items:
+                  nullable: true
+                  type: string
+                nullable: true
+                type: array
+            type: object
+        type: object
+    additionalPrinterColumns:
+    - jsonPath: .spec.benchmarkVersion
+      name: BenchmarkVersion
+      type: string
diff --git a/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanreport.yaml b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanreport.yaml
new file mode 100644
index 0000000000..6e8c0b7de5
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/4.2.0-rc8/templates/clusterscanreport.yaml
@@ -0,0 +1,39 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscanreports.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScanReport
+    plural: clusterscanreports
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.lastRunTimestamp
+      name: LastRunTimestamp
+      type: string
+    - jsonPath: .spec.benchmarkVersion
+      name: BenchmarkVersion
+      type: string
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              benchmarkVersion:
+                nullable: true
+                type: string
+              lastRunTimestamp:
+                nullable: true
+                type: string
+              reportJSON:
+                nullable: true
+                type: string
+            type: object
+        type: object
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/Chart.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/Chart.yaml
new file mode 100644
index 0000000000..78cddde89f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/Chart.yaml
@@ -0,0 +1,22 @@
+annotations:
+  catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: CIS Benchmark
+  catalog.cattle.io/kube-version: '>= 1.21.0-0 < 1.27.0-0'
+  catalog.cattle.io/namespace: cis-operator-system
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux,windows
+  catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1
+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
+  catalog.cattle.io/release-name: rancher-cis-benchmark
+  catalog.cattle.io/type: cluster-tool
+  catalog.cattle.io/ui-component: rancher-cis-benchmark
+apiVersion: v1
+appVersion: v4.2.0-rc8
+description: The cis-operator enables running CIS benchmark security scans on a kubernetes
+  cluster
+icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
+keywords:
+- security
+name: rancher-cis-benchmark
+version: 4.2.0-rc8
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/README.md b/charts/rancher-cis-benchmark/4.2.0-rc8/README.md
new file mode 100644
index 0000000000..50beab58ba
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/README.md
@@ -0,0 +1,9 @@
+# Rancher CIS Benchmark Chart
+
+The cis-operator enables running CIS benchmark security scans on a kubernetes cluster and generate compliance reports that can be downloaded.
+
+# Installation
+
+```
+helm install rancher-cis-benchmark ./ --create-namespace -n cis-operator-system
+```
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/app-readme.md b/charts/rancher-cis-benchmark/4.2.0-rc8/app-readme.md
new file mode 100644
index 0000000000..147e91ea2e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/app-readme.md
@@ -0,0 +1,33 @@
+# Rancher CIS Benchmarks
+
+This chart enables security scanning of the cluster using [CIS (Center for Internet Security) benchmarks](https://www.cisecurity.org/benchmark/kubernetes/).
+
+For more information on how to use the feature, refer to our [docs](https://rancher.com/docs/rancher/v2.x/en/cis-scans/v2.5/).
+
+This chart installs the following components:
+
+- [cis-operator](https://github.com/rancher/cis-operator) - The cis-operator handles launching the [kube-bench](https://github.com/aquasecurity/kube-bench) tool that runs a suite of CIS tests on the nodes of your Kubernetes cluster. After scans finish, the cis-operator generates a compliance report that can be downloaded.
+- Scans - A scan is a CRD (`ClusterScan`) that defines when to trigger CIS scans on the cluster based on the defined profile. A report is created after the scan is completed.
+- Profiles - A profile is a CRD (`ClusterScanProfile`) that defines the configuration for the CIS scan, which is the benchmark versions to use and any specific tests to skip in that benchmark. This chart installs a few default `ClusterScanProfile` custom resources with no skipped tests, which can immediately be used to launch CIS scans.
+- Benchmark Versions - A benchmark version is a CRD (`ClusterScanBenchmark`) that defines the CIS benchmark version to run using kube-bench as well as the valid configuration parameters for that benchmark. This chart installs a few default `ClusterScanBenchmark` custom resources.
+- Alerting Resources - Rancher's CIS Benchmark application lets you run a cluster scan on a schedule, and send alerts when scans finish.
+    - If you want to enable alerts to be delivered when a cluster scan completes, you need to ensure that [Rancher's Monitoring and Alerting](https://rancher.com/docs/rancher/v2.x/en/monitoring-alerting/v2.5/) application is pre-installed and the [Receivers and Routes](https://rancher.com/docs/rancher/v2.x/en/monitoring-alerting/v2.5/configuration/#alertmanager-config) are configured to send out alerts.
+    - Additionally, you need to set `alerts: true` in the Values YAML while installing or upgrading this chart.
+
+## Upgrading to Kubernetes v1.25+
+
+Starting in Kubernetes v1.25, [Pod Security Policies](https://kubernetes.io/docs/concepts/security/pod-security-policy/) have been removed from the Kubernetes API.
+
+As a result, **before upgrading to Kubernetes v1.25** (or on a fresh install in a Kubernetes v1.25+ cluster), users are expected to perform an in-place upgrade of this chart with `global.cattle.psp.enabled` set to `false` if it has been previously set to `true`.
+
+> **Note:**
+> In this chart release, any previous field that was associated with any PSP resources have been removed in favor of a single global field: `global.cattle.psp.enabled`.
+
+> **Note:**
+> If you upgrade your cluster to Kubernetes v1.25+ before removing PSPs via a `helm upgrade` (even if you manually clean up resources), **it will leave the Helm release in a broken state within the cluster such that further Helm operations will not work (`helm uninstall`, `helm upgrade`, etc.).**
+>
+> If your charts get stuck in this state, please consult the Rancher docs on how to clean up your Helm release secrets.
+
+Upon setting `global.cattle.psp.enabled` to false, the chart will remove any PSP resources deployed on its behalf from the cluster. This is the default setting for this chart.
+
+As a replacement for PSPs, [Pod Security Admission](https://kubernetes.io/docs/concepts/security/pod-security-admission/) should be used. Please consult the Rancher docs for more details on how to configure your chart release namespaces to work with the new Pod Security Admission and apply Pod Security Standards.
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/_helpers.tpl b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/_helpers.tpl
new file mode 100644
index 0000000000..b7bb000422
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/_helpers.tpl
@@ -0,0 +1,27 @@
+{{/* Ensure namespace is set the same everywhere */}}
+{{- define "cis.namespace" -}}
+  {{- .Release.Namespace | default "cis-operator-system" -}}
+{{- end -}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Windows cluster will add default taint for linux nodes,
+add below linux tolerations to workloads could be scheduled to those linux nodes
+*/}}
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
+
+{{- define "linux-node-selector" -}}
+kubernetes.io/os: linux
+{{- end -}}
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/alertingrule.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/alertingrule.yaml
new file mode 100644
index 0000000000..1787c88a07
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/alertingrule.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.alerts.enabled -}}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: rancher-cis-pod-monitor
+  namespace: {{ template "cis.namespace" . }}
+spec:
+  selector:
+    matchLabels:
+      cis.cattle.io/operator: cis-operator
+  podMetricsEndpoints:
+  - port: cismetrics
+{{- end }}
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-aks-1.0.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-aks-1.0.yaml
new file mode 100644
index 0000000000..1ac866253f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-aks-1.0.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: aks-1.0
+spec:
+  clusterProvider: aks
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.20.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.20.yaml
new file mode 100644
index 0000000000..1203e5bcc5
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.20.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.20
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.23.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.23.yaml
new file mode 100644
index 0000000000..83002966d8
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.23.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.23
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.24.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.24.yaml
new file mode 100644
index 0000000000..ad73b2c34c
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.24.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.24
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.5.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.5.yaml
new file mode 100644
index 0000000000..c9e6075fb4
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.5.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.5
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.6.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.6.yaml
new file mode 100644
index 0000000000..4f5d66e92f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.6.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.6
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.7.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.7.yaml
new file mode 100644
index 0000000000..4f6e41b9da
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-cis-1.7.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.7
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-eks-1.0.1.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-eks-1.0.1.yaml
new file mode 100644
index 0000000000..d1ba9d2954
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-eks-1.0.1.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: eks-1.0.1
+spec:
+  clusterProvider: eks
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-gke-1.2.0.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-gke-1.2.0.yaml
new file mode 100644
index 0000000000..c609e736fd
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-gke-1.2.0.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: gke-1.2.0
+spec:
+  clusterProvider: gke
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.20-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.20-hardened.yaml
new file mode 100644
index 0000000000..147cac3906
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.20-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.20-hardened
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.20-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.20-permissive.yaml
new file mode 100644
index 0000000000..d9584f7229
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.20-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.20-permissive
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.23-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.23-hardened.yaml
new file mode 100644
index 0000000000..1a928db35c
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.23-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.23-hardened
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.23-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.23-permissive.yaml
new file mode 100644
index 0000000000..5a46787d51
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.23-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.23-permissive
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.24-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.24-hardened.yaml
new file mode 100644
index 0000000000..47b6be197a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.24-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.24-hardened
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.24-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.24-permissive.yaml
new file mode 100644
index 0000000000..6ded2f02bd
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.24-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.24-permissive
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.6-hardened.yaml
new file mode 100644
index 0000000000..5160cf7950
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.6-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.6-hardened
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.6-permissive.yaml
new file mode 100644
index 0000000000..10c0759853
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.6-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.6-permissive
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.7-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.7-hardened.yaml
new file mode 100644
index 0000000000..7dd99a0ecf
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.7-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.7-hardened
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.7-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.7-permissive.yaml
new file mode 100644
index 0000000000..187056d5f6
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-k3s-cis-1.7-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.7-permissive
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.20-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.20-hardened.yaml
new file mode 100644
index 0000000000..4924679cb3
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.20-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.20-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.20-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.20-permissive.yaml
new file mode 100644
index 0000000000..2db66d7c62
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.20-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.20-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.23-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.23-hardened.yaml
new file mode 100644
index 0000000000..12de23173d
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.23-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.23-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.23-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.23-permissive.yaml
new file mode 100644
index 0000000000..f9d5052541
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.23-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.23-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.24-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.24-hardened.yaml
new file mode 100644
index 0000000000..7030c793fc
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.24-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.24-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.24-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.24-permissive.yaml
new file mode 100644
index 0000000000..b2633eade1
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.24-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.24-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.5-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.5-hardened.yaml
new file mode 100644
index 0000000000..b9154f1ada
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.5-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.5-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.5-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.5-permissive.yaml
new file mode 100644
index 0000000000..9da65d55dd
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.5-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.5-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.6-hardened.yaml
new file mode 100644
index 0000000000..77f8a31df6
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.6-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.6-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.6-permissive.yaml
new file mode 100644
index 0000000000..600b8df35a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.6-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.6-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.7-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.7-hardened.yaml
new file mode 100644
index 0000000000..0fe73b6ceb
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.7-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.7-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.7-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.7-permissive.yaml
new file mode 100644
index 0000000000..bc54955721
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke-cis-1.7-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.7-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.20-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.20-hardened.yaml
new file mode 100644
index 0000000000..b6cc88359c
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.20-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.20-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.20-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.20-permissive.yaml
new file mode 100644
index 0000000000..fd898bfe86
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.20-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.20-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.23-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.23-hardened.yaml
new file mode 100644
index 0000000000..55d96da59d
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.23-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.23-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.23-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.23-permissive.yaml
new file mode 100644
index 0000000000..55fffe3209
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.23-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.23-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.22.0"
+  maxKubernetesVersion: "1.23.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.24-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.24-hardened.yaml
new file mode 100644
index 0000000000..f702a13726
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.24-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.24-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.24-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.24-permissive.yaml
new file mode 100644
index 0000000000..5bc70099f7
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.24-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.24-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.5-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.5-hardened.yaml
new file mode 100644
index 0000000000..20091ec2b3
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.5-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.5-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.5-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.5-permissive.yaml
new file mode 100644
index 0000000000..9a86906b02
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.5-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.5-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.6-hardened.yaml
new file mode 100644
index 0000000000..ea2549ef39
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.6-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.6-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.6-permissive.yaml
new file mode 100644
index 0000000000..0afdaaa19b
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.6-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.6-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.7-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.7-hardened.yaml
new file mode 100644
index 0000000000..b387408f50
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.7-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.7-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.7-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.7-permissive.yaml
new file mode 100644
index 0000000000..850a5fdd48
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/benchmark-rke2-cis-1.7-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.7-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.25.0"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/cis-roles.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/cis-roles.yaml
new file mode 100644
index 0000000000..23c93dc659
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/cis-roles.yaml
@@ -0,0 +1,49 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cis-admin
+rules:
+  - apiGroups:
+      - cis.cattle.io
+    resources:
+      - clusterscanbenchmarks
+      - clusterscanprofiles
+      - clusterscans
+      - clusterscanreports
+    verbs: ["create", "update", "delete", "patch","get", "watch", "list"]
+  - apiGroups:
+      - catalog.cattle.io
+    resources: ["apps"]
+    resourceNames: ["rancher-cis-benchmark"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cis-view
+rules:
+  - apiGroups:
+      - cis.cattle.io
+    resources:
+      - clusterscanbenchmarks
+      - clusterscanprofiles
+      - clusterscans
+      - clusterscanreports
+    verbs: ["get", "watch", "list"]
+  - apiGroups:
+      - catalog.cattle.io
+    resources: ["apps"]
+    resourceNames: ["rancher-cis-benchmark"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs: ["get", "watch", "list"]
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/configmap.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/configmap.yaml
new file mode 100644
index 0000000000..33e54656ea
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/configmap.yaml
@@ -0,0 +1,18 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: default-clusterscanprofiles
+  namespace: {{ template "cis.namespace" . }}
+data:
+  # Default ClusterScanProfiles per cluster provider type
+  rke: |-
+    <1.21.0: rke-profile-permissive-1.20
+    >=1.21.0: rke-profile-permissive-1.7
+  rke2: |-
+    <1.21.0: rke2-cis-1.20-profile-permissive
+    >=1.21.0: rke2-cis-1.7-profile-permissive
+  eks: "eks-profile"
+  gke: "gke-profile"
+  aks: "aks-profile"
+  k3s: "k3s-cis-1.7-profile-permissive"
+  default: "cis-1.7-profile"
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/deployment.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/deployment.yaml
new file mode 100644
index 0000000000..8c9f72f5de
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/deployment.yaml
@@ -0,0 +1,61 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cis-operator
+  namespace: {{ template "cis.namespace" . }}
+  labels:
+    cis.cattle.io/operator: cis-operator
+spec:
+  selector:
+    matchLabels:
+      cis.cattle.io/operator: cis-operator
+  template:
+    metadata:
+      labels:
+        cis.cattle.io/operator: cis-operator
+    spec:
+      serviceAccountName: cis-operator-serviceaccount
+      containers:
+      - name: cis-operator
+        image: '{{ template "system_default_registry" . }}{{ .Values.image.cisoperator.repository }}:{{ .Values.image.cisoperator.tag }}'
+        imagePullPolicy: IfNotPresent
+        ports:
+        - name: cismetrics
+          containerPort: {{ .Values.alerts.metricsPort }}
+        env:
+        - name: SECURITY_SCAN_IMAGE
+          value: {{ template "system_default_registry" . }}{{ .Values.image.securityScan.repository }}
+        - name: SECURITY_SCAN_IMAGE_TAG
+          value: {{ .Values.image.securityScan.tag }}
+        - name: SONOBUOY_IMAGE
+          value: {{ template "system_default_registry" . }}{{ .Values.image.sonobuoy.repository }}
+        - name: SONOBUOY_IMAGE_TAG
+          value: {{ .Values.image.sonobuoy.tag }}
+        - name: CIS_ALERTS_METRICS_PORT
+          value: '{{ .Values.alerts.metricsPort }}'
+        - name: CIS_ALERTS_SEVERITY
+          value: {{ .Values.alerts.severity }}
+        - name: CIS_ALERTS_ENABLED
+          value: {{ .Values.alerts.enabled | default "false" | quote }}
+        - name: CLUSTER_NAME
+          value: '{{ .Values.global.cattle.clusterName }}'
+        - name: CIS_OPERATOR_DEBUG
+          value: '{{ .Values.image.cisoperator.debug }}'
+        {{- if .Values.securityScanJob.overrideTolerations }}
+        - name: SECURITY_SCAN_JOB_TOLERATIONS
+          value: '{{ .Values.securityScanJob.tolerations | toJson  }}'
+        {{- end }}
+        resources:
+          {{- toYaml .Values.resources | nindent 12 }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/network_policy_allow_all.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/network_policy_allow_all.yaml
new file mode 100644
index 0000000000..6ed5d645ea
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/network_policy_allow_all.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: default-allow-all
+  namespace: {{ template "cis.namespace" . }}
+spec:
+  podSelector: {}
+  ingress:
+  - {}
+  egress:
+  - {}
+  policyTypes:
+  - Ingress
+  - Egress
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/patch_default_serviceaccount.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/patch_default_serviceaccount.yaml
new file mode 100644
index 0000000000..e78a6bd08a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/patch_default_serviceaccount.yaml
@@ -0,0 +1,29 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: patch-sa
+  annotations:
+    "helm.sh/hook": post-install, post-upgrade
+    "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation
+spec:
+  template:
+    spec:
+      serviceAccountName: cis-operator-serviceaccount
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+      restartPolicy: Never
+      containers:
+      - name: sa
+        image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}"
+        imagePullPolicy: {{ .Values.global.imagePullPolicy }}
+        command: ["kubectl", "patch", "serviceaccount", "default", "-p", "{\"automountServiceAccountToken\": false}"]
+        args: ["-n", {{ template "cis.namespace" . }}]
+
+  backoffLimit: 1
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/psp.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/psp.yaml
new file mode 100644
index 0000000000..9b8a5995ee
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/psp.yaml
@@ -0,0 +1,59 @@
+{{- if .Values.global.cattle.psp.enabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: cis-psp
+spec:
+  allowPrivilegeEscalation: true
+  allowedCapabilities:
+  - '*'
+  fsGroup:
+    rule: RunAsAny
+  hostIPC: true
+  hostNetwork: true
+  hostPID: true
+  hostPorts:
+  - max: 65535
+    min: 0
+  privileged: true
+  runAsUser:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+  - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cis-psp-role
+  namespace: {{ template "cis.namespace" . }}
+rules:
+- apiGroups:
+  - policy
+  resourceNames:
+  - cis-psp
+  resources:
+  - podsecuritypolicies
+  verbs:
+  - use
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cis-psp-rolebinding
+  namespace: {{ template "cis.namespace" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cis-psp-role
+subjects:
+- kind: ServiceAccount
+  name: cis-serviceaccount
+  namespace: {{ template "cis.namespace" . }}
+- kind: ServiceAccount
+  name: cis-operator-serviceaccount
+  namespace: {{ template "cis.namespace" . }}
+{{- end }}
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/rbac.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/rbac.yaml
new file mode 100644
index 0000000000..6352b972af
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/rbac.yaml
@@ -0,0 +1,213 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+  name: cis-operator-clusterrole
+rules:
+- apiGroups:
+  - "cis.cattle.io"
+  resources:
+  - "*"
+  verbs:
+  - "*"
+- apiGroups:
+  - ""
+  resources:
+  - "pods"
+  - "services"
+  - "configmaps"
+  - "nodes"
+  - "serviceaccounts"
+  verbs:
+  - "get"
+  - "list"
+  - "create"
+  - "update"
+  - "watch"
+  - "patch"
+- apiGroups:
+  - "rbac.authorization.k8s.io"
+  resources:
+  - "rolebindings"
+  - "clusterrolebindings"
+  - "clusterroles"
+  verbs:
+  - "get"
+  - "list"
+- apiGroups:
+  - "batch"
+  resources:
+  - "jobs"
+  verbs:
+  - "list"
+  - "create"
+  - "patch"
+  - "update"
+  - "watch"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+  name: cis-scan-ns
+rules:
+{{- if .Values.global.cattle.psp.enabled }}
+- apiGroups:
+  - "*"
+  resources:
+  - "podsecuritypolicies"
+  verbs: 
+  - "get"
+  - "list"
+  - "watch"
+{{- end }}
+- apiGroups:
+  - ""
+  resources:
+  - "namespaces"
+  - "nodes"
+  - "pods"
+  - "serviceaccounts"
+  - "services"
+  - "replicationcontrollers"
+  verbs:
+  - "get"
+  - "list"
+  - "watch"
+- apiGroups: 
+  - "rbac.authorization.k8s.io"
+  resources:
+  - "rolebindings"
+  - "clusterrolebindings"
+  - "clusterroles"
+  verbs:
+  - "get"
+  - "list"
+- apiGroups:
+   - "batch"
+  resources:
+   - "jobs"
+   - "cronjobs"
+  verbs:
+   - "list"
+- apiGroups:
+    - "apps"
+  resources:
+    - "daemonsets"
+    - "deployments"
+    - "replicasets"
+    - "statefulsets"
+  verbs:
+    - "list"
+- apiGroups:
+    - "autoscaling"
+  resources:
+    - "horizontalpodautoscalers"
+  verbs:
+    - "list"
+- apiGroups:
+    - "networking.k8s.io"
+  resources:
+    - "networkpolicies"
+  verbs:
+    - "get"
+    - "list"
+    - "watch"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cis-operator-role
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+  namespace: {{ template "cis.namespace" . }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - "services"
+  verbs:
+  - "watch"
+  - "list"
+  - "get"
+  - "patch"
+- apiGroups:
+  - "batch"
+  resources:
+  - "jobs"
+  verbs:
+  - "watch"
+  - "list"
+  - "get"
+  - "delete"
+- apiGroups:
+  - ""
+  resources:
+  - "configmaps"
+  - "pods"
+  - "secrets"
+  verbs:
+  - "*"
+- apiGroups:
+  - "apps"
+  resources:
+  - "daemonsets"
+  verbs:
+  - "*"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+  name: cis-operator-clusterrolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cis-operator-clusterrole
+subjects:
+- kind: ServiceAccount
+  name: cis-operator-serviceaccount
+  namespace: {{ template "cis.namespace" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cis-scan-ns
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cis-scan-ns
+subjects:
+- kind: ServiceAccount
+  name: cis-serviceaccount
+  namespace: {{ template "cis.namespace" . }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+  name: cis-operator-rolebinding
+  namespace: {{ template "cis.namespace" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cis-operator-role
+subjects:
+- kind: ServiceAccount
+  name: cis-serviceaccount
+  namespace: {{ template "cis.namespace" . }}
+- kind: ServiceAccount
+  name: cis-operator-serviceaccount
+  namespace: {{ template "cis.namespace" . }}
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.20.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.20.yaml
new file mode 100644
index 0000000000..05263ce7da
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.20.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: cis-1.20-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: cis-1.20
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.23.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.23.yaml
new file mode 100644
index 0000000000..c59d8f51ff
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.23.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: cis-1.23-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: cis-1.23
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.24.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.24.yaml
new file mode 100644
index 0000000000..aa3e51c3e2
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.24.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: cis-1.24-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: cis-1.24
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.6.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.6.yaml
new file mode 100644
index 0000000000..8a8d8bf881
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.6.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: cis-1.6-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: cis-1.6
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.7.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.7.yaml
new file mode 100644
index 0000000000..1a37aad835
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-cis-1.7.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: cis-1.7-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: cis-1.7
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.20-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.20-hardened.yml
new file mode 100644
index 0000000000..a0b6cb6f6a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.20-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.20-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.20-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.20-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.20-permissive.yml
new file mode 100644
index 0000000000..89885548df
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.20-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.20-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.20-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.23-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.23-hardened.yml
new file mode 100644
index 0000000000..724412d3aa
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.23-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.23-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.23-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.23-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.23-permissive.yml
new file mode 100644
index 0000000000..9f9213de1c
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.23-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.23-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.23-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.24-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.24-hardened.yml
new file mode 100644
index 0000000000..252251efcf
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.24-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.24-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.24-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.24-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.24-permissive.yml
new file mode 100644
index 0000000000..05555c64dc
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.24-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.24-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.24-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.6-hardened.yml
new file mode 100644
index 0000000000..095e977ab2
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.6-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.6-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.6-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.6-permissive.yml
new file mode 100644
index 0000000000..3b22a80c83
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.6-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.6-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.6-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.7-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.7-hardened.yml
new file mode 100644
index 0000000000..22ae9e0d23
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.7-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.7-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.7-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.7-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.7-permissive.yml
new file mode 100644
index 0000000000..f79e9ed966
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-k3s-cis-1.7-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.7-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.7-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.20-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.20-hardened.yaml
new file mode 100644
index 0000000000..c36cf38c90
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.20-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-hardened-1.20
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.20-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.20-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.20-permissive.yaml
new file mode 100644
index 0000000000..cfeb4b34c6
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.20-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-permissive-1.20
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.20-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.23-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.23-hardened.yaml
new file mode 100644
index 0000000000..0073311496
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.23-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-hardened-1.23
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.23-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.23-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.23-permissive.yaml
new file mode 100644
index 0000000000..085b60dfa4
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.23-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-permissive-1.23
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.23-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.24-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.24-hardened.yaml
new file mode 100644
index 0000000000..faae63e87f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.24-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-hardened-1.24
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.24-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.24-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.24-permissive.yaml
new file mode 100644
index 0000000000..7335a1d2d8
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.24-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-permissive-1.24
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.24-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.6-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.6-hardened.yaml
new file mode 100644
index 0000000000..d38febd80f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.6-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-hardened-1.6
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.6-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.6-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.6-permissive.yaml
new file mode 100644
index 0000000000..d31b5b0d25
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.6-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-permissive-1.6
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.6-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.7-hardened.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.7-hardened.yaml
new file mode 100644
index 0000000000..7b83f95bcd
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.7-hardened.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-hardened-1.7
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.7-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.7-permissive.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.7-permissive.yaml
new file mode 100644
index 0000000000..52327c4af1
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke-1.7-permissive.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke-profile-permissive-1.7
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke-cis-1.7-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.20-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.20-hardened.yml
new file mode 100644
index 0000000000..decc9b6516
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.20-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.20-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.20-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.20-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.20-permissive.yml
new file mode 100644
index 0000000000..74c96ffc49
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.20-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.20-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.20-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.23-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.23-hardened.yml
new file mode 100644
index 0000000000..abc1c2a21b
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.23-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.23-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.23-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.23-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.23-permissive.yml
new file mode 100644
index 0000000000..51cc519acd
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.23-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.23-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.23-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.24-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.24-hardened.yml
new file mode 100644
index 0000000000..f8ddb9851c
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.24-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.24-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.24-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.24-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.24-permissive.yml
new file mode 100644
index 0000000000..c820f03928
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.24-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.24-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.24-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.6-hardened.yml
new file mode 100644
index 0000000000..c7ac7f949a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.6-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.6-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.6-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.6-permissive.yml
new file mode 100644
index 0000000000..96ca1345aa
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.6-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.6-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.6-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.7-hardened.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.7-hardened.yml
new file mode 100644
index 0000000000..193753a0bc
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.7-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.7-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.7-hardened
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.7-permissive.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.7-permissive.yml
new file mode 100644
index 0000000000..409645dc76
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofile-rke2-cis-1.7-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-cis-1.7-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: rke2-cis-1.7-permissive
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofileaks.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofileaks.yml
new file mode 100644
index 0000000000..ea7b25b404
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofileaks.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: aks-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: aks-1.0
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofileeks.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofileeks.yml
new file mode 100644
index 0000000000..3b4e34437a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofileeks.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: eks-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: eks-1.0.1
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofilegke.yml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofilegke.yml
new file mode 100644
index 0000000000..3e5e2439ac
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/scanprofilegke.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: gke-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: gke-1.2.0
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/serviceaccount.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..ec48ec6224
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/serviceaccount.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: {{ template "cis.namespace" . }}
+  name: cis-operator-serviceaccount
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: {{ template "cis.namespace" . }}
+  labels:
+    app.kubernetes.io/name: rancher-cis-benchmark
+    app.kubernetes.io/instance: release-name
+  name: cis-serviceaccount
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/validate-install-crd.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/validate-install-crd.yaml
new file mode 100644
index 0000000000..562295791b
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/validate-install-crd.yaml
@@ -0,0 +1,17 @@
+#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}}
+# {{- $found := dict -}}
+# {{- set $found "cis.cattle.io/v1/ClusterScan" false -}}
+# {{- set $found "cis.cattle.io/v1/ClusterScanBenchmark" false -}}
+# {{- set $found "cis.cattle.io/v1/ClusterScanProfile" false -}}
+# {{- set $found "cis.cattle.io/v1/ClusterScanReport" false -}}
+# {{- range .Capabilities.APIVersions -}}
+# {{- if hasKey $found (toString .) -}}
+# 	{{- set $found (toString .) true -}}
+# {{- end -}}
+# {{- end -}}
+# {{- range $_, $exists := $found -}}
+# {{- if (eq $exists false) -}}
+# 	{{- required "Required CRDs are missing. Please install the corresponding CRD chart before installing this chart." "" -}}
+# {{- end -}}
+# {{- end -}}
+#{{- end -}}
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/templates/validate-psp-install.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/validate-psp-install.yaml
new file mode 100644
index 0000000000..a30c59d3b7
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/templates/validate-psp-install.yaml
@@ -0,0 +1,7 @@
+#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}}
+#{{- if .Values.global.cattle.psp.enabled }}
+#{{- if not (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
+#{{- fail "The target cluster does not have the PodSecurityPolicy API resource. Please disable PSPs in this chart before proceeding." -}}
+#{{- end }}
+#{{- end }}
+#{{- end }}
diff --git a/charts/rancher-cis-benchmark/4.2.0-rc8/values.yaml b/charts/rancher-cis-benchmark/4.2.0-rc8/values.yaml
new file mode 100644
index 0000000000..8048fe7e0e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/4.2.0-rc8/values.yaml
@@ -0,0 +1,55 @@
+# Default values for rancher-cis-benchmark.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+image:
+  cisoperator:
+    repository: rancher/cis-operator
+    tag: v1.0.12
+  securityScan:
+    repository: rancher/security-scan
+    tag: v0.2.13-rc9
+  sonobuoy:
+    repository: rancher/mirrored-sonobuoy-sonobuoy
+    tag: v0.56.16
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## List of node taints to tolerate (requires Kubernetes >= 1.6)
+tolerations: []
+
+securityScanJob:
+  overrideTolerations: false
+  tolerations: []
+
+affinity: {}
+
+global:
+  cattle:
+    systemDefaultRegistry: ""
+    clusterName: ""
+    psp:
+      enabled: false
+  kubectl:
+    repository: rancher/kubectl
+    tag: v1.28.1
+
+alerts:
+  enabled: false
+  severity: warning
+  metricsPort: 8080
diff --git a/index.yaml b/index.yaml
index a2426d562d..f192210d42 100755
--- a/index.yaml
+++ b/index.yaml
@@ -6280,6 +6280,32 @@ entries:
     - assets/rancher-backup-crd/rancher-backup-crd-1.0.200.tgz
     version: 1.0.200
   rancher-cis-benchmark:
+  - annotations:
+      catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/display-name: CIS Benchmark
+      catalog.cattle.io/kube-version: '>= 1.21.0-0 < 1.27.0-0'
+      catalog.cattle.io/namespace: cis-operator-system
+      catalog.cattle.io/os: linux
+      catalog.cattle.io/permits-os: linux,windows
+      catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1
+      catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
+      catalog.cattle.io/release-name: rancher-cis-benchmark
+      catalog.cattle.io/type: cluster-tool
+      catalog.cattle.io/ui-component: rancher-cis-benchmark
+    apiVersion: v1
+    appVersion: v4.2.0-rc8
+    created: "2023-09-12T20:43:12.193207458+05:30"
+    description: The cis-operator enables running CIS benchmark security scans on
+      a kubernetes cluster
+    digest: 4ab548e35036e8551e4fd78fa08908ec1a0d4742b5d0d559bf4f1e0edaca82be
+    icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
+    keywords:
+    - security
+    name: rancher-cis-benchmark
+    urls:
+    - assets/rancher-cis-benchmark/rancher-cis-benchmark-4.2.0-rc8.tgz
+    version: 4.2.0-rc8
   - annotations:
       catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
       catalog.cattle.io/certified: rancher
@@ -6906,6 +6932,20 @@ entries:
     - assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.100.tgz
     version: 1.0.100
   rancher-cis-benchmark-crd:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/hidden: "true"
+      catalog.cattle.io/namespace: cis-operator-system
+      catalog.cattle.io/release-name: rancher-cis-benchmark-crd
+    apiVersion: v1
+    created: "2023-09-12T20:43:12.199692073+05:30"
+    description: Installs the CRDs for rancher-cis-benchmark.
+    digest: a0ba39996b408be8c189386b945fe976a1c2fc196f663c219de24afc66d62360
+    name: rancher-cis-benchmark-crd
+    type: application
+    urls:
+    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-4.2.0-rc8.tgz
+    version: 4.2.0-rc8
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"