diff --git a/tasks/csi.yml b/tasks/csi.yml
index 9e8170a..3466de6 100644
--- a/tasks/csi.yml
+++ b/tasks/csi.yml
@@ -1,28 +1,23 @@
 ---
-- name: CSI Cert Manager Setup
-  block:
-  - set_fact:
-      certmanager_csi_state: "present"
-    when:
-      - certmanager_csi|bool
+- set_fact:
+    certmanager_csi_state: "present"
+  when:
+    - certmanager_csi|bool
 
-  - set_fact:
-      certmanager_csi_state: "absent"
-    when:
-      - not certmanager_csi|bool
+- 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 }}"
-      merge_type: merge
-      resource_definition: "{{ lookup('file', item) | from_yaml }}"
-    with_items:
-      - "csi/csi.cert-manager.io-CSIDriver.yaml"
-      - "csi/cert-manager-csi-ServiceAccount.yaml"
-      - "csi/cert-manager-csi-ClusterRole.yaml"
-      - "csi/cert-manager-csi-ClusterRoleBinding.yaml"
-      - "csi/cert-manager-csi-DaemonSet.yaml"
-  tags:
-    - certmanager
-    - storage
+- name: CSI Cert Manager files need to be {{ certmanager_csi_state }}
+  k8s:
+    state: "{{ certmanager_csi_state }}"
+    context: "{{ my_context }}"
+    merge_type: merge
+    resource_definition: "{{ lookup('files', item) | from_yaml }}"
+  with_items:
+    - "csi/csi.cert-manager.io-CSIDriver.yaml"
+    - "csi/cert-manager-csi-ServiceAccount.yaml"
+    - "csi/cert-manager-csi-ClusterRole.yaml"
+    - "csi/cert-manager-csi-ClusterRoleBinding.yaml"
+    - "csi/cert-manager-csi-DaemonSet.yaml"
diff --git a/tasks/main.yml b/tasks/main.yml
index 1f7d606..ca27417 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,3 +1,8 @@
+- name: Print the kubectl context
+  debug:
+    var: my_context
+  tags: certmanager
+
 - name: Cert Manager setup
   block:
   - name: namespace
@@ -7,6 +12,7 @@
       name: cert-manager
       api_version: v1
       kind: Namespace
+    tags: certmanager
 
   - name: Get Deployment information object
     k8s_info:
@@ -27,35 +33,36 @@
     include_tasks: "version_0.11.0.yml"
     when:
       - certmanager_version | regex_search('(0.11)') or certmanager_actual_version.stdout | regex_search('(0.11)')
+    tags: certmanager
 
   - name: install / uninstall version 0.12
     include_tasks: "version_0.12.yml"
     when:
       - certmanager_version | regex_search('(0.12)') or certmanager_actual_version.stdout | regex_search('(0.12)')
+    tags: certmanager
 
   - name: install / uninstall version 0.13
     include_tasks: "version_0.13.yml"
     when:
       - certmanager_version | regex_search('(0.13)') or certmanager_actual_version.stdout | regex_search('(0.13)')
+    tags: certmanager
 
   - name: install / uninstall version 0.14
     include_tasks: "version_0.14.yml"
     when:
       - certmanager_version | regex_search('(0.14)') or certmanager_actual_version.stdout | regex_search('(0.14)')
+    tags: certmanager
 
   - name: install / uninstall version 0.15
     include_tasks: "version_0.15.yml"
     when:
       - certmanager_version | regex_search('(0.15)') or certmanager_actual_version.stdout | regex_search('(0.15)')
-
-  tags: certmanager
+    tags: certmanager
 
 
 
-- name: install / uninstall Cert-Manager CSI Kubernetes drivers
-  include_tasks: "csi.yml"
-  when:
-    - certmanager_csi|bool
-  tags:
-    - certmanager
-    - storage
+  - name: install / uninstall Cert-Manager CSI Kubernetes drivers
+    include_tasks: "csi.yml"
+    when:
+      - certmanager_csi
+    tags: certmanager|bool
diff --git a/tasks/version_0.11.0.yml b/tasks/version_0.11.0.yml
index 4800546..15d2efa 100644
--- a/tasks/version_0.11.0.yml
+++ b/tasks/version_0.11.0.yml
@@ -13,7 +13,6 @@
   k8s:
     state: "{{ certmanager_0_11_0_state }}"
     context: "{{ my_context }}"
-    merge_type: merge
     resource_definition: "{{ lookup('template', item) | from_yaml }}"
   with_items:
     - "0.11.0/challenges.acme.cert-manager.io-CustomResourceDefinition.yaml"
diff --git a/tasks/version_0.12.yml b/tasks/version_0.12.yml
index 28eea57..9993202 100644
--- a/tasks/version_0.12.yml
+++ b/tasks/version_0.12.yml
@@ -13,7 +13,6 @@
   k8s:
     state: "{{ certmanager_0_12_state }}"
     context: "{{ my_context }}"
-    merge_type: merge
     resource_definition: "{{ lookup('template', item) | from_yaml }}"
   with_items:
     - "0.12/certificaterequests.cert-manager.io-CustomResourceDefinition.yaml"
diff --git a/tasks/version_0.13.yml b/tasks/version_0.13.yml
index 95d90eb..9318e9b 100644
--- a/tasks/version_0.13.yml
+++ b/tasks/version_0.13.yml
@@ -13,7 +13,6 @@
   k8s:
     state: "{{ certmanager_0_13_state }}"
     context: "{{ my_context }}"
-    merge_type: merge
     resource_definition: "{{ lookup('template', item) | from_yaml }}"
   with_items:
     - "0.13/certificaterequests.cert-manager.io-CustomResourceDefinition.yaml"
diff --git a/tasks/version_0.14.yml b/tasks/version_0.14.yml
index 0e4e40c..768f46e 100644
--- a/tasks/version_0.14.yml
+++ b/tasks/version_0.14.yml
@@ -13,7 +13,6 @@
   k8s:
     state: "{{ certmanager_0_14_state }}"
     context: "{{ my_context }}"
-    merge_type: merge
     resource_definition: "{{ lookup('template', item) | from_yaml }}"
   with_items:
     - "0.14/certificaterequests.cert-manager.io-CustomResourceDefinition.yaml"
diff --git a/tasks/version_0.15.yml b/tasks/version_0.15.yml
index 0932c3d..36e72ca 100644
--- a/tasks/version_0.15.yml
+++ b/tasks/version_0.15.yml
@@ -13,7 +13,6 @@
   k8s:
     state: "{{ certmanager_0_15_state }}"
     context: "{{ my_context }}"
-    merge_type: merge
     resource_definition: "{{ lookup('template', item) | from_yaml }}"
   with_items:
     - "0.15/issuers.cert-manager.io-CustomResourceDefinition.yaml"