diff --git a/monasca/templates/keystone-deployment.yaml b/monasca/templates/keystone-deployment.yaml
index 37c044b..8e1583b 100644
--- a/monasca/templates/keystone-deployment.yaml
+++ b/monasca/templates/keystone-deployment.yaml
@@ -32,9 +32,7 @@ spec:
 {{ toYaml .Values.keystone.resources | indent 12 }}
           env:
             - name: KEYSTONE_HOST
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
+              value: {{ template "keystone.fullname" . }}
             - name: KEYSTONE_USERNAME
               value: {{ .Values.keystone.bootstrap.user | quote }}
             - name: KEYSTONE_PASSWORD
diff --git a/storm/templates/supervisor-deployment.yaml b/storm/templates/supervisor-deployment.yaml
index 743ae0c..ee15882 100644
--- a/storm/templates/supervisor-deployment.yaml
+++ b/storm/templates/supervisor-deployment.yaml
@@ -35,26 +35,4 @@ spec:
               value: "{{ template "storm.fullname" . }}-nimbus"
             - name: SUPERVISOR_SLOTS_PORTS
               value: {{ .Values.supervisor_ports | join "," | quote }}
-            - name: METRIC_SPOUT_THREADS
-              value: "{{ .Values.thresh.spout.metricSpoutThreads }}"
-            - name: METRIC_SPOUT_TASKS
-              value: "{{ .Values.thresh.spout.metricSpoutTasks }}"
-            - name: KAFKA_URI
-              value: "{{ .Release.Name }}-kafka:9092"
-            - name: MYSQL_DB_HOST
-              value: "{{ .Release.Name }}-mysql"
-            - name: MYSQL_DB_PORT
-              value: "3306"
-            - name: MYSQL_DB_DATABASE
-              value: "mon"
-            - name: MYSQL_DB_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: "{{ .Release.Name }}-{{ .Values.thresh.secretSuffix }}"
-                  key: username
-            - name: MYSQL_DB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: "{{ .Release.Name }}-{{ .Values.thresh.secretSuffix }}"
-                  key: password
 {{- end}}