diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index e9d5d24e9..1ce656815 100755
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 description: Official Elastic helm chart for Elasticsearch
 home: https://github.com/elastic/helm-charts
 maintainers:
diff --git a/elasticsearch/templates/_helpers.tpl b/elasticsearch/templates/_helpers.tpl
index ccfd8c338..7866bca71 100755
--- a/elasticsearch/templates/_helpers.tpl
+++ b/elasticsearch/templates/_helpers.tpl
@@ -28,7 +28,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "endpoints" -}}
-{{- $replicas := .Values.replicas | int }}
+{{- $replicas := int (toString (.Values.replicas)) }}
 {{- $uname := printf "%s-%s" .Values.clusterName .Values.nodeGroup }}
   {{- range $i, $e := untilStep 0 $replicas 1 -}}
 {{ $uname }}-{{ $i }},
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index eff281bae..10840e7c3 100755
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -152,7 +152,7 @@ transportPort: 9300
 
 service:
   type: ClusterIP
-  nodePort:
+  nodePort: ""
   annotations: {}
   httpPortName: http
   transportPortName: transport
diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
index 42cffb34b..48dbb4f6a 100755
--- a/filebeat/Chart.yaml
+++ b/filebeat/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 description: Official Elastic helm chart for Filebeat
 home: https://github.com/elastic/helm-charts
 maintainers:
diff --git a/helpers/helm-tester/Dockerfile b/helpers/helm-tester/Dockerfile
index cefd3fca6..a0d32580b 100644
--- a/helpers/helm-tester/Dockerfile
+++ b/helpers/helm-tester/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.7
 
-ENV HELM_VERSION=2.14.0
+ENV HELM_VERSION=2.15.1
 
 RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
     tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile
index 758f0bb8c..7d35ba465 100644
--- a/helpers/terraform/Dockerfile
+++ b/helpers/terraform/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:7
 ENV VAULT_VERSION 0.9.3
 ENV TERRAFORM_VERSION=0.11.7
 ENV KUBECTL_VERSION=1.14.1
-ENV HELM_VERSION=2.14.0
+ENV HELM_VERSION=2.15.1
 ENV DOCKER_VERSION=18.09.7
 
 RUN yum -y install \
diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
index d858b0af6..946bcd90c 100755
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 description: Official Elastic helm chart for Kibana
 home: https://github.com/elastic/helm-charts
 maintainers:
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 1c864744e..6791cd388 100755
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -84,7 +84,7 @@ updateStrategy:
 service:
   type: ClusterIP
   port: 5601
-  nodePort:
+  nodePort: ""
   annotations: {}
     # cloud.google.com/load-balancer-type: "Internal"
     # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml
index d6f0f4bc1..b3010fff2 100755
--- a/metricbeat/Chart.yaml
+++ b/metricbeat/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 description: Official Elastic helm chart for Metricbeat
 home: https://github.com/elastic/helm-charts
 maintainers: