diff --git a/charts/ecosystem/templates/bootstrap-config.yaml b/charts/ecosystem/templates/bootstrap-config.yaml
index eb965ff..91e3827 100644
--- a/charts/ecosystem/templates/bootstrap-config.yaml
+++ b/charts/ecosystem/templates/bootstrap-config.yaml
@@ -11,4 +11,5 @@ metadata:
 data:
   bootstrap.properties: |
     framework.config.store=etcd:http://{{ .Release.Name }}-etcd:2379
-    framework.extra.bundles=dev.galasa.cps.etcd,dev.galasa.ras.couchdb,dev.galasa.auth.couchdb
+    framework.extra.bundles=dev.galasa.cps.etcd,dev.galasa.ras.couchdb
+    api.extra.bundles=dev.galasa.auth.couchdb
diff --git a/charts/ecosystem/templates/metrics.yaml b/charts/ecosystem/templates/metrics.yaml
index 7385943..4bfb122 100644
--- a/charts/ecosystem/templates/metrics.yaml
+++ b/charts/ecosystem/templates/metrics.yaml
@@ -62,8 +62,6 @@ spec:
           value: etcd:http://{{ .Release.Name }}-etcd:2379
         - name: GALASA_RESULTARCHIVE_STORE
           value: couchdb:http://{{ .Release.Name }}-couchdb:5984
-        - name: GALASA_AUTH_STORE
-          value: couchdb:http://{{ .Release.Name }}-couchdb:5984
         - name: GALASA_CREDENTIALS_STORE
           value: etcd:http://{{ .Release.Name }}-etcd:2379
         - name: GALASA_RAS_TOKEN
@@ -71,11 +69,6 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name }}-couchdb-secret
               key: GALASA_RAS_TOKEN
-        - name: GALASA_AUTHSTORE_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-couchdb-secret
-              key: GALASA_RAS_TOKEN
         ports:
         - containerPort: 9010
           name: metrics
diff --git a/charts/ecosystem/templates/resource-monitor.yaml b/charts/ecosystem/templates/resource-monitor.yaml
index a645e1f..6ac9e98 100644
--- a/charts/ecosystem/templates/resource-monitor.yaml
+++ b/charts/ecosystem/templates/resource-monitor.yaml
@@ -65,8 +65,6 @@ spec:
           value: etcd:http://{{ .Release.Name }}-etcd:2379
         - name: GALASA_RESULTARCHIVE_STORE
           value: couchdb:http://{{ .Release.Name }}-couchdb:5984
-        - name: GALASA_AUTH_STORE
-          value: couchdb:http://{{ .Release.Name }}-couchdb:5984
         - name: GALASA_CREDENTIALS_STORE
           value: etcd:http://{{ .Release.Name }}-etcd:2379
         - name: GALASA_RAS_TOKEN
@@ -74,11 +72,6 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name }}-couchdb-secret
               key: GALASA_RAS_TOKEN
-        - name: GALASA_AUTHSTORE_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-couchdb-secret
-              key: GALASA_RAS_TOKEN
         ports:
         - containerPort: 9010
           name: metrics