diff --git a/charts/scoop/templates/config.yaml b/charts/scoop/templates/config.yaml
index a4a70cac..fb2124f2 100644
--- a/charts/scoop/templates/config.yaml
+++ b/charts/scoop/templates/config.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
- - name: "scoop-config"
- - namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
+  name: {{ $.Values.ConfigMap.name }}
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
 {{- if $.Values.ConfigMap.data }}
 data:
 {{ toYaml $.Values.ConfigMap.data | indent 2 }}
diff --git a/charts/scoop/templates/deployment.yml b/charts/scoop/templates/deployment.yml
index 6d68f165..dda70b4d 100644
--- a/charts/scoop/templates/deployment.yml
+++ b/charts/scoop/templates/deployment.yml
@@ -27,8 +27,8 @@ spec:
     {{ toYaml $.Values.labels | indent 4 }}
         {{- end }}
     spec:
-      serviceAccount: sa-scoop
-      serviceAccountName: sa-scoop
+      #serviceAccount: scoop-sa
+      serviceAccountName: scoop-sa
       terminationGracePeriodSeconds: 30
       imagePullSecrets:
         - name: {{ $.Values.imagePullSecrets }}
@@ -48,12 +48,16 @@ spec:
 
           {{- if or $.Values.ConfigMap.data $.Values.secrets.data }}
           envFrom:
-             {{- if $.Values.ConfigMap.data }}
-           - configMapRef:
-               name: "scoop-config"
-               data:  
-{{ toYaml $.Values.ConfigMap.data  | indent 16 }}
-                 {{- end }}
+            {{- if $.Values.ConfigMap.enabled }}
+          - configMapRef:
+              name: {{ $.Values.ConfigMap.name }}
+            {{- end }}
+
+            {{- if $.Values.secrets.data }}
+          - SecretRef:
+              name: {{ $.Values.secrets.name }}
+            {{- end }}
+
           {{- end}}
 
           {{- if $.Values.resources }}
@@ -66,5 +70,5 @@ spec:
 {{ toYaml $.Values.volumeMounts | indent 12 }}
           {{- end }}            
   revisionHistoryLimit: 3
-strategy: {}
+#strategy: {}
   
\ No newline at end of file
diff --git a/charts/scoop/templates/secret.yaml b/charts/scoop/templates/secret.yaml
index 27bf7492..eb20ff36 100644
--- a/charts/scoop/templates/secret.yaml
+++ b/charts/scoop/templates/secret.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "scoop-secret"
-  namespace: {{ $.Values.scoopNamespace | default .Release.Namespace }}
+  name: scoop-secret
+  namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
 type: Opaque
 {{- if $.Values.secrets.data }}
 data:
diff --git a/charts/scoop/templates/serviceaccount.yaml b/charts/scoop/templates/serviceaccount.yaml
index 6758915b..0f21cba8 100644
--- a/charts/scoop/templates/serviceaccount.yaml
+++ b/charts/scoop/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: scoop-sa  
+  name: scoop-sa
   #namespace: monitoring
   namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
 
diff --git a/charts/scoop/values.yaml b/charts/scoop/values.yaml
index c2d601d6..44870f00 100644
--- a/charts/scoop/values.yaml
+++ b/charts/scoop/values.yaml
@@ -34,13 +34,14 @@ env:
     value: "10080"
 
 ConfigMap:
-  name: "scoop-config"
+  name: scoop-config
   enabled: true
   data: 
     key1: "key1value-1"
+    key2: "keyvalue2"
 
 secrets: 
-  name: "scoop-secret"
+  name: scoop-secret
   enabled: true
   data: []
 
@@ -54,5 +55,5 @@ resources:
     cpu: "0.3"
     memory: 2Gi
 
-strategy: {}
+#strategy: {}