diff --git a/stable/superset/Chart.yaml b/stable/superset/Chart.yaml
index 9116fcd22c..72cf9abb5b 100644
--- a/stable/superset/Chart.yaml
+++ b/stable/superset/Chart.yaml
@@ -1,6 +1,6 @@
 description: Apache Superset (incubating) is a modern, enterprise-ready business intelligence web application
 name: superset
-version: 0.1.2
+version: 1.0.0
 appVersion: "0.24.0"
 keywords:
 - bi
diff --git a/stable/superset/templates/svc.yaml b/stable/superset/templates/svc.yaml
index 659599ee81..23d6cf43d3 100644
--- a/stable/superset/templates/svc.yaml
+++ b/stable/superset/templates/svc.yaml
@@ -7,13 +7,40 @@ metadata:
     chart: {{ template "superset.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
 spec:
+{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
+  type: ClusterIP
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{end}}
+{{- else if eq .Values.service.type "LoadBalancer" }}
   type: {{ .Values.service.type }}
+  {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+{{- else }}
+  type: {{ .Values.service.type }}
+{{- end }}
+{{- if .Values.service.externalIPs }}
+  externalIPs:
+{{ toYaml .Values.service.externalIPs | indent 4 }}
+{{- end }}
   ports:
     - name: http
       port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
+{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
+      nodePort: {{.Values.service.nodePort}}
+{{ end }}
   selector:
     app: {{ template "superset.name" . }}
     release: {{ .Release.Name }}
diff --git a/stable/superset/values.yaml b/stable/superset/values.yaml
index ecb2a22018..e61945ce55 100644
--- a/stable/superset/values.yaml
+++ b/stable/superset/values.yaml
@@ -96,6 +96,16 @@ service:
   type: ClusterIP
   port: 9000
 
+  ## service annotations
+  annotations: {}
+    # service.beta.kubernetes.io/aws-load-balancer-internal: "true"
+    # external-dns.alpha.kubernetes.io/hostname: "superset.domain.com"
+
+  ## loadbalancer source ranges. only used when service.type is "LoadBalancer"
+  loadBalancerSourceRanges: []
+  # - 172.31.0.0/16
+
+
 ingress:
   ## If true, superset Ingress will be created
   ##
@@ -155,7 +165,7 @@ resources: {}
 ##
 livenessProbe:
   httpGet:
-    path: /
+    path: /health
     port: http
   initialDelaySeconds: 80
   timeoutSeconds: 5
@@ -163,7 +173,7 @@ livenessProbe:
   failureThreshold: 2
 readinessProbe:
   httpGet:
-    path: /
+    path: /health
     port: http
   initialDelaySeconds: 60
   timeoutSeconds: 5