diff --git a/charts/ibm-mqadvanced-server-dev/Chart.yaml b/charts/ibm-mqadvanced-server-dev/Chart.yaml
index dcfb384..5ba1019 100644
--- a/charts/ibm-mqadvanced-server-dev/Chart.yaml
+++ b/charts/ibm-mqadvanced-server-dev/Chart.yaml
@@ -15,6 +15,6 @@
 apiVersion: v1
 description: IBM MQ queue manager
 name: ibm-mqadvanced-server-dev
-version: 1.0.2
+version: 1.0.3
 icon: https://developer.ibm.com/messaging/wp-content/uploads/sites/18/2017/07/IBM-MQ-Square-200.png
 tillerVersion: ">=2.4.0"
diff --git a/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml b/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
index 1d567aa..601f356 100644
--- a/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
+++ b/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- if .Capabilities.APIVersions.Has "apps/v1beta2" }}
+apiVersion: apps/v1beta2
+{{- else }}
 apiVersion: apps/v1beta1
+{{- end }}
 kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}
@@ -24,7 +28,9 @@ metadata:
 spec:
   serviceName: {{ .Values.service.name }}
   replicas: 1
-  {{- if and (ge (.Capabilities.KubeVersion.Major | int) 1) (ge (.Capabilities.KubeVersion.Minor | int) 7) }}
+  {{- if and (.Capabilities.KubeVersion.Major | hasPrefix "1") (.Capabilities.KubeVersion.Minor | hasPrefix "7") }}
+  # Set updateStrategy to "RollingUpdate", if we're on Kubernetes 1.7.
+  # It's already the default for apps/v1beta2 (Kubernetes 1.8 onwards)
   updateStrategy:
     type: RollingUpdate
   {{- end }}
diff --git a/charts/ibm-mqadvanced-server-prod/Chart.yaml b/charts/ibm-mqadvanced-server-prod/Chart.yaml
index f6a303e..86778f9 100644
--- a/charts/ibm-mqadvanced-server-prod/Chart.yaml
+++ b/charts/ibm-mqadvanced-server-prod/Chart.yaml
@@ -15,6 +15,6 @@
 apiVersion: v1
 description: IBM MQ queue manager
 name: ibm-mqadvanced-server-prod
-version: 1.0.2
+version: 1.0.3
 icon: https://developer.ibm.com/messaging/wp-content/uploads/sites/18/2017/07/IBM-MQ-Square-200.png
 tillerVersion: ">=2.4.0"
diff --git a/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml b/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml
index fd65853..a66cb69 100644
--- a/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml
+++ b/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml
@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- if .Capabilities.APIVersions.Has "apps/v1beta2" }}
+apiVersion: apps/v1beta2
+{{- else }}
 apiVersion: apps/v1beta1
+{{- end }}
 kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}
@@ -22,9 +26,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
   serviceName: {{ .Values.service.name }}
   replicas: 1
-  {{- if and (ge (.Capabilities.KubeVersion.Major | int) 1) (ge (.Capabilities.KubeVersion.Minor | int) 7) }}
+  {{- if and (.Capabilities.KubeVersion.Major | hasPrefix "1") (.Capabilities.KubeVersion.Minor | hasPrefix "7") }}
+  # Set updateStrategy to "RollingUpdate", if we're on Kubernetes 1.7.
+  # It's already the default for apps/v1beta2 (Kubernetes 1.8 onwards)
   updateStrategy:
     type: RollingUpdate
   {{- end }}