diff --git a/assets/rancher-monitoring/rancher-monitoring-100.0.0+up16.6.0.tgz b/assets/rancher-monitoring/rancher-monitoring-100.0.0+up16.6.0.tgz
index 629ae7694..c4eac8a5a 100644
Binary files a/assets/rancher-monitoring/rancher-monitoring-100.0.0+up16.6.0.tgz and b/assets/rancher-monitoring/rancher-monitoring-100.0.0+up16.6.0.tgz differ
diff --git a/assets/rancher-monitoring/rancher-monitoring-crd-100.0.0+up16.6.0.tgz b/assets/rancher-monitoring/rancher-monitoring-crd-100.0.0+up16.6.0.tgz
index ee0e3b38f..7531a0f51 100644
Binary files a/assets/rancher-monitoring/rancher-monitoring-crd-100.0.0+up16.6.0.tgz and b/assets/rancher-monitoring/rancher-monitoring-crd-100.0.0+up16.6.0.tgz differ
diff --git a/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/jobs.yaml b/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/jobs.yaml
index acdd1138f..6167ddbe2 100644
--- a/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/jobs.yaml
+++ b/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/jobs.yaml
@@ -17,8 +17,8 @@ spec:
     spec:
       serviceAccountName: {{ .Chart.Name }}-manager
       securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
+        runAsNonRoot: false
+        runAsUser: 0
       initContainers:
         - name: set-preserve-unknown-fields-false
           image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -93,8 +93,8 @@ spec:
     spec:
       serviceAccountName: {{ .Chart.Name }}-manager
       securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
+        runAsNonRoot: false
+        runAsUser: 0
       initContainers:
         - name: remove-finalizers
           image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
diff --git a/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/rbac.yaml b/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/rbac.yaml
index bdda1ddad..1c07c7dd0 100644
--- a/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/rbac.yaml
+++ b/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/templates/rbac.yaml
@@ -53,7 +53,7 @@ spec:
   hostIPC: false
   hostPID: false
   runAsUser:
-    rule: 'MustRunAsNonRoot'
+    rule: 'RunAsAny'
   seLinux:
     rule: 'RunAsAny'
   supplementalGroups:
diff --git a/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/values.yaml b/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/values.yaml
index 8f3ebe37a..129d13914 100644
--- a/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/values.yaml
+++ b/charts/rancher-monitoring/rancher-monitoring-crd/100.0.0+up16.6.0/values.yaml
@@ -7,5 +7,5 @@ global:
     systemDefaultRegistry: ""
 
 image:
-  repository: rancher/rancher-agent
-  tag: v2.5.7
+  repository: rancher/shell
+  tag: v0.1.8
diff --git a/charts/rancher-monitoring/rancher-monitoring/100.0.0+up16.6.0/values.yaml b/charts/rancher-monitoring/rancher-monitoring/100.0.0+up16.6.0/values.yaml
index 402626670..278236024 100644
--- a/charts/rancher-monitoring/rancher-monitoring/100.0.0+up16.6.0/values.yaml
+++ b/charts/rancher-monitoring/rancher-monitoring/100.0.0+up16.6.0/values.yaml
@@ -1283,7 +1283,7 @@ grafana:
   proxy:
     image:
       repository: rancher/mirrored-library-nginx
-      tag: 1.19.9-alpine
+      tag: 1.21.0-alpine
   
   ## Enable an Specify container in extraContainers. This is meant to allow adding an authentication proxy to a grafana pod
   extraContainers: |
@@ -2967,7 +2967,7 @@ prometheus:
     proxy:
       image:
         repository: rancher/mirrored-library-nginx
-        tag: 1.19.9-alpine
+        tag: 1.21.0-alpine
 
     ## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod.
     ##  if using proxy extraContainer  update targetPort with proxy container port