diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index a9dd36f8e7cb198a1b8cefe53fb481ec116594a7..7a973c94867357a51d7416a61c93f238b093d2a9 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -80,12 +80,16 @@
     pattern: "*.conf"
   run_once: True
   register: find_custom_fluentd_outputs
+  when:
+    - enable_fluentd | bool
 
 - name: Copying over custom fluentd output config files
   template:
     src: "{{ item.path }}"
     dest: "{{ node_config_directory }}/fluentd/output/{{ item.path | basename }}"
   register: fluentd_output_custom
+  when:
+    - enable_fluentd | bool
   with_items: "{{ find_custom_fluentd_outputs.files }}"
   notify:
     - Restart fluentd container
diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml
index ac648a0f2db800d20f450c81bc34fb6c22ccd788..9eb75ae9870e4e4ea84a76e17bf9f5fdbcd809df 100644
--- a/ansible/roles/common/tasks/pull.yml
+++ b/ansible/roles/common/tasks/pull.yml
@@ -4,4 +4,6 @@
     action: "pull_image"
     common_options: "{{ docker_common_options }}"
     image: "{{ item.value.image }}"
+  when:
+    - item.value.enabled | bool
   with_dict: "{{ common_services }}"