diff --git a/task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml b/task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml
index 4548b6c..55cc698 100644
--- a/task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml
+++ b/task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml
@@ -22,12 +22,6 @@ spec:
       description: Includes credentials for the docker image registry.
       optional: true
       mountPath: /home/build/.docker
-    - name: buildah-storage
-      description: buildah's container storage.
-      optional: true
-      mountPath: /storage
-      # mountPath: /home/build/.local/share/containers
-      # mountPath: /foo
   params:
     - name: OUTPUT
       type: string
@@ -67,18 +61,6 @@ spec:
     - name: metadata-out
       emptyDir: {}
   steps:
-    # - name: set-permissions
-    #   image: $(params.BUILDER_IMAGE)
-    #   workingDir: "$(workspaces.source.path)"
-    #   script: |
-    #     #!/usr/bin/env sh
-    #     set -euo pipefail
-
-    #     # chown -R 1000:1000 /home/build/.local/share/containers
-    #   securityContext:
-    #     runAsNonRoot: false
-    #     runAsUser: 0
-    #     runAsGroup: 0
     - name: write-config
       image: $(params.BUILDER_IMAGE)
       workingDir: "$(workspaces.source.path)"
@@ -91,15 +73,6 @@ spec:
         tee /home/build/.config/containers/registries.conf <<EOF
         $(params.REGISTRIES_CONF)
         EOF
-        tee > /home/build/.config/containers/storage.conf <<EOF
-        [storage]
-        driver = "overlay"
-        runroot = "/storage/run/containers/storage"
-        graphroot = "/storage/.local/share/containers/storage"
-        rootless_storage_path = "/storage/.local/share/containers/storage"
-        [storage.options]
-        pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""}
-        EOF
 
         cat > /home/build/.config/containers/entrypoint.sh <<EOF
         #!/usr/bin/env sh
@@ -113,13 +86,11 @@ spec:
         # ln -s $(workspaces.buildah-storage.path) /home/build/.local/share/containers/storage
         # ls -lR /home/build/.local/share/containers
 
-        cp /home/build/.config/containers_mount/{registries.conf,storage.conf} /home/build/.config/containers/
+        cp /home/build/.config/containers_mount/registries.conf /home/build/.config/containers/
 
         additional_args=(--source-date-epoch 100
                          --layers
-                         --storage-driver vfs
-                         --isolation=chroot
-                         --cap-add=all)
+                         --storage-driver vfs)
 
         if [ -n "\$(find /tekton/creds/.ssh -maxdepth 1 -name 'id_*' -print -quit)" ]; then
             eval \$(ssh-agent)