diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-task.yaml
index d7b781cd2b..83da7246f1 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-task.yaml
@@ -32,7 +32,7 @@ spec:
     default: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
   - name: STORAGE_DRIVER
     description: Set buildah storage driver
-    default: overlay
+    default: vfs
   - name: DOCKERFILE
     description: Path to the Dockerfile to build.
     default: ./Dockerfile
@@ -71,8 +71,6 @@ spec:
     volumeMounts:
     - name: varlibcontainers
       mountPath: /var/lib/containers
-    securityContext:
-      privileged: true
 
   - name: push
     image: $(params.BUILDER_IMAGE)
@@ -85,8 +83,6 @@ spec:
     volumeMounts:
     - name: varlibcontainers
       mountPath: /var/lib/containers
-    securityContext:
-      privileged: true
 
   - name: digest-to-results
     image: $(params.BUILDER_IMAGE)
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-v0-19-0-task.yaml
index 933ff07c4a..291617be12 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/02-clustertasks/buildah/buildah-v0-19-0-task.yaml
@@ -32,7 +32,7 @@ spec:
     default: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
   - name: STORAGE_DRIVER
     description: Set buildah storage driver
-    default: overlay
+    default: vfs
   - name: DOCKERFILE
     description: Path to the Dockerfile to build.
     default: ./Dockerfile
@@ -71,8 +71,6 @@ spec:
     volumeMounts:
     - name: varlibcontainers
       mountPath: /var/lib/containers
-    securityContext:
-      privileged: true
 
   - name: push
     image: $(params.BUILDER_IMAGE)
@@ -85,8 +83,6 @@ spec:
     volumeMounts:
     - name: varlibcontainers
       mountPath: /var/lib/containers
-    securityContext:
-      privileged: true
 
   - name: digest-to-results
     image: $(params.BUILDER_IMAGE)