diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index 0a0125578de898183f37045acca07c8295e66349..ff31d13fd322c7b51dfd97a14c60a4acc0f83057 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -72,7 +72,7 @@
   run_once: True
   register: find_custom_fluentd_inputs
   delegate_to: localhost
-  when: common_services.fluentd | service_enabled_and_mapped_to_host
+  when: common_services.fluentd.enabled | bool
 
 - name: Find custom fluentd filter config files
   find:
@@ -81,7 +81,7 @@
   run_once: True
   register: find_custom_fluentd_filters
   delegate_to: localhost
-  when: common_services.fluentd | service_enabled_and_mapped_to_host
+  when: common_services.fluentd.enabled | bool
 
 - name: Find custom fluentd format config files
   find:
@@ -90,8 +90,7 @@
   run_once: True
   register: find_custom_fluentd_formats
   delegate_to: localhost
-  when:
-    - common_services.fluentd | service_enabled_and_mapped_to_host
+  when: common_services.fluentd.enabled | bool
 
 - name: Find custom fluentd output config files
   find:
@@ -100,8 +99,7 @@
   run_once: True
   register: find_custom_fluentd_outputs
   delegate_to: localhost
-  when:
-    - common_services.fluentd | service_enabled_and_mapped_to_host
+  when: common_services.fluentd.enabled | bool
 
 - name: Copying over td-agent.conf
   vars: