diff --git a/charts/nsqd/Chart.yaml b/charts/nsqd/Chart.yaml
index 36b77e1..125f0a6 100644
--- a/charts/nsqd/Chart.yaml
+++ b/charts/nsqd/Chart.yaml
@@ -1,7 +1,8 @@
+apiVersion: v2
 name: nsqd
 home: https://github.com/teamhephy/nsq
-version: <Will be populated by the ci before publishing the chart>
+version: 2.5.5
 description: A kubernetes based docker image for running nsq daemon.
 maintainers:
-  - name: Team Hephy
-    email: team@teamhephy.com
+- name: Team Hephy
+  email: team@teamhephy.com
diff --git a/charts/nsqd/templates/_helpers.tmpl b/charts/nsqd/templates/_helpers.tmpl
index 0a6b41c..3c8640b 100644
--- a/charts/nsqd/templates/_helpers.tmpl
+++ b/charts/nsqd/templates/_helpers.tmpl
@@ -10,3 +10,10 @@ extensions/v1beta1
 apps/v1
 {{- end -}}
 {{- end -}}
+{{- define "policyAPIVersion" -}}
+{{- if .Capabilities.APIVersions.Has "policy/v1beta1" -}}
+policy/v1beta1
+{{- else -}}
+policy/v1
+{{- end -}}
+{{- end -}}
diff --git a/charts/nsqd/templates/nsqd-pdb.yaml b/charts/nsqd/templates/nsqd-pdb.yaml
index 5285ffb..f3fd7be 100644
--- a/charts/nsqd/templates/nsqd-pdb.yaml
+++ b/charts/nsqd/templates/nsqd-pdb.yaml
@@ -1,4 +1,4 @@
-apiVersion: policy/v1beta1
+apiVersion: {{ template "policyAPIVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: deis-nsqd
diff --git a/charts/nsqd/templates/nsqd-svc.yaml b/charts/nsqd/templates/nsqd-svc.yaml
index 5e64cd6..e1aa1f7 100644
--- a/charts/nsqd/templates/nsqd-svc.yaml
+++ b/charts/nsqd/templates/nsqd-svc.yaml
@@ -6,7 +6,6 @@ metadata:
     heritage: deis
     app: deis-nsqd
 spec:
-  clusterIP: None
   ports:
   - port: {{ .Values.http_port }}
     name: http
diff --git a/charts/nsqd/values.yaml b/charts/nsqd/values.yaml
index cc79a50..2756baf 100644
--- a/charts/nsqd/values.yaml
+++ b/charts/nsqd/values.yaml
@@ -1,6 +1,6 @@
 org: "hephy"
-pull_policy: "Always"
-docker_tag: "canary"
+pull_policy: "IfNotPresent"
+docker_tag: v2.5.1
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
 replicas: 1