diff --git a/defaults/main.yml b/defaults/main.yml
index 7d9a7f4..89e9bd1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,3 +4,4 @@ cert_manager_namespace: "cert-manager"
 
 certmanager_csi: true
 certmanager_version: "1.6.1"
+certmanager_csi_version: "0.2.0"
diff --git a/tasks/csi.yml b/tasks/csi.yml
deleted file mode 100644
index 7c59f76..0000000
--- a/tasks/csi.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: CSI Cert Manager Setup
-  block:
-  - name: Define state to present
-    set_fact:
-      certmanager_csi_state: "present"
-    when:
-      - certmanager_csi|bool
-
-  - name: Define state to absent
-    set_fact:
-      certmanager_csi_state: "absent"
-    when:
-      - not certmanager_csi|bool
-
-  - name: CSI Cert Manager files need to be {{ certmanager_csi_state }}
-    k8s:
-      state: "{{ certmanager_csi_state }}"
-      context: "{{ my_context }}"
-      apply: true
-      definition: "{{ item }}"
-    with_items:
-      - "{{ lookup('url', certmanager_csi_driver_url, split_lines=False) | from_yaml_all | list }}"
-  tags:
-    - cert-manager
-    - storage
diff --git a/tasks/main.yml b/tasks/main.yml
index 411beec..49ded8f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -130,7 +130,13 @@
 
 
 - name: install / uninstall Cert-Manager CSI Kubernetes drivers
-  include_tasks: "csi.yml"
+  kubernetes.core.helm:
+    context: "{{ my_context }}"
+    name: cert-manager-csi-driver
+    chart_ref: jetstack/cert-manager-csi-driver
+    chart_version: "{{ certmanager_csi_version }}"
+    create_namespace: yes
+    release_namespace: "cert-manager"
   when:
     - certmanager_csi|bool
   tags: