diff --git a/defaults/main.yml b/defaults/main.yml
index 60ab51b..89e9bd1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,5 +3,5 @@ ingress_domain: "local"
 cert_manager_namespace: "cert-manager"
 
 certmanager_csi: true
-certmanager_version: "1.7.0"
+certmanager_version: "1.6.1"
 certmanager_csi_version: "0.2.0"
diff --git a/tasks/main.yml b/tasks/main.yml
index 4b14eec..5e38358 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -108,12 +108,6 @@
 # https://github.com/smallstep/step-issuer
   - name: Install Step webhook
     block:
-#    - name: SmallStep PVC
-#      kubernetes.core.k8s:
-#        state: present
-#        context: "{{ my_context }}"
-#        namespace: "cert-manager"
-#        resource_definition: "{{ lookup('template', 'smallstep-pvc.yml.j2') | from_yaml }}"
     - name: Defined smallstep repository
       kubernetes.core.helm_repository:
         name: smallstep
@@ -130,8 +124,6 @@
 #          ca:
 #            provisioner:
 #              name: "admin"
-#            db:
-#              existingClaim: smallstep
     # https://github.com/smallstep/helm-charts/tree/master/step-issuer
     - name: Deploy step-certificates chart
       kubernetes.core.helm:
diff --git a/templates/smallstep-pvc.yml.j2 b/templates/smallstep-pvc.yml.j2
deleted file mode 100644
index d1796cb..0000000
--- a/templates/smallstep-pvc.yml.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: smallstep
-  labels:
-    app: smallstep
-spec:
-  accessModes:
-{% if smallstep_storage_classname == "manual" %}
-    - ReadWriteOnce
-  storageClassName: manual
-{% elif smallstep_storage_classname == "local" %}
-    - ReadWriteOnce
-  storageClassName: local-path
-{% elif smallstep_storage_classname == "longhorn" %}
-    - ReadWriteOnce
-  storageClassName: longhorn
-{% elif smallstep_storage_classname == "nfs-backup" %}
-    - ReadWriteMany
-  storageClassName: nfs-backup
-{% elif smallstep_storage_classname is not defined or smallstep_storage_classname == "default" %}
-    - ReadWriteOnce
-{% endif %}
-  resources:
-    requests:
-      storage: 1Gi