diff --git a/chart/templates/kyverno/namespace.yaml b/chart/templates/kyverno/namespace.yaml
index d0e14c6f031ae42066dd4550f94a1b2386527b55..cab4f70b11ea3462216ecf74d4242f02719d98ab 100644
--- a/chart/templates/kyverno/namespace.yaml
+++ b/chart/templates/kyverno/namespace.yaml
@@ -3,9 +3,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    admission.kyverno.sh/ignore: no-self-managing
-    control-plane: controller-manager
-    kyverno.sh/system: "yes"
     app.kubernetes.io/name: kyverno
     app.kubernetes.io/component: "core"
     {{- include "commonLabels" . | nindent 4}}
diff --git a/chart/templates/kyverno/values.yaml b/chart/templates/kyverno/values.yaml
index 39c44a38fe94aa7cfbb1018947d89d159d4e8986..c251cc2e1b46606c053a24fe6cf97ad6c714662b 100644
--- a/chart/templates/kyverno/values.yaml
+++ b/chart/templates/kyverno/values.yaml
@@ -3,6 +3,8 @@
 {{- end }}
 
 {{- define "bigbang.defaults.kyverno" -}}
+replicaCount: 3
+
 image:
   pullSecrets:
   - name: private-registry
@@ -13,8 +15,10 @@ networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
   controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
 
-monitoring:
-  enabled: false #{{ .Values.monitoring.enabled }} To enable this, we need PodMonitor crd
+serviceMonitor:
+  enabled: {{ .Values.monitoring.enabled }}
+  dashboards:
+    namespace: monitoring
 
 istio:
   enabled: {{ .Values.istio.enabled }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 4e2c529bbb7ef1b9d3f8fd9531508770fff53ec8..635552260140d8e0116c100624b57aa8f85fa385 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -335,14 +335,10 @@ kyverno:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/kyverno
     path: "./chart"
-    tag: "2.1.2-bb.0"
+    tag: "2.1.3-bb.2"
 
   # -- Flux reconciliation overrides specifically for the Kyverno Package
-  flux:
-    install:
-      crds: CreateReplace
-    upgrade:
-      crds: CreateReplace
+  flux: {}
 
   # -- Values to passthrough to the kyverno chart: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/kyverno.git
   values: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 5da9ac6c064a0d7bf0b7f75d3f46004bfc219a7d..2d91cd688578bf01191ec92d3153995a70fa1131 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -203,18 +203,9 @@ gatekeeper:
 kyverno:
   enabled: false
   values:
-    replicas: 1
+    replicaCount: 1
     bbtests:
       enabled: true
-      scripts:
-        image: registry1.dso.mil/ironbank/opensource/kubernetes-1.21/kubectl:v1.21.1
-        additionalVolumeMounts:
-          - name: "{{ .Chart.Name }}-test-config"
-            mountPath: /yaml
-        additionalVolumes:
-          - name: "{{ .Chart.Name }}-test-config"
-            configMap:
-              name: "{{ .Chart.Name }}-test-config"
 
 logging:
   enabled: true