diff --git a/charts/nebulous-exn-middleware/Chart.yaml b/charts/nebulous-exn-middleware/Chart.yaml
index 6dbbeeb..cf01770 100644
--- a/charts/nebulous-exn-middleware/Chart.yaml
+++ b/charts/nebulous-exn-middleware/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.5
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/nebulous-exn-middleware/templates/deployment.yaml b/charts/nebulous-exn-middleware/templates/deployment.yaml
index ba62ac4..2283be1 100644
--- a/charts/nebulous-exn-middleware/templates/deployment.yaml
+++ b/charts/nebulous-exn-middleware/templates/deployment.yaml
@@ -40,18 +40,7 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
-            - name: 'SAL_HOST'
-              value: {{ .Values.SAL_HOST | default "nebulous-sal" | quote }}
-            - name: 'SAL_PORT'
-              value: {{ .Values.SAL_PORT | default "8080" | quote }}
-            - name: 'ACTIVEMQ_HOST'
-              value: {{ .Values.ACTIVEMQ_HOST | default "nebulous-activemq" | quote }}
-            - name: 'ACTIVEMQ_PORT'
-              value: {{ .Values.ACTIVEMQ_PORT | default "5672" | quote }}
-            - name: 'SAL_USER'
-              value: {{ .Values.env.SAL_USER | default "nebulous" | quote }}
-            - name: 'SAL_PASSWORD'
-              value: {{ .Values.env.SAL_PASSWORD | default "nebulous" | quote }}
+            {{- toYaml .Values.env | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/nebulous-exn-middleware/values.yaml b/charts/nebulous-exn-middleware/values.yaml
index a1b66ce..0ef5959 100644
--- a/charts/nebulous-exn-middleware/values.yaml
+++ b/charts/nebulous-exn-middleware/values.yaml
@@ -82,5 +82,15 @@ tolerations: []
 affinity: {}
 
 env:
-  SAL_USER: nebulous
-  SAL_PASSWORD: nebulous
+  - name: SAL_USER
+    value: "nebulous"
+  - name: SAL_PASSWORD
+    value: "nebulous"
+  - name: SAL_HOST
+    value: "nebulous-sal"
+  - name: SAL_PORT
+    value: "8080"
+  - name: ACTIVEMQ_HOST
+    value: "nebulous-activemq"
+  - name: ACTIVEMQ_PORT
+    value: "5672"