--- charts-original/values.yaml
+++ charts/values.yaml
@@ -2,15 +2,18 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into the templates.
 
+global:
+  cattle:
+    systemDefaultRegistry: ""
+    psp:
+      enabled: false # PSP enablement should default to false
+
 openshift: false
 
 registry: docker.io
-tag: 5.2.0
 oem:
-imagePullSecrets:
-psp: false
 rbac: true # required for rancher authentication
-serviceAccount: default
+serviceAccount: neuvector
 leastPrivilege: false
 global: # required for rancher authentication (https://<Rancher_URL>/)
   cattle:
@@ -31,7 +34,8 @@
       maxSurge: 1
       maxUnavailable: 0
   image:
-    repository: neuvector/controller
+    repository: rancher/mirrored-neuvector-controller
+    tag: 5.2.0
     hash:
   replicas: 3
   disruptionbudget: 0
@@ -79,7 +83,7 @@
         #  -----BEGIN PRIVATE KEY-----
         #  -----END PRIVATE KEY-----
   ranchersso: # required for rancher authentication
-    enabled: false
+    enabled: true
   pvc:
     enabled: false
     existingClaim: false
@@ -227,7 +231,8 @@
   # If false, enforcer will not be installed
   enabled: true
   image:
-    repository: neuvector/enforcer
+    repository: rancher/mirrored-neuvector-enforcer
+    tag: 5.2.0
     hash:
   updateStrategy:
     type: RollingUpdate
@@ -258,7 +263,8 @@
   # If false, manager will not be installed
   enabled: true
   image:
-    repository: neuvector/manager
+    repository: rancher/mirrored-neuvector-manager
+    tag: 5.2.0
     hash:
   priorityClassName:
   env:
@@ -332,7 +338,7 @@
   adapter:
     enabled: false
     image:
-      repository: neuvector/registry-adapter
+      repository: rancher/mirrored-neuvector-registry-adapter
       tag: 0.1.0
       hash:
     priorityClassName:
@@ -410,7 +416,7 @@
     secure: false
     image:
       registry: ""
-      repository: neuvector/updater
+      repository: rancher/mirrored-neuvector-updater
       tag: latest
       hash:
     schedule: "0 0 * * *"
@@ -432,7 +438,7 @@
         maxUnavailable: 0
     image:
       registry: ""
-      repository: neuvector/scanner
+      repository: rancher/mirrored-neuvector-scanner
       tag: latest
       hash:
     priorityClassName:
@@ -493,14 +499,3 @@
   enabled: true
   type: ClusterIP
 
-awsbilling:
-  enabled: false
-  accountNumber: ""
-  roleName: ""
-  serviceAccount: csp
-  annotations: {}
-  imagePullSecrets:
-  image:
-    repository: neuvector/neuvector-csp-adapter
-    tag: 1.0.0
-    imagePullPolicy: IfNotPresent