diff --git a/handlers/main.yml b/handlers/main.yml
index aef29829d346b05d2a4bbb398549fbe6fadb1278..c7200ed16b8b1f1a7985fe72a363419b49cd6a38 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,8 +4,8 @@
 - name: Check HAProxy Config
   command: haproxy -c -f /etc/haproxy/haproxy.cfg
   register: haproxy_config_check
-  changed_when: "Configuration file is valid" in haproxy_config_check.stdout_lines
-  failed_when: "Configuration file is valid" not in haproxy_config_check.stdout_lines
+  changed_when: yes and 'Configuration file is valid' in haproxy_config_check.stdout_lines
+  failed_when: yes and 'Configuration file is valid' not in haproxy_config_check.stdout_lines
   notify:
     - Restart HAProxy
 
diff --git a/tasks/buildcerts.yml b/tasks/buildcerts.yml
index ebe887a5ff52d7e294b9b568a2022317aff8439e..723e83a246ebfcf0e9bc72e69d6969294ed995d2 100644
--- a/tasks/buildcerts.yml
+++ b/tasks/buildcerts.yml
@@ -10,4 +10,4 @@
   when: item.letsencrypt|default(false) and item.active|default(true)
   ignore_errors: yes
   notify:
-    - "Restart HAProxy"
+    - Restart HAProxy
diff --git a/tasks/install.yml b/tasks/install.yml
index ce1bcc664d1680c8d81ba144d24402d6adc15030..66be393895588e6978a814a9a99cecea96c2541c 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -7,7 +7,7 @@
     state: present
     mode: 0644
   with_items:
-    - "ppa:vbernat/haproxy-1.8"
+    - ppa:vbernat/haproxy-1.8
 
 - name: Install some packages
   apt: