diff --git a/tasks/dsk-debian-pkg.yml b/tasks/dsk-debian-pkg.yml
index b945912..b0a70f3 100644
--- a/tasks/dsk-debian-pkg.yml
+++ b/tasks/dsk-debian-pkg.yml
@@ -87,7 +87,7 @@
     - "{{ datasaker_agents }}"
   ignore_errors: true
   when:
-    - "item != 'dsk-maria-agent' and item != 'dsk-mysql-agent' and item != 'dsk-postgres-agent'"
+    - "item == 'dsk-maria-agent' or item == 'dsk-mysql-agent' or item == 'dsk-postgres-agent'"
     - "'database' in group_names"
 
 - name: "Check datasaker Agent"
@@ -126,5 +126,5 @@
     - "{{ datasaker_agents }}"
   ignore_errors: true
   when:
-    - "item != 'dsk-maria-agent' and item != 'dsk-mysql-agent' and item != 'dsk-postgres-agent'"
+    - "item == 'dsk-maria-agent' or item == 'dsk-mysql-agent' or item == 'dsk-postgres-agent'"
     - "'database' in group_names"
\ No newline at end of file
diff --git a/tasks/dsk-redhat-pkg.yml b/tasks/dsk-redhat-pkg.yml
index bfd6ed6..3bb2be1 100644
--- a/tasks/dsk-redhat-pkg.yml
+++ b/tasks/dsk-redhat-pkg.yml
@@ -63,7 +63,7 @@
     - Restart {{ item }} service
   ignore_errors: true
   when:
-    - "item != 'dsk-maria-agent' and item != 'dsk-mysql-agent' and item != 'dsk-postgres-agent'"
+    - "item == 'dsk-maria-agent' or item == 'dsk-mysql-agent' or item == 'dsk-postgres-agent'"
     - "'database' in group_names"
 
 - name: "Check datasaker Agent"
@@ -97,5 +97,5 @@
     - "{{ datasaker_agents }}"
   ignore_errors: true
   when:
-    - "item != 'dsk-maria-agent' and item != 'dsk-mysql-agent' and item != 'dsk-postgres-agent'"
+    - "item == 'dsk-maria-agent' or item == 'dsk-mysql-agent' or item == 'dsk-postgres-agent'"
     - "'database' in group_names"
\ No newline at end of file
diff --git a/tasks/remove-datasaker.yml b/tasks/remove-datasaker.yml
index b1b738b..aefddaf 100644
--- a/tasks/remove-datasaker.yml
+++ b/tasks/remove-datasaker.yml
@@ -20,7 +20,7 @@
     - "{{ datasaker_agents }}"
   when: 
     - datasaker_agents
-    - "item != 'dsk-maria-agent' and item != 'dsk-mysql-agent' and item != 'dsk-postgres-agent'"
+    - "item == 'dsk-maria-agent' or item == 'dsk-mysql-agent' or item == 'dsk-postgres-agent'"
     - "'database' in group_names"
   ignore_errors: true