diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 29427d4..268f755 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "droneRunner.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount | default 1 | quote }}
+  replicas: {{ .Values.replicaCount | default 1 }}
   selector:
     matchLabels:
       {{- include "droneRunner.selectorLabels" . | nindent 6 }}
@@ -38,7 +38,7 @@ spec:
           {{- toYaml .Values.resources | nindent 12 }}
         {{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }}
         volumeMounts:
-        - name: env-file
+        - name: custom-env-vars
           mountPath: {{ dir .Values.config.DRONE_RUNNER_ENV_FILE }}
           readOnly: true
         {{- end}}
@@ -60,10 +60,10 @@ spec:
       {{- end }}
       {{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }}
       volumes:
-      - name: env-file
+      - name: custom-env-vars
         configMap:
           name: {{ include "droneRunner.fullname" . }}
           items:
-          - key: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}
+          - key: custom-env-vars
             path: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}
       {{- end}}
diff --git a/templates/envConfig.yaml b/templates/envConfig.yaml
index 1935079..5261ac7 100644
--- a/templates/envConfig.yaml
+++ b/templates/envConfig.yaml
@@ -6,6 +6,6 @@ metadata:
     {{- include "droneRunner.labels" . | nindent 4 }}
   name: {{ include "droneRunner.fullname" . }}
 data:
-  {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}: |
-    {{ .Values.envFile.content }}
+  custom-env-vars: |
+    {{- .Values.envFile.content | nindent 4 }}
 {{- end }}
\ No newline at end of file
diff --git a/values.yaml b/values.yaml
index f0291e0..dc726a9 100644
--- a/values.yaml
+++ b/values.yaml
@@ -337,7 +337,7 @@ config: {}
   # DRONE_UI_USERNAME: ""
 
 envFile: {}
-  # content: |
+  # content: |-
   #   KEY=VALUE