diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml
index 26ac637..7424509 100644
--- a/charts/podinfo/Chart.yaml
+++ b/charts/podinfo/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "0.5.1"
+appVersion: "0.6.0"
 description: Podinfo Helm chart for Kubernetes
 name: podinfo
-version: 0.2.1
+version: 0.2.2
 home: https://github.com/stefanprodan/k8s-podinfo
 sources:
 - https://github.com/stefanprodan/k8s-podinfo
diff --git a/charts/podinfo/templates/deployment.yaml b/charts/podinfo/templates/deployment.yaml
index 6c1eef9..d47aaf0 100644
--- a/charts/podinfo/templates/deployment.yaml
+++ b/charts/podinfo/templates/deployment.yaml
@@ -9,6 +9,10 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: {{ template "podinfo.name" . }}
@@ -21,6 +25,7 @@ spec:
       annotations:
         prometheus.io/scrape: 'true'
     spec:
+      terminationGracePeriodSeconds: 30
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -30,20 +35,30 @@ spec:
             - -port={{ .Values.service.containerPort }}
             - -logLevel={{ .Values.logLevel }}
           env:
-          - name: backend_url
+          - name: color
+            value: {{ .Values.color }}
+          {{- if .Values.backend }}
+          - name: backendURL
             value: {{ .Values.backend }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.service.containerPort }}
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: http
           readinessProbe:
             httpGet:
               path: /readyz
-              port: http
+              port: 9898
+            initialDelaySeconds: 1
+            periodSeconds: 2
+            failureThreshold: 1
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 9898
+            initialDelaySeconds: 1
+            periodSeconds: 10
+            failureThreshold: 2
           volumeMounts:
           - name: data
             mountPath: /data
diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml
index 18edc35..b9404d9 100644
--- a/charts/podinfo/values.yaml
+++ b/charts/podinfo/values.yaml
@@ -1,11 +1,12 @@
 # Default values for podinfo.
 
-replicaCount: 1
-backend: http://backend-podinfo:9898/echo
+replicaCount: 2
+color: blue
+backend: #http://backend-podinfo:9898/echo
 
 image:
-  repository: stefanprodan/podinfo
-  tag: 0.5.1
+  repository: quay.io/stefanprodan/podinfo
+  tag: 0.6.0
   pullPolicy: IfNotPresent
 
 service:
@@ -50,4 +51,4 @@ tolerations: []
 
 affinity: {}
 
-logLevel: debug
+logLevel: info
diff --git a/deploy/istio/backend-grey-dep.yaml b/deploy/istio/backend-grey-dep.yaml
index 32638ab..ca91651 100644
--- a/deploy/istio/backend-grey-dep.yaml
+++ b/deploy/istio/backend-grey-dep.yaml
@@ -27,7 +27,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:0.6.0-rc.10
+        image: quay.io/stefanprodan/podinfo:0.6.0
         lifecycle:
           preStop:
             exec:
@@ -60,5 +60,5 @@ spec:
             value: "grey"
           - name: message
             value: "Greetings from backend grey"
-          - name: backend_url
+          - name: backendURL
             value: "http://podinfo-store:9898/echo" #"https://httpbin.org/anything"
diff --git a/deploy/istio/backend-orange-dep.yaml b/deploy/istio/backend-orange-dep.yaml
index c7a71de..1a4335b 100644
--- a/deploy/istio/backend-orange-dep.yaml
+++ b/deploy/istio/backend-orange-dep.yaml
@@ -27,7 +27,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:0.6.0-rc.10
+        image: quay.io/stefanprodan/podinfo:0.6.0
         lifecycle:
           preStop:
             exec:
@@ -60,5 +60,5 @@ spec:
             value: "orange"
           - name: message
             value: "Greetings from backend orange"
-          - name: backend_url
+          - name: backendURL
             value: "http://podinfo-store:9898/echo" #"https://httpbin.org/anything"
diff --git a/deploy/istio/blue-dep.yaml b/deploy/istio/blue-dep.yaml
index da770a4..1689507 100644
--- a/deploy/istio/blue-dep.yaml
+++ b/deploy/istio/blue-dep.yaml
@@ -27,7 +27,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:0.6.0-rc.10
+        image: quay.io/stefanprodan/podinfo:0.6.0
         lifecycle:
           preStop:
             exec:
@@ -61,5 +61,5 @@ spec:
             value: "blue"
           - name: message
             value: "Greetings from podinfo blue"
-          - name: backend_url
+          - name: backendURL
             value: "http://podinfo-backend:9898/backend"
diff --git a/deploy/istio/green-dep.yaml b/deploy/istio/green-dep.yaml
index 137fc4f..a07a411 100644
--- a/deploy/istio/green-dep.yaml
+++ b/deploy/istio/green-dep.yaml
@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:0.6.0-rc.10
+        image: quay.io/stefanprodan/podinfo:0.6.0
         lifecycle:
           preStop:
             exec:
@@ -64,5 +64,5 @@ spec:
             value: "green"
           - name: message
             value: "Greetings from podinfo green"
-          - name: backend_url
+          - name: backendURL
             value: "http://podinfo-backend:9898/backend"
diff --git a/deploy/istio/store-dep.yaml b/deploy/istio/store-dep.yaml
index edf1183..7021e29 100644
--- a/deploy/istio/store-dep.yaml
+++ b/deploy/istio/store-dep.yaml
@@ -27,7 +27,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:0.6.0-rc.10
+        image: quay.io/stefanprodan/podinfo:0.6.0
         lifecycle:
           preStop:
             exec:
diff --git a/deploy/skaffold/test/deployment.yaml b/deploy/skaffold/test/deployment.yaml
index 015795c..7d9b4af 100644
--- a/deploy/skaffold/test/deployment.yaml
+++ b/deploy/skaffold/test/deployment.yaml
@@ -7,6 +7,12 @@ metadata:
     app: podinfo
 spec:
   replicas: 3
+  minReadySeconds: 15
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 1
   selector:
     matchLabels:
      app: podinfo
@@ -17,9 +23,17 @@ spec:
       annotations:
         prometheus.io/scrape: 'true'
     spec:
+      terminationGracePeriodSeconds: 30
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:0.6.0-beta.7
+        image: quay.io/stefanprodan/podinfo:0.6.0
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /bin/sh
+              - -c
+              - sleep 3
         command:
           - ./podinfo
           - -port=9898
@@ -33,7 +47,7 @@ spec:
             path: /readyz
             port: 9898
           initialDelaySeconds: 1
-          periodSeconds: 5
+          periodSeconds: 2
           failureThreshold: 1
         livenessProbe:
           httpGet:
@@ -51,7 +65,7 @@ spec:
             value: "blue"
           - name: message
             value: "Greetings from podinfo blue"
-          - name: backend_url
+          - name: backendURL
             value: "http://podinfo-backend:9898/echo"
           - name: configPath
             value: "/var/secrets"
diff --git a/deploy/skaffold/test/service.yaml b/deploy/skaffold/test/service.yaml
index 448adf9..4e3e2c4 100644
--- a/deploy/skaffold/test/service.yaml
+++ b/deploy/skaffold/test/service.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: podinfo
 spec:
-  type: ClusterIP
+  type: LoadBalancer
   ports:
     - port: 9898
       targetPort: http
diff --git a/docs/index.yaml b/docs/index.yaml
index fb69994..e35e742 100755
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,7 +3,7 @@ entries:
   ambassador:
   - apiVersion: v1
     appVersion: 0.29.0
-    created: 2018-08-08T12:15:22.6772993+03:00
+    created: 2018-08-16T00:03:51.210499364+03:00
     description: A Helm chart for Datawire Ambassador
     digest: a30c8cb38e696b09fda8269ad8465ce6fec6100cfc108ca85ecbc85913ca5c7f
     engine: gotpl
@@ -19,7 +19,7 @@ entries:
   grafana:
   - apiVersion: v1
     appVersion: "1.0"
-    created: 2018-08-08T12:15:22.678122679+03:00
+    created: 2018-08-16T00:03:51.211170354+03:00
     description: A Helm chart for Kubernetes
     digest: abdcadc5cddcb7c015aa5bb64e59bfa246774ad9243b3eb3c2a814abb38f2776
     name: grafana
@@ -29,7 +29,7 @@ entries:
   ngrok:
   - apiVersion: v1
     appVersion: "1.0"
-    created: 2018-08-08T12:15:22.678453501+03:00
+    created: 2018-08-16T00:03:51.211452823+03:00
     description: A Ngrok Helm chart for Kubernetes
     digest: 7bf5ed2ef63ccd5efb76bcd9a086b04816a162c51d6ab592bccf58c283acd2ea
     name: ngrok
@@ -37,9 +37,25 @@ entries:
     - https://stefanprodan.github.io/k8s-podinfo/ngrok-0.1.0.tgz
     version: 0.1.0
   podinfo:
+  - apiVersion: v1
+    appVersion: 0.6.0
+    created: 2018-08-16T00:03:51.214668506+03:00
+    description: Podinfo Helm chart for Kubernetes
+    digest: 27ba84d7fe19f72e15a7f0b61492268c1a1f5ed8bc5467f87ed04b4409073173
+    engine: gotpl
+    home: https://github.com/stefanprodan/k8s-podinfo
+    maintainers:
+    - email: stefanprodan@users.noreply.github.com
+      name: stefanprodan
+    name: podinfo
+    sources:
+    - https://github.com/stefanprodan/k8s-podinfo
+    urls:
+    - https://stefanprodan.github.io/k8s-podinfo/podinfo-0.2.2.tgz
+    version: 0.2.2
   - apiVersion: v1
     appVersion: 0.5.1
-    created: 2018-08-08T12:15:22.680608978+03:00
+    created: 2018-08-16T00:03:51.214206947+03:00
     description: Podinfo Helm chart for Kubernetes
     digest: 631ca3e2db5553541a50b625f538e6a1f2a103c13aa8148fdd38baf2519e5235
     engine: gotpl
@@ -55,7 +71,7 @@ entries:
     version: 0.2.1
   - apiVersion: v1
     appVersion: 0.5.0
-    created: 2018-08-08T12:15:22.680193387+03:00
+    created: 2018-08-16T00:03:51.213413197+03:00
     description: Podinfo Helm chart for Kubernetes
     digest: dfe7cf44aef0d170549918b00966422a07e7611f9d0081fb34f5b5beb0641c00
     engine: gotpl
@@ -71,7 +87,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: 0.3.0
-    created: 2018-08-08T12:15:22.679455262+03:00
+    created: 2018-08-16T00:03:51.212459375+03:00
     description: Podinfo Helm chart for Kubernetes
     digest: 4865a2d8b269cf453935cda9661c2efb82c16411471f8c11221a6d03d9bb58b1
     engine: gotpl
@@ -88,7 +104,7 @@ entries:
   weave-flux:
   - apiVersion: v1
     appVersion: 1.3.0
-    created: 2018-08-08T12:15:22.681895933+03:00
+    created: 2018-08-16T00:03:51.216272023+03:00
     description: Flux is a tool that automatically ensures that the state of a cluster
       matches what is specified in version control
     digest: 1f52e427bb1d728641405f5ad9c514e8861905c110c14db95516629d24443b7d
@@ -106,7 +122,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: 1.2.5
-    created: 2018-08-08T12:15:22.68139671+03:00
+    created: 2018-08-16T00:03:51.215743562+03:00
     description: Flux is a tool that automatically ensures that the state of a cluster
       matches what is specified in version control
     digest: 9e18fb8d175f4fac3b054905c7110d18b6d18f884011df9e9d010c66337da7ec
@@ -122,4 +138,4 @@ entries:
     urls:
     - https://stefanprodan.github.io/k8s-podinfo/weave-flux-0.1.0.tgz
     version: 0.1.0
-generated: 2018-08-08T12:15:22.676665435+03:00
+generated: 2018-08-16T00:03:51.209830596+03:00
diff --git a/docs/podinfo-0.2.2.tgz b/docs/podinfo-0.2.2.tgz
new file mode 100644
index 0000000..2383ed7
Binary files /dev/null and b/docs/podinfo-0.2.2.tgz differ
diff --git a/pkg/version/version.go b/pkg/version/version.go
index bf12ff1..2bbe39c 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "0.6.0-rc.3"
+var VERSION = "0.6.0"
 var GITCOMMIT = "unknown"