diff --git a/tasks/main.yml b/tasks/main.yml
index e9f30e6e66947c76455983b19eb78163914b133a..fda4ad4c4276c3714ff487cada2f0b32d0009a2b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -64,18 +64,17 @@
 - name: Generate Node certificates
   when: generate_node_certs
   block:
-    - name: Include cert tasks (with gl-groups defined)
-      when: (('sidecar-ca' in groups) and ('graylog-nodes' in groups))
+    - name: Include cert tasks
+      when: (('sidecar-ca' in groups) and ('graylog-nodes' in groups)) and not 'ca-store' in groups
       block:
-        - name: Include Node Cert tasks (with gl-groups defined)
+        - name: Include Node Cert tasks
           ansible.builtin.include_tasks: node-certs.yml
           when: >
             (inventory_hostname not in groups['sidecar-ca']) and
-            (inventory_hostname not in groups['graylog-nodes']) and
-            (inventory_hostname not in groups['ca-store'])
-
+            (inventory_hostname not in groups['graylog-nodes'])
+            
     - name: Include cert tasks (without gl-groups defined)
-      when: not (('sidecar-ca' in groups) and ('graylog-nodes' in groups))
+      when: not (('sidecar-ca' in groups) and ('graylog-nodes' in groups)) and 'ca-store' in groups
       block:
         - name: Include Node Cert tasks (without gl-groups defined)
           ansible.builtin.include_tasks: node-certs.yml