diff --git a/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml b/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml
index 5f7c743c8036d8681fc31b9547012c72262201ef..9b79db7aaf635a7071430e013099486924b917f8 100644
--- a/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml
+++ b/charts/rancher-logging/0.1.2/charts/fluentd-tester/templates/deployment.yaml
@@ -18,7 +18,6 @@ spec:
   selector:
     matchLabels:
       app: {{ template "fluentd-tester.name" . }}
-      chart: {{ template "fluentd-tester.version" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
diff --git a/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml b/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml
index e7e436109dd594450a7ba8a652c2d86c8bca0ac4..970d65020043cb7eea2c518f12ea8e2a5dcf8f3d 100644
--- a/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml
+++ b/charts/rancher-logging/0.1.2/charts/fluentd/templates/daemonset.yaml
@@ -18,7 +18,6 @@ spec:
   selector:
     matchLabels:
       app: {{ template "fluentd.name" . }}
-      chart: {{ template "fluentd.version" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
diff --git a/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml b/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml
index 06c55538ae62e4ae7d376eca04eec6e69590e571..98cd8f2e05514b1fb1dbc745d675fb5650f39d94 100644
--- a/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml
+++ b/charts/rancher-logging/0.1.2/charts/log-aggregator/templates/log-aggregator.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "daemonset_api_version" . }}
 kind: DaemonSet
 metadata:
   name: {{ template "log-aggregator.fullname" . }}
@@ -18,7 +18,6 @@ spec:
   selector:
     matchLabels:
       app: {{ template "log-aggregator.name" . }}
-      chart: {{ template "log-aggregator.version" . }}
       release: {{ .Release.Name }}
   template:
     metadata: