diff --git a/ansible/roles/traffic-engine/files/helm/templates/configmap-certstore.yaml b/ansible/roles/traffic-engine/files/helm/templates/configmap-certstore.yaml
deleted file mode 100644
index 5588ded8..00000000
--- a/ansible/roles/traffic-engine/files/helm/templates/configmap-certstore.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: certstore-{{ .Release.Name }}
-  namespace: default
-data:
-  cert_store.ini: {{ tpl (.Files.Get "conf/cert_store.ini") . | quote }}
-  tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/configmap-tfe.yaml b/ansible/roles/traffic-engine/files/helm/templates/configmap-proxy.yaml
similarity index 75%
rename from ansible/roles/traffic-engine/files/helm/templates/configmap-tfe.yaml
rename to ansible/roles/traffic-engine/files/helm/templates/configmap-proxy.yaml
index bcd3690b..4cd80490 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/configmap-tfe.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/configmap-proxy.yaml
@@ -2,9 +2,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: tfe-{{ .Release.Name }}
+  name: proxy-{{ .Release.Name }}
   namespace: default
 data:
   tfe.conf: {{ tpl (.Files.Get "conf/tfe.conf") . | quote }}
+  cert_store.ini: {{ tpl (.Files.Get "conf/cert_store.ini") . | quote }}
   tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}
 {{- end }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
index 146ec312..ebaaa293 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
@@ -100,10 +100,10 @@ spec:
           subPath: "tsg_sn.json"
         - name: shared-configs-volume
           mountPath: "/opt/tsg/tfe/conf/tfe/tfe.conf"
-          subPath: "tfe/tfe.conf"
+          subPath: "proxy/tfe.conf"
         - name: shared-configs-volume
           mountPath: "/opt/tsg/etc/tsg_device_tag.json"
-          subPath: "tfe/tsg_device_tag.json"
+          subPath: "proxy/tsg_device_tag.json"
         - name: proxy-log
           mountPath: /opt/tsg/tfe/log
         {{- include "public.sync-host-timezone.volume-mount" . | nindent 8 }}
@@ -149,10 +149,10 @@ spec:
           subPath: "tsg_sn.json"
         - name: shared-configs-volume
           mountPath: "/opt/tsg/certstore/conf/cert_store.ini"
-          subPath: "certstore/cert_store.ini"
+          subPath: "proxy/cert_store.ini"
         - name: shared-configs-volume
           mountPath: "/opt/tsg/etc/tsg_device_tag.json"
-          subPath: "certstore/tsg_device_tag.json"
+          subPath: "proxy/tsg_device_tag.json"
         - name: certstore-log
           mountPath: /opt/tsg/certstore/logs
         {{- include "public.sync-host-timezone.volume-mount" . | nindent 8 }}
@@ -343,10 +343,8 @@ spec:
         volumeMounts:
         - name: shared-configs-volume
           mountPath: /opt/tsg/shared-configs
-        - name: certstore-configs-volume
-          mountPath: /opt/tsg/configs/certstore
-        - name: tfe-configs-volume
-          mountPath: /opt/tsg/configs/tfe
+        - name: proxy-configs-volume
+          mountPath: /opt/tsg/configs/proxy
         {{- include "public.sync-host-timezone.volume-mount" . | nindent 8 }}
 
       volumes:
@@ -354,12 +352,9 @@ spec:
         hostPath:
           path: /run/systemd/journal
           type: Directory
-      - name: certstore-configs-volume
+      - name: proxy-configs-volume
         configMap:
-          name: certstore-{{ .Release.Name }}
-      - name: tfe-configs-volume
-        configMap:
-          name: tfe-{{ .Release.Name }}
+          name: proxy-{{ .Release.Name }}
       - name: shared-configs-volume
         emptyDir: {}
       - name: proxy-log