diff --git a/CHANGELOG-0.x.md b/CHANGELOG-0.x.md
index a13b5dc282..2c7ad435ee 100644
--- a/CHANGELOG-0.x.md
+++ b/CHANGELOG-0.x.md
@@ -2,6 +2,7 @@
 ## Notable changes
 ### New features
 * Allow volume attach limit overwrite via command line parameter ([#522](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/522), [@rfranzke](https://github.com/rfranzke))
+* Add tags that the in-tree volume plugin uses ([#530](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/530), [@jsafrane](https://github.com/jsafrane))
 
 ### Bug fixes
 * Adding amd64 as nodeSelector to avoid arm64 archtectures (#471) ([#472](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/472), [@hugoprudente](https://github.com/hugoprudente))
diff --git a/Makefile b/Makefile
index 3037808bea..2b3b49d760 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.git
 GO111MODULE=on
 GOPROXY=direct
 GOPATH=$(shell go env GOPATH)
+GOOS=$(shell go env GOOS)
 GOBIN=$(shell pwd)/bin
 
 .EXPORT_ALL_VARIABLES:
@@ -32,7 +33,7 @@ bin /tmp/helm /tmp/kubeval:
 	@mkdir -p $@
 
 bin/helm: | /tmp/helm bin
-	@curl -o /tmp/helm/helm.tar.gz -sSL https://get.helm.sh/helm-v3.1.2-linux-amd64.tar.gz
+	@curl -o /tmp/helm/helm.tar.gz -sSL https://get.helm.sh/helm-v3.1.2-${GOOS}-amd64.tar.gz
 	@tar -zxf /tmp/helm/helm.tar.gz -C bin --strip-components=1
 	@rm -rf /tmp/helm/*
 
diff --git a/aws-ebs-csi-driver/Chart.yaml b/aws-ebs-csi-driver/Chart.yaml
index dad30d53f9..336d34f57a 100644
--- a/aws-ebs-csi-driver/Chart.yaml
+++ b/aws-ebs-csi-driver/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "0.5.0"
+appVersion: "0.6.0"
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 0.4.0
+version: 0.5.0
 kubeVersion: ">=1.13.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources:
diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml
index 5c93d0ed2b..969038dac9 100644
--- a/deploy/kubernetes/overlays/stable/kustomization.yaml
+++ b/deploy/kubernetes/overlays/stable/kustomization.yaml
@@ -4,9 +4,9 @@ bases:
 - ../../base
 images:
 - name: amazon/aws-ebs-csi-driver
-  newTag: v0.5.0
+  newTag: v0.6.0
 - name: quay.io/k8scsi/csi-provisioner
-  newTag: v1.3.0
+  newTag: v1.5.0
 - name: quay.io/k8scsi/csi-attacher
   newTag: v1.2.0
 - name: quay.io/k8scsi/livenessprobe