diff --git a/charts/argo/templates/server-configmap.yaml b/charts/argo/templates/server-configmap.yaml
deleted file mode 100644
index 6140663a..00000000
--- a/charts/argo/templates/server-configmap.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- if .Values.server.enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name }}-configmap
-  labels:
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-  config: |
-    {{- if .Values.server.instanceID.enabled }}
-    {{- if .Values.server.instanceID.useReleaseName }}
-    instanceID: {{ .Release.Name }}
-    {{- else }}
-    instanceID: {{ .Values.server.instanceID.explicitID }}
-    {{- end }}
-    {{- end }}
-    containerRuntimeExecutor: {{ .Values.server.containerRuntimeExecutor }}
-    artifactRepository:
-      {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
-      {{- if .Values.artifactRepository.archiveLogs }}
-      archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
-      {{- end }}
-      s3:
-        {{- if .Values.useStaticCredentials }}
-        accessKeySecret:
-          key: {{ .Values.artifactRepository.s3.accessKeySecret.key }}
-          name: {{ .Values.artifactRepository.s3.accessKeySecret.name | default (printf "%s-%s" .Release.Name "minio") }}
-        secretKeySecret:
-          key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
-          name: {{ .Values.artifactRepository.s3.secretKeySecret.name | default (printf "%s-%s" .Release.Name "minio") }}
-        {{- end }}
-        bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minio.defaultBucket.name }}
-        endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio:9000") }}
-        insecure: {{ .Values.artifactRepository.s3.insecure }}
-        {{- if .Values.artifactRepository.s3.keyPrefix }}
-        keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }}
-        {{- end }}
-      {{- end}}
-    {{- if .Values.server.metricsConfig.enabled }}
-    metricsConfig:
-{{ toYaml .Values.server.metricsConfig | indent 6}}{{- end }}
-    {{- if .Values.server.telemetryConfig.enabled }}
-    telemetryConfig:
-{{ toYaml .Values.server.telemetryConfig | indent 6}}{{- end }}
-    {{- if .Values.server.persistence }}
-    persistence:
-{{ toYaml .Values.server.persistence | indent 6 }}{{- end }}
-{{- end }}
diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 37f14c54..b7b92734 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -33,6 +33,8 @@ spec:
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           args:
           - "server"
+          - "--configmap"
+          - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
           {{- if .Values.server.metricsConfig.enabled }}