diff --git a/charts/generic/disk-fill/experiment.yaml b/charts/generic/disk-fill/experiment.yaml
index 94c734a..cb85253 100644
--- a/charts/generic/disk-fill/experiment.yaml
+++ b/charts/generic/disk-fill/experiment.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/version: latest
 spec:
   definition:
-    scope: Cluster
+    scope: Namespaced
     permissions: 
       - apiGroups:
           - ""
diff --git a/charts/generic/disk-fill/rbac-psp.yaml b/charts/generic/disk-fill/rbac-psp.yaml
index d7918b4..3e56296 100644
--- a/charts/generic/disk-fill/rbac-psp.yaml
+++ b/charts/generic/disk-fill/rbac-psp.yaml
@@ -9,9 +9,10 @@ metadata:
     app.kubernetes.io/part-of: litmus
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
   name: disk-fill-sa
+  namespace: default
   labels:
     name: disk-fill-sa
     app.kubernetes.io/part-of: litmus
@@ -43,15 +44,16 @@ rules:
   resourceNames: ["litmus"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: RoleBinding
 metadata:
   name: disk-fill-sa
+  namespace: default
   labels:
     name: disk-fill-sa
     app.kubernetes.io/part-of: litmus
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: Role
   name: disk-fill-sa
 subjects:
 - kind: ServiceAccount
diff --git a/charts/generic/disk-fill/rbac.yaml b/charts/generic/disk-fill/rbac.yaml
index c542021..116e10a 100644
--- a/charts/generic/disk-fill/rbac.yaml
+++ b/charts/generic/disk-fill/rbac.yaml
@@ -9,9 +9,10 @@ metadata:
     app.kubernetes.io/part-of: litmus
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
   name: disk-fill-sa
+  namespace: default
   labels:
     name: disk-fill-sa
     app.kubernetes.io/part-of: litmus
@@ -39,15 +40,16 @@ rules:
   verbs: ["create","list","get","patch","update"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: RoleBinding
 metadata:
   name: disk-fill-sa
+  namespace: default
   labels:
     name: disk-fill-sa
     app.kubernetes.io/part-of: litmus
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: Role
   name: disk-fill-sa
 subjects:
 - kind: ServiceAccount