diff --git a/charts/prometheus-federator/templates/_helpers.tpl b/charts/prometheus-federator/templates/_helpers.tpl
index 4d0f87b6..f867ad96 100644
--- a/charts/prometheus-federator/templates/_helpers.tpl
+++ b/charts/prometheus-federator/templates/_helpers.tpl
@@ -20,11 +20,11 @@
 {{- end }}
 
 {{- define "prometheus-federator.imageTag" -}}
-{{- if and .Values.image .Values.image.tag }}{{ .Values.image.tag }}
-{{- else if and .Values.helmProjectOperator.image.tag }}{{ .Values.helmProjectOperator.image.tag }}
-{{ else }}{{ .Chart.AppVersion }}
-{{- end }}
-{{- end }}
+{{- if and .Values.image .Values.image.tag -}}{{- .Values.image.tag -}}
+{{- else if and .Values.helmProjectOperator.image.tag -}}{{- .Values.helmProjectOperator.image.tag -}}
+{{- else -}}{{- .Chart.AppVersion -}}
+{{- end -}}
+{{- end -}}
 
 # Windows Support
 
diff --git a/charts/prometheus-federator/templates/clusterrole.yaml b/charts/prometheus-federator/templates/clusterrole.yaml
index 7f973983..c155fd29 100644
--- a/charts/prometheus-federator/templates/clusterrole.yaml
+++ b/charts/prometheus-federator/templates/clusterrole.yaml
@@ -1,10 +1,10 @@
-{{- if and .Values.helmProjectOperator.global.rbac.create .Values.helmProjectOperator.global.rbac.userRoles.create }}
+{{- if and .Values.global.rbac.create .Values.global.rbac.userRoles.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ template "prometheus-federator.name" . }}-admin
   labels: {{ include "prometheus-federator.labels" . | indent 4 }}
-  {{- if .Values.helmProjectOperator.global.rbac.userRoles.aggregateToDefaultRoles }}
+  {{- if .Values.global.rbac.userRoles.aggregateToDefaultRoles }}
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
   {{- end }}
 rules:
@@ -22,7 +22,7 @@ kind: ClusterRole
 metadata:
   name: {{ template "prometheus-federator.name" . }}-edit
   labels: {{ include "prometheus-federator.labels" . | indent 4 }}
-  {{- if .Values.helmProjectOperator.global.rbac.userRoles.aggregateToDefaultRoles }}
+  {{- if .Values.global.rbac.userRoles.aggregateToDefaultRoles }}
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
   {{- end }}
 rules:
@@ -41,7 +41,7 @@ kind: ClusterRole
 metadata:
   name: {{ template "prometheus-federator.name" . }}-view
   labels: {{ include "prometheus-federator.labels" . | indent 4 }}
-  {{- if .Values.helmProjectOperator.global.rbac.userRoles.aggregateToDefaultRoles }}
+  {{- if .Values.global.rbac.userRoles.aggregateToDefaultRoles }}
     rbac.authorization.k8s.io/aggregate-to-view: "true"
   {{- end }}
 rules:
diff --git a/charts/prometheus-federator/templates/deployment.yaml b/charts/prometheus-federator/templates/deployment.yaml
index 1acf86f4..ca40b39f 100644
--- a/charts/prometheus-federator/templates/deployment.yaml
+++ b/charts/prometheus-federator/templates/deployment.yaml
@@ -20,38 +20,38 @@ spec:
     spec:
       containers:
         - name: {{ template "prometheus-federator.name" . }}
-          image: "{{ template "prometheus-federator.imageRegistry" . }}{{ template "prometheus-federator.imageRepository" . }}:{{ template "prometheus-federator.imageTag" . }}"
+          image: "{{- template "prometheus-federator.imageRegistry" . -}}{{- template "prometheus-federator.imageRepository" . -}}:{{- template "prometheus-federator.imageTag" . -}}"
           imagePullPolicy: "{{ .Values.helmProjectOperator.image.pullPolicy }}"
           args:
           - {{ template "prometheus-federator.name" . }}
           - --namespace={{ template "prometheus-federator.namespace" . }}
           - --controller-name={{ template "prometheus-federator.name" . }}
           - --values-override-file=/etc/helmprojectoperator/config/values.yaml
-{{- if .Values.helmProjectOperator.global.cattle.systemDefaultRegistry }}
-          - --system-default-registry={{ .Values.helmProjectOperator.global.cattle.systemDefaultRegistry }}
+{{- if .Values.global.cattle.systemDefaultRegistry }}
+          - --system-default-registry={{ .Values.global.cattle.systemDefaultRegistry }}
 {{- end }}
-{{- if .Values.helmProjectOperator.global.cattle.url }}
-          - --cattle-url={{ .Values.helmProjectOperator.global.cattle.url }}
+{{- if .Values.global.cattle.url }}
+          - --cattle-url={{ .Values.global.cattle.url }}
 {{- end }}
-{{- if .Values.helmProjectOperator.global.cattle.projectLabel }}
-          - --project-label={{ .Values.helmProjectOperator.global.cattle.projectLabel }}
+{{- if .Values.global.cattle.projectLabel }}
+          - --project-label={{ .Values.global.cattle.projectLabel }}
 {{- end }}
 {{- if not .Values.helmProjectOperator.projectReleaseNamespaces.enabled }}
-          - --system-project-label-values={{ join "," (append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.helmProjectOperator.global.cattle.systemProjectId) }}
-{{- else if and (ne (len .Values.helmProjectOperator.global.cattle.systemProjectId) 0) (ne (len .Values.helmProjectOperator.projectReleaseNamespaces.labelValue) 0) (ne .Values.helmProjectOperator.projectReleaseNamespaces.labelValue .Values.helmProjectOperator.global.cattle.systemProjectId) }}
-          - --system-project-label-values={{ join "," (append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.helmProjectOperator.global.cattle.systemProjectId) }}
+          - --system-project-label-values={{ join "," (append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.global.cattle.systemProjectId) }}
+{{- else if and (ne (len .Values.global.cattle.systemProjectId) 0) (ne (len .Values.helmProjectOperator.projectReleaseNamespaces.labelValue) 0) (ne .Values.helmProjectOperator.projectReleaseNamespaces.labelValue .Values.global.cattle.systemProjectId) }}
+          - --system-project-label-values={{ join "," (append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.global.cattle.systemProjectId) }}
 {{- else if len .Values.helmProjectOperator.otherSystemProjectLabelValues }}
           - --system-project-label-values={{ join "," .Values.helmProjectOperator.otherSystemProjectLabelValues }}
 {{- end }}
 {{- if .Values.helmProjectOperator.projectReleaseNamespaces.enabled }}
 {{- if .Values.helmProjectOperator.projectReleaseNamespaces.labelValue }}
           - --project-release-label-value={{ .Values.helmProjectOperator.projectReleaseNamespaces.labelValue }}
-{{- else if .Values.helmProjectOperator.global.cattle.systemProjectId }}
-          - --project-release-label-value={{ .Values.helmProjectOperator.global.cattle.systemProjectId }}
+{{- else if .Values.global.cattle.systemProjectId }}
+          - --project-release-label-value={{ .Values.global.cattle.systemProjectId }}
 {{- end }}
 {{- end }}
-{{- if .Values.helmProjectOperator.global.cattle.clusterId }}
-          - --cluster-id={{ .Values.helmProjectOperator.global.cattle.clusterId }}
+{{- if .Values.global.cattle.clusterId }}
+          - --cluster-id={{ .Values.global.cattle.clusterId }}
 {{- end }}
 {{- if .Values.helmProjectOperator.releaseRoleBindings.aggregate }}
 {{- if .Values.helmProjectOperator.releaseRoleBindings.clusterRoleRefs }}
diff --git a/charts/prometheus-federator/templates/rbac.yaml b/charts/prometheus-federator/templates/rbac.yaml
index f9476e0a..4a47c736 100644
--- a/charts/prometheus-federator/templates/rbac.yaml
+++ b/charts/prometheus-federator/templates/rbac.yaml
@@ -20,8 +20,8 @@ metadata:
   namespace: {{ template "prometheus-federator.namespace" . }}
   labels: {{ include "prometheus-federator.labels" . | indent 4 }}
     app: {{ template "prometheus-federator.name" . }}
-{{- if .Values.helmProjectOperator.global.imagePullSecrets }}
-imagePullSecrets: {{ toYaml .Values.helmProjectOperator.global.imagePullSecrets | nindent 2 }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | nindent 2 }}
 {{- end }}
 # ---
 # NOTE:
diff --git a/charts/prometheus-federator/templates/system-namespaces-configmap.yaml b/charts/prometheus-federator/templates/system-namespaces-configmap.yaml
index fe314e0c..96a0d135 100644
--- a/charts/prometheus-federator/templates/system-namespaces-configmap.yaml
+++ b/charts/prometheus-federator/templates/system-namespaces-configmap.yaml
@@ -11,8 +11,8 @@ data:
 {{- if .Values.helmProjectOperator.projectReleaseNamespaces.enabled }}
 {{- if .Values.helmProjectOperator.projectReleaseNamespaces.labelValue }}
       "projectReleaseLabelValue": {{ .Values.helmProjectOperator.projectReleaseNamespaces.labelValue | quote }},
-{{- else if .Values.helmProjectOperator.global.cattle.systemProjectId }}
-      "projectReleaseLabelValue": {{ .Values.helmProjectOperator.global.cattle.systemProjectId | quote }},
+{{- else if .Values.global.cattle.systemProjectId }}
+      "projectReleaseLabelValue": {{ .Values.global.cattle.systemProjectId | quote }},
 {{- else }}
       "projectReleaseLabelValue": "",
 {{- end }}
@@ -20,9 +20,9 @@ data:
       "projectReleaseLabelValue": "",
 {{- end }}
 {{- if not .Values.helmProjectOperator.projectReleaseNamespaces.enabled }}
-      "systemProjectLabelValues": {{ append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.helmProjectOperator.global.cattle.systemProjectId | toJson }}
-{{- else if and (ne (len .Values.helmProjectOperator.global.cattle.systemProjectId) 0) (ne (len .Values.helmProjectOperator.projectReleaseNamespaces.labelValue) 0) (ne .Values.helmProjectOperator.projectReleaseNamespaces.labelValue .Values.helmProjectOperator.global.cattle.systemProjectId) }}
-      "systemProjectLabelValues": {{ append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.helmProjectOperator.global.cattle.systemProjectId | toJson }}
+      "systemProjectLabelValues": {{ append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.global.cattle.systemProjectId | toJson }}
+{{- else if and (ne (len .Values.global.cattle.systemProjectId) 0) (ne (len .Values.helmProjectOperator.projectReleaseNamespaces.labelValue) 0) (ne .Values.helmProjectOperator.projectReleaseNamespaces.labelValue .Values.global.cattle.systemProjectId) }}
+      "systemProjectLabelValues": {{ append .Values.helmProjectOperator.otherSystemProjectLabelValues .Values.global.cattle.systemProjectId | toJson }}
 {{- else if len .Values.helmProjectOperator.otherSystemProjectLabelValues }}
       "systemProjectLabelValues": {{ .Values.helmProjectOperator.otherSystemProjectLabelValues | toJson }}
 {{- else }}