diff --git a/README.md b/README.md
index 8da4d14f..84b870d2 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Kubernetes:
 # Set the subject of the RBAC objects to the current namespace where the provisioner is being deployed
 $ NS=$(kubectl config get-contexts|grep -e "^\*" |awk '{print $5}')
 $ NAMESPACE=${NS:-default}
-$ sed -i'' "s/namespace:.*/namespace: $NAMESPACE/g" ./deploy/rbac.yaml
+$ sed -i'' "s/namespace:.*/namespace: $NAMESPACE/g" ./deploy/rbac.yaml ./deploy/deployment.yaml
 $ kubectl create -f deploy/rbac.yaml
 ```
 
diff --git a/deploy/deployment-arm.yaml b/deploy/deployment-arm.yaml
index 785302bd..d736221b 100644
--- a/deploy/deployment-arm.yaml
+++ b/deploy/deployment-arm.yaml
@@ -1,22 +1,24 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: nfs-client-provisioner
----
+apiVersion: apps/v1
 kind: Deployment
-apiVersion: extensions/v1beta1
 metadata:
   name: nfs-client-provisioner
+  labels:
+    app: nfs-client-provisioner
+  # replace with namespace where provisioner is deployed
+  namespace: default
 spec:
   replicas: 1
   strategy:
     type: Recreate
+  selector:
+    matchLabels:
+      app: nfs-client-provisioner
   template:
     metadata:
       labels:
         app: nfs-client-provisioner
     spec:
-      serviceAccount: nfs-client-provisioner
+      serviceAccountName: nfs-client-provisioner
       containers:
         - name: nfs-client-provisioner
           image: quay.io/external_storage/nfs-client-provisioner-arm:latest
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
index 271ca060..0ec9c4ed 100644
--- a/deploy/deployment.yaml
+++ b/deploy/deployment.yaml
@@ -1,16 +1,18 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: nfs-client-provisioner
----
+apiVersion: apps/v1
 kind: Deployment
-apiVersion: extensions/v1beta1
 metadata:
   name: nfs-client-provisioner
+  labels:
+    app: nfs-client-provisioner
+  # replace with namespace where provisioner is deployed
+  namespace: default
 spec:
   replicas: 1
   strategy:
     type: Recreate
+  selector:
+    matchLabels:
+      app: nfs-client-provisioner
   template:
     metadata:
       labels:
diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml
index 626ee3ab..9609a008 100644
--- a/deploy/rbac.yaml
+++ b/deploy/rbac.yaml
@@ -1,7 +1,9 @@
-kind: ServiceAccount
 apiVersion: v1
+kind: ServiceAccount
 metadata:
   name: nfs-client-provisioner
+  # replace with namespace where provisioner is deployed
+  namespace: default
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -28,6 +30,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: nfs-client-provisioner
+    # replace with namespace where provisioner is deployed
     namespace: default
 roleRef:
   kind: ClusterRole
@@ -38,6 +41,8 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: leader-locking-nfs-client-provisioner
+    # replace with namespace where provisioner is deployed
+    namespace: default
 rules:
   - apiGroups: [""]
     resources: ["endpoints"]