diff --git a/.github/workflows/stable-release.yaml b/.github/workflows/stable-release.yaml
index 2d32b4cf..bea1b27d 100644
--- a/.github/workflows/stable-release.yaml
+++ b/.github/workflows/stable-release.yaml
@@ -51,6 +51,7 @@ jobs:
         with:
           app-id: ${{ vars.ACTIONS_APP_ID }}
           private-key: ${{ secrets.ACTIONS_APP_PRIVATE_KEY }}
+          repositories: charts
 
       - name: Publish Helm chart
         uses: stefanprodan/helm-gh-pages@master
diff --git a/deployments/nimbus-kyverno/templates/_helpers.tpl b/deployments/nimbus-kyverno/templates/_helpers.tpl
index b73ec811..eb57a68d 100644
--- a/deployments/nimbus-kyverno/templates/_helpers.tpl
+++ b/deployments/nimbus-kyverno/templates/_helpers.tpl
@@ -50,6 +50,15 @@ app.kubernetes.io/name: {{ include "nimbus-kyverno.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+ClusterRoleSelector labels
+*/}}
+{{- define "nimbus-kyverno.clusterRoleSelectorLabels" -}}
+app.kubernetes.io/component: background-controller
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}-kyverno
+{{- end }}
+
 {{/*
 Create the name of the service account to use
 */}}
diff --git a/deployments/nimbus-kyverno/templates/clusterrole.yaml b/deployments/nimbus-kyverno/templates/clusterrole.yaml
index 9901ad5d..e8f2d6e9 100644
--- a/deployments/nimbus-kyverno/templates/clusterrole.yaml
+++ b/deployments/nimbus-kyverno/templates/clusterrole.yaml
@@ -2,9 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/component: background-controller
-    app.kubernetes.io/instance: nimbus-kyverno
-    app.kubernetes.io/part-of: nimbus-kyverno
+    {{- include "nimbus-kyverno.clusterRoleSelectorLabels" . | nindent 4 }}
   name: nimbus-kyverno:update-resources
 rules:
 - apiGroups:
diff --git a/deployments/nimbus/Chart.yaml b/deployments/nimbus/Chart.yaml
index e284e4aa..32880806 100644
--- a/deployments/nimbus/Chart.yaml
+++ b/deployments/nimbus/Chart.yaml
@@ -30,3 +30,8 @@ dependencies:
     version: ">= 0.1.0"
     repository: https://5gsec.github.io/charts
     condition: autoDeploy.kyverno
+
+  - name: nimbus-k8tls
+    version: ">= 0.1.0"
+    repository: https://5gsec.github.io/charts
+    condition: autoDeploy.k8tls
diff --git a/deployments/nimbus/values.yaml b/deployments/nimbus/values.yaml
index afb3a473..4c65d5ce 100644
--- a/deployments/nimbus/values.yaml
+++ b/deployments/nimbus/values.yaml
@@ -4,6 +4,7 @@ autoDeploy:
   kubearmor: true
   netpol: true
   kyverno: true
+  k8tls: true
 
 replicaCount: 1