diff --git a/xos-services/fabric/templates/_helpers.tpl b/xos-services/fabric/templates/_helpers.tpl
index 6b57e4f..07eb3b2 100644
--- a/xos-services/fabric/templates/_helpers.tpl
+++ b/xos-services/fabric/templates/_helpers.tpl
@@ -45,3 +45,36 @@
 {{- define "fabric.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "fabric.serviceConfig" -}}
+name: fabric
+accessor:
+  username: {{ .Values.xosAdminUser | quote }}
+  password: {{ .Values.xosAdminPassword | quote }}
+  endpoint: xos-core:50051
+required_models:
+  - Instance
+  - Tag
+  - FabricService
+  - AddressManagerServiceInstance
+dependency_graph: "/opt/xos/synchronizers/fabric/model-deps"
+steps_dir: "/opt/xos/synchronizers/fabric/steps"
+sys_dir: "/opt/xos/synchronizers/fabric/sys"
+models_dir: "/opt/xos/synchronizers/fabric/models"
+logging:
+  version: 1
+  handlers:
+    console:
+      class: logging.StreamHandler
+    file:
+      class: logging.handlers.RotatingFileHandler
+      filename: /var/log/xos.log
+      maxBytes: 10485760
+      backupCount: 5
+  loggers:
+    'multistructlog':
+      handlers:
+          - console
+          - file
+      level: DEBUG
+{{- end -}}
diff --git a/xos-services/fabric/templates/configmap.yaml b/xos-services/fabric/templates/configmap.yaml
index d14289a..f0299d8 100644
--- a/xos-services/fabric/templates/configmap.yaml
+++ b/xos-services/fabric/templates/configmap.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,4 +19,4 @@
   name: fabric
 data:
   serviceConfig: |
-{{ toYaml .Values.serviceConfig | indent 4 }}
+{{ include "fabric.serviceConfig" . | indent 4 }}
diff --git a/xos-services/fabric/templates/deployment.yaml b/xos-services/fabric/templates/deployment.yaml
index 2413c53..3c7d03b 100644
--- a/xos-services/fabric/templates/deployment.yaml
+++ b/xos-services/fabric/templates/deployment.yaml
@@ -39,16 +39,17 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.pull_docker_registry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ .Values.fabric_synchronizerImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
             - name: fabric-config
               mountPath: /opt/xos/synchronizers/fabric/fabric_config.yaml
               subPath: fabric_config.yaml
-            - name: cert-chain-secret
-              mountPath: /usr/local/share/ca-certificates
+            - name: certchain-volume
+              mountPath: /usr/local/share/ca-certificates/local_certs.crt
+              subPath: config/ca_cert_chain.pem
       volumes:
         - name: fabric-config
           configMap:
@@ -56,9 +57,12 @@
             items:
               - key: serviceConfig
                 path: fabric_config.yaml
-        - name: cert-chain-secret
-          secret:
-            secretName: cert-chain-secret
+        - name: certchain-volume
+          configMap:
+            name: ca-certificates
+            items:
+              - key: chain
+                path: config/ca_cert_chain.pem
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
diff --git a/xos-services/fabric/values.yaml b/xos-services/fabric/values.yaml
index ec2e3d6..22fd55b 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -20,15 +20,15 @@
 
 replicaCount: 1
 
-pull_docker_registry:
-
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: xosproject/fabric-synchronizer
-  tag: master
-  pullPolicy: IfNotPresent
+imagePullPolicy: 'IfNotPresent'
+
+fabric_synchronizerImage: "xosproject/fabric-synchronizer:master"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
 
 resources: {}
 
@@ -38,35 +38,3 @@
 
 affinity: {}
 
-serviceConfig:
-  name: fabric
-  accessor:
-    username: admin@opencord.org
-    password: letmein
-    endpoint: xos-core:50051
-  required_models:
-    - Instance
-    - Tag
-    - FabricService
-    - AddressManagerServiceInstance
-  dependency_graph: "/opt/xos/synchronizers/fabric/model-deps"
-  steps_dir: "/opt/xos/synchronizers/fabric/steps"
-  sys_dir: "/opt/xos/synchronizers/fabric/sys"
-  models_dir: "/opt/xos/synchronizers/fabric/models"
-  logging:
-    version: 1
-    handlers:
-      console:
-        class: logging.StreamHandler
-      file:
-        class: logging.handlers.RotatingFileHandler
-        filename: /var/log/xos.log
-        maxBytes: 10485760
-        backupCount: 5
-    loggers:
-      'multistructlog':
-        handlers:
-            - console
-            - file
-        level: DEBUG
-