diff --git a/roles/sys-ctl-cln-certs/tasks/main.yml b/roles/sys-ctl-cln-certs/tasks/main.yml
index de84c272..3f5209eb 100644
--- a/roles/sys-ctl-cln-certs/tasks/main.yml
+++ b/roles/sys-ctl-cln-certs/tasks/main.yml
@@ -1,2 +1,4 @@
 - include_tasks: 01_core.yml
-  when: run_once_sys_ctl_cln_certs is not defined
\ No newline at end of file
+  when:
+    - run_once_sys_ctl_cln_certs is not defined
+    - (MODE_CLEANUP | bool) and not (MODE_RESET | bool)
\ No newline at end of file