diff --git a/values/argo/values/argocd.yaml.gotmpl b/values/argo/values/argocd.yaml.gotmpl
index 245977e3..cc7d316e 100644
--- a/values/argo/values/argocd.yaml.gotmpl
+++ b/values/argo/values/argocd.yaml.gotmpl
@@ -168,7 +168,7 @@ repoServer:
   extraContainers:
   - command:
     - /var/run/argocd/argocd-cmp-server
-    image: git.oceanbox.io/platform/manifests/helmfile-cmp:latest
+    image: {{ .image }}
     env:
     - name: HELM_GIT_ACCESS_TOKEN
       valueFrom:
@@ -177,25 +177,6 @@ repoServer:
           name: oceanbox-gitops-repo
           optional: false
     imagePullPolicy: Always
-    name: helmfile-cmp
-    securityContext:
-      runAsNonRoot: true
-      runAsUser: 999
-    terminationMessagePath: /dev/termination-log
-    terminationMessagePolicy: File
-    volumeMounts:
-    - mountPath: /var/run/argocd
-      name: var-files
-    - mountPath: /home/argocd/cmp-server/plugins
-      name: plugins
-    - mountPath: /tmp
-      name: cmp-tmp
-    - mountPath: /helm-working-dir
-      name: helm-working-dir
-  - command:
-    - /var/run/argocd/argocd-cmp-server
-    image: {{ .image }}
-    imagePullPolicy: Always
     name: {{ .name }}
     securityContext:
       runAsNonRoot: true
@@ -209,6 +190,8 @@ repoServer:
       name: plugins
     - mountPath: /tmp
       name: cmp-tmp
+    - mountPath: /helm-working-dir
+      name: helm-working-dir
   volumes:
   - name: cmp-tmp
     emptyDir: {}