diff --git a/elasticsearch/tasks/bootstrap_checks.yml b/elasticsearch/tasks/bootstrap_checks.yml
index a79204b2..b1f79046 100644
--- a/elasticsearch/tasks/bootstrap_checks.yml
+++ b/elasticsearch/tasks/bootstrap_checks.yml
@@ -13,7 +13,7 @@
     name: vm.max_map_count
     value: 262144
     sysctl_file: /etc/sysctl.d/elasticsearch.conf
-  when: "{{ max_map_count|int < 262144 }}"
+  when: max_map_count | int < 262144
   tags:
   - config
 
diff --git a/redis/tasks/munin.yml b/redis/tasks/munin.yml
index 2535a369..5f2a2dc7 100644
--- a/redis/tasks/munin.yml
+++ b/redis/tasks/munin.yml
@@ -66,11 +66,17 @@
     option: env.password
     value: '{{ redis_password }}'
   notify: restart munin-node
-  when: "redis_password != '' and redis_password != None and {{munin_redis_blocs_in_config.stdout | int}} <= 1"
+  when:
+    - redis_password != ''
+    - redis_password != None
+    - (munin_redis_blocs_in_config.stdout | int) <= 1
   tags: redis
 
 
 - name: Warn if multiple instance in munin-plugins configuration
   debug:
     msg: "WARNING - It seems you have multiple redis sections in your munin-node configuration - Munin config NOT changed"
-  when: "redis_password != '' and redis_password != None and {{munin_redis_blocs_in_config.stdout | int}} > 1 "
+  when:
+    - redis_password != ''
+    - redis_password != None
+    - (munin_redis_blocs_in_config.stdout | int) > 1