diff --git a/roles/cassandra/tasks/main.yml b/roles/cassandra/tasks/main.yml
index 86f49a496632dcb7d3f54b483b2f5c6f0aacf730..0569ae7800b7889e9d7693c68246aa86cbd7b5f3 100644
--- a/roles/cassandra/tasks/main.yml
+++ b/roles/cassandra/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-cassandra
    - init
 - include: stop.yml
   tags:
diff --git a/roles/cortex/tasks/main.yml b/roles/cortex/tasks/main.yml
index 0ce28c0df0c51e7587e6f1e5a057522cddad870e..a494e3f9b8d4099da6d96ed71d9244b1f516dd81 100644
--- a/roles/cortex/tasks/main.yml
+++ b/roles/cortex/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-cortex
    - init
 - include: stop.yml
   tags:
diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml
index b93f5ee443318adea0168370937261ae7c7a56a0..d0fb7ab228972bfc8c8469c6df41b91edbef4919 100644
--- a/roles/haproxy/tasks/main.yml
+++ b/roles/haproxy/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-haproxy
    - init
 - include: stop.yml
   tags:
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index 657a525dce24f39ce9f9800c6175e582e802d01f..7d7bc1619237cef13ed0afe76d63de64e7916ddf 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-keycloak
    - init
 - include: stop.yml
   tags: 
diff --git a/roles/misp/tasks/main.yml b/roles/misp/tasks/main.yml
index ce31c849ef4908a80808ef694d1bc32f48009831..73e30bce11ebbb36a6458d7a1b22649d07d686ae 100644
--- a/roles/misp/tasks/main.yml
+++ b/roles/misp/tasks/main.yml
@@ -6,13 +6,16 @@
 - include: start.yml
   tags:
    - start
+   - start-misp
    - init
 - include: config.yml
   tags:
    - init
    - config
 - include: stop.yml
-  tags: stop
+  tags:
+   - stop
+   - stop-misp
 - include: update-config.yml
   tags:
    - update-config
diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml
index 83c2328f8db264e7774b4071dba4f54c92dd24cb..7b6d8eeb58e95d3637b229da518e2175e3458569 100644
--- a/roles/mysql/tasks/main.yml
+++ b/roles/mysql/tasks/main.yml
@@ -12,6 +12,7 @@
 - include: start.yml
   tags:
    - start
+   - start-mysql
 - include: stop.yml
   tags:
    - stop
diff --git a/roles/nifi/tasks/main.yml b/roles/nifi/tasks/main.yml
index 9ae065041461c7e0449ea19ea1d6a3b04b8982e6..5667605a7cc6a79852dc33bb984b607f2675123d 100644
--- a/roles/nifi/tasks/main.yml
+++ b/roles/nifi/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-nifi
    - init
 - include: stop.yml
   tags:
diff --git a/roles/odfees/tasks/main.yml b/roles/odfees/tasks/main.yml
index 50f6080676eae1f61a54afd5378a011f821be43c..2e7a390abbb8ce24c2b29629f37d448f87530a9d 100644
--- a/roles/odfees/tasks/main.yml
+++ b/roles/odfees/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-odfees
    - init
 - include: stop.yml
   tags:
diff --git a/roles/odfekibana/tasks/main.yml b/roles/odfekibana/tasks/main.yml
index 671f2b98e823eb330ef0ac8a2933d83a77d0a357..429925b89da09f01c8de81db6edcdbeb6be5d407 100644
--- a/roles/odfekibana/tasks/main.yml
+++ b/roles/odfekibana/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-odfekibana
    - init
 - include: stop.yml
   tags:
diff --git a/roles/thehive/tasks/main.yml b/roles/thehive/tasks/main.yml
index ef9011eb4566c7c87660d2be18c6680c714eb01d..cb0d5d73c654e36ad22216d99a47d3226b74ac79 100644
--- a/roles/thehive/tasks/main.yml
+++ b/roles/thehive/tasks/main.yml
@@ -6,6 +6,7 @@
 - include: start.yml
   tags:
    - start
+   - start-thehive
    - init
 - include: adminuser.yml
   tags:
diff --git a/soctools.yml b/soctools.yml
index 8074042b9f5da896d3c9ae7f9b860ed782a9b444..2dd3142cfc95b19f689cea9ef193843e584c128c 100644
--- a/soctools.yml
+++ b/soctools.yml
@@ -10,7 +10,7 @@
 
 - name: Start soctools cluster
   import_playbook: startsoctools.yml
-  when: "'start' in ansible_run_tags or 'config' in ansible_run_tags"
+  when: "'start' in ansible_run_tags or 'config' in ansible_run_tags or 'start-thehive' in ansible_run_tags or 'start-keycloak' in ansible_run_tags or 'start-cortex' in ansible_run_tags or 'start-haproxy' in ansible_run_tags or 'start-cassandra' in ansible_run_tags or 'start-filebeat' in ansible_run_tags or 'start-misp' in ansible_run_tags or 'start-mysql' in ansible_run_tags or 'start-nifi' in ansible_run_tags or 'start-odfees' in ansible_run_tags or 'start-odfekibana' in ansible_run_tags"
 
 - name: Stop soctools cluster
   import_playbook: stopsoctools.yml