diff --git a/charts/argocd-image-updater/templates/configmap-authscripts.yaml b/charts/argocd-image-updater/templates/configmap-authscripts.yaml
index fbb345e3..f6df52e2 100644
--- a/charts/argocd-image-updater/templates/configmap-authscripts.yaml
+++ b/charts/argocd-image-updater/templates/configmap-authscripts.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "argocd-image-updater.labels" . | nindent 4 }}
-  name: argocd-image-updater-authscripts
+  name: {{ include "argocd-image-updater.fullname" . }}-authscripts
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 data:
   {{- toYaml .Values.authScripts.scripts | nindent 2}}
diff --git a/charts/argocd-image-updater/templates/configmap-sshconfig.yaml b/charts/argocd-image-updater/templates/configmap-sshconfig.yaml
index 9fd83d92..3f563328 100644
--- a/charts/argocd-image-updater/templates/configmap-sshconfig.yaml
+++ b/charts/argocd-image-updater/templates/configmap-sshconfig.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "argocd-image-updater.labels" . | nindent 4 }}
-  name: argocd-image-updater-ssh-config
+  name: {{ include "argocd-image-updater.fullname" . }}-sshconfig
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 {{- with .Values.config.sshConfig }}
 data:
diff --git a/charts/argocd-image-updater/templates/configmap.yaml b/charts/argocd-image-updater/templates/configmap.yaml
index 46ee3b80..f3a5f7e2 100644
--- a/charts/argocd-image-updater/templates/configmap.yaml
+++ b/charts/argocd-image-updater/templates/configmap.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "argocd-image-updater.labels" . | nindent 4 }}
-  name: argocd-image-updater-config
+  name: {{ include "argocd-image-updater.fullname" . }}-config
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 data:
   {{- with .Values.config.applicationsAPIKind }}
diff --git a/charts/argocd-image-updater/templates/deployment.yaml b/charts/argocd-image-updater/templates/deployment.yaml
index 4aaa83b3..ffe6d0b5 100644
--- a/charts/argocd-image-updater/templates/deployment.yaml
+++ b/charts/argocd-image-updater/templates/deployment.yaml
@@ -44,79 +44,79 @@ spec:
             valueFrom:
               configMapKeyRef:
                 key: applications_api
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: ARGOCD_GRPC_WEB
             valueFrom:
               configMapKeyRef:
                 key: argocd.grpc_web
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: ARGOCD_SERVER
             valueFrom:
               configMapKeyRef:
                 key: argocd.server_addr
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: ARGOCD_INSECURE
             valueFrom:
               configMapKeyRef:
                 key: argocd.insecure
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: ARGOCD_PLAINTEXT
             valueFrom:
               configMapKeyRef:
                 key: argocd.plaintext
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: ARGOCD_TOKEN
             valueFrom:
               secretKeyRef:
                 key: argocd.token
-                name: argocd-image-updater-secret
+                name:{{ include "argocd-image-updater.fullname" . }}-secret
                 optional: true
           - name: IMAGE_UPDATER_LOGLEVEL
             valueFrom:
               configMapKeyRef:
                 key: log.level
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: GIT_COMMIT_USER
             valueFrom:
               configMapKeyRef:
                 key: git.user
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: GIT_COMMIT_EMAIL
             valueFrom:
               configMapKeyRef:
                 key: git.email
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: IMAGE_UPDATER_KUBE_EVENTS
             valueFrom:
               configMapKeyRef:
                 key: kube.events
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: GIT_COMMIT_SIGNING_KEY
             valueFrom:
               configMapKeyRef:
                 key: git.commit-signing-key
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: GIT_COMMIT_SIGNING_METHOD
             valueFrom:
               configMapKeyRef:
                 key: git.commit-signing-method
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           - name: GIT_COMMIT_SIGN_OFF
             valueFrom:
               configMapKeyRef:
                 key: git.commit-sign-off
-                name: argocd-image-updater-config
+                name: {{ include "argocd-image-updater.fullname" . }}-config
                 optional: true
           {{- with .Values.extraEnv }}
             {{- toYaml . | nindent 10 }}
@@ -177,13 +177,13 @@ spec:
             path: registries.conf
           - key: git.commit-message-template
             path: commit.template
-          name: argocd-image-updater-config
+          name: {{ include "argocd-image-updater.fullname" . }}-config
           optional: true
         name: image-updater-conf
       {{- if .Values.authScripts.enabled }}
       - configMap:
           defaultMode: 0777
-          name: argocd-image-updater-authscripts
+          name: {{ include "argocd-image-updater.fullname" . }}-authscripts
         name: authscripts
       {{- end }}
       - configMap:
@@ -191,7 +191,7 @@ spec:
           optional: true
         name: ssh-known-hosts
       - configMap:
-          name: argocd-image-updater-ssh-config
+          name: {{ include "argocd-image-updater.fullname" . }}-sshconfig
           optional: true
         name: ssh-config
       - name: ssh-signing-key
diff --git a/charts/argocd-image-updater/templates/secret.yaml b/charts/argocd-image-updater/templates/secret.yaml
index 08955095..0c08bf92 100644
--- a/charts/argocd-image-updater/templates/secret.yaml
+++ b/charts/argocd-image-updater/templates/secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: argocd-image-updater-secret
+  name: {{ include "argocd-image-updater.fullname" . }}-secret
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
   labels:
     {{- include "argocd-image-updater.labels" . | nindent 4 }}