diff --git a/README.md b/README.md
index 80add03..2639887 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ This is still very experimental and should not be used in any production environ
 apiVersion: v1
 kind: Secret
 metadata:
+  namespace: kube-system
   name: csi-s3-secret
 stringData:
   accessKeyID: <YOUR_ACCESS_KEY_ID>
diff --git a/deploy/kubernetes/attacher.yaml b/deploy/kubernetes/attacher.yaml
index e944f85..46c3aa2 100644
--- a/deploy/kubernetes/attacher.yaml
+++ b/deploy/kubernetes/attacher.yaml
@@ -54,11 +54,14 @@ spec:
       port: 12345
 ---
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: csi-attacher-s3
   namespace: kube-system
 spec:
+  selector:
+    matchLabels:
+      app: "csi-attacher-s3"
   serviceName: "csi-attacher-s3"
   replicas: 1
   template:
diff --git a/deploy/kubernetes/csi-s3.yaml b/deploy/kubernetes/csi-s3.yaml
index 608aee1..b55e581 100644
--- a/deploy/kubernetes/csi-s3.yaml
+++ b/deploy/kubernetes/csi-s3.yaml
@@ -39,7 +39,7 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: DaemonSet
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 metadata:
   name: csi-s3
   namespace: kube-system
diff --git a/deploy/kubernetes/provisioner.yaml b/deploy/kubernetes/provisioner.yaml
index ea4cacb..55f7ff6 100644
--- a/deploy/kubernetes/provisioner.yaml
+++ b/deploy/kubernetes/provisioner.yaml
@@ -53,11 +53,14 @@ spec:
       port: 12345
 ---
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: csi-provisioner-s3
   namespace: kube-system
 spec:
+  selector:
+    matchLabels:
+      app: "csi-provisioner-s3"
   serviceName: "csi-provisioner-s3"
   replicas: 1
   template:
diff --git a/deploy/kubernetes/secret.yaml.sample b/deploy/kubernetes/secret.yaml.sample
index 52d03f7..e3e82c8 100644
--- a/deploy/kubernetes/secret.yaml.sample
+++ b/deploy/kubernetes/secret.yaml.sample
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
+  namespace: kube-system
   name: csi-s3-secret
 stringData:
   accessKeyID: <YOUR_ACCESS_KEY_ID>