diff --git a/helm/openwhisk/templates/elasticsearch-svc.yaml b/helm/openwhisk/templates/elasticsearch-svc.yaml
index b295a539..2a7748bb 100644
--- a/helm/openwhisk/templates/elasticsearch-svc.yaml
+++ b/helm/openwhisk/templates/elasticsearch-svc.yaml
@@ -30,6 +30,15 @@ metadata:
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
+  type: {{ .Values.elasticsearch.service.type }}
+  {{- if eq .Values.elasticsearch.service.type "NodePort" }}
+  nodePort: {{ .Values.elasticsearch.service.nodePort }}
+  {{- end }}
+  {{- if eq .Values.elasticsearch.service.type "LoadBalancer" }}
+  loadBalancerIP: {{ .Values.elasticsearch.service.loadBalancerIP }}
+  loadBalancerSourceRanges:
+  {{- toYaml .Values.elasticsearch.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end }}
   clusterIP: None # This is needed for statefulset hostnames like elasticsearch-0 to resolve
   # Create endpoints also if the related pod isn't ready
   publishNotReadyAddresses: true
diff --git a/helm/openwhisk/templates/grafana-pod.yaml b/helm/openwhisk/templates/grafana-pod.yaml
index 04f3ef59..f1f85a4b 100644
--- a/helm/openwhisk/templates/grafana-pod.yaml
+++ b/helm/openwhisk/templates/grafana-pod.yaml
@@ -63,6 +63,7 @@ spec:
       containers:
         - name: grafana
           image: "{{- .Values.docker.registry.name -}}{{- .Values.grafana.imageName -}}:{{- .Values.grafana.imageTag -}}"
+          imagePullPolicy: {{ .Values.grafana.imagePullPolicy }}
           env:
           - name: "GF_AUTH_ANONYMOUS_ENABLED"
             value: "true"