diff --git a/deploy/kubernetes/attacher.yaml b/deploy/kubernetes/attacher.yaml
index 5414597..e944f85 100644
--- a/deploy/kubernetes/attacher.yaml
+++ b/deploy/kubernetes/attacher.yaml
@@ -1,8 +1,8 @@
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: csi-attacher-sa
+  namespace: kube-system
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -43,6 +43,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: csi-attacher-s3
+  namespace: kube-system
   labels:
     app: csi-attacher-s3
 spec:
@@ -56,6 +57,7 @@ kind: StatefulSet
 apiVersion: apps/v1beta1
 metadata:
   name: csi-attacher-s3
+  namespace: kube-system
 spec:
   serviceName: "csi-attacher-s3"
   replicas: 1
diff --git a/deploy/kubernetes/csi-s3.yaml b/deploy/kubernetes/csi-s3.yaml
index d820195..316e3a1 100644
--- a/deploy/kubernetes/csi-s3.yaml
+++ b/deploy/kubernetes/csi-s3.yaml
@@ -1,8 +1,8 @@
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: csi-s3
+  namespace: kube-system
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -42,6 +42,7 @@ kind: DaemonSet
 apiVersion: apps/v1beta2
 metadata:
   name: csi-s3
+  namespace: kube-system
 spec:
   selector:
     matchLabels:
diff --git a/deploy/kubernetes/provisioner.yaml b/deploy/kubernetes/provisioner.yaml
index bc1887f..25a45fc 100644
--- a/deploy/kubernetes/provisioner.yaml
+++ b/deploy/kubernetes/provisioner.yaml
@@ -1,8 +1,8 @@
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: csi-provisioner-sa
+  namespace: kube-system
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -42,6 +42,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: csi-provisioner-s3
+  namespace: kube-system
   labels:
     app: csi-provisioner-s3
 spec:
@@ -55,6 +56,7 @@ kind: StatefulSet
 apiVersion: apps/v1beta1
 metadata:
   name: csi-provisioner-s3
+  namespace: kube-system
 spec:
   serviceName: "csi-provisioner-s3"
   replicas: 1
diff --git a/deploy/kubernetes/secret.yaml b/deploy/kubernetes/secret.yaml.sample
similarity index 100%
rename from deploy/kubernetes/secret.yaml
rename to deploy/kubernetes/secret.yaml.sample