diff --git a/defaults/main.yml b/defaults/main.yml
index 8e064c320224dd109817fc754c0e6d046082c96e..59c1616fdffa3cb55ad4fa3c41e389a87440db71 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,11 +1,13 @@
-default_proxy:
-proxy_debug: false
-proxy_default_backend:
+---
+
+default_proxy: ''
+proxy_debug: no
+proxy_default_backend: ''
 proxy_certificates: []
 proxy_timeout_connect: 5s
 proxy_timeout_client: 20s
 proxy_timeout_server: 45s
-proxy_redirect_aliase: false
+proxy_redirect_aliase: no
 proxy_maxconn: 100
 proxy_varnish_maxconn: 1000
 proxy_redirect_maps:
diff --git a/tasks/main.yml b/tasks/main.yml
index 338fd7a3bb1bdae737879b0024837f310e339892..5dfc00e64efbe1837032489912fc517065f8a367 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,31 +9,31 @@
 
 - block:
 
-  - import_tasks: install.yml
-  - import_tasks: configure.yml
-    tags:
-      - Config
-  - import_tasks: blacklists.yml
-    tags:
-      - Config
-      - Blacklists
+    - import_tasks: install.yml
+    - import_tasks: configure.yml
+      tags:
+        - Config
+    - import_tasks: blacklists.yml
+      tags:
+        - Config
+        - Blacklists
 
   when: not excluded_roles or "haproxy" not in excluded_roles
 
 - block:
 
-  - name: Install Certs
-    include_tasks: ../../letsencrypt/tasks/cert.yml
-    with_items: '{{ proxy_certificates|default([]) }}'
-    loop_control:
-      loop_var: domain
-    when: domain.letsencrypt|default(false) and domain.active|default(true)
+    - name: Install Certs
+      include_tasks: ../../letsencrypt/tasks/cert.yml
+      with_items: '{{ proxy_certificates|default([]) }}'
+      loop_control:
+        loop_var: domain
+      when: domain.letsencrypt|default(false) and domain.active|default(true)
 
-  - name: Renew Existing Cert
-    import_tasks: ../../letsencrypt/tasks/renew.yml
+    - name: Renew Existing Cert
+      import_tasks: ../../letsencrypt/tasks/renew.yml
 
-  - name: Build HaProxy Certs
-    import_tasks: buildcerts.yml
+    - name: Build HaProxy Certs
+      import_tasks: buildcerts.yml
 
   tags:
     - Certs