diff --git a/tasks/main.yml b/tasks/main.yml
index 48b3c189ac27c04f37354fb65643a8457ce7d10b..1921d0c17c842502c373b759db8dced5651f7043 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,14 +4,24 @@
 # Output logs and errs into temp files:
 # echo "show errors" | sudo socat unix-connect:/run/haproxy/admin.sock stdio >> /tmp/myhapshowerrs.out 2> /tmp/myhapshowerrs.err
 
+# TODO: Configure HaProxy together with Varnish
+# http://blog.haproxy.com/2015/05/06/haproxys-load-balancing-algorithm-for-static-content-delivery-with-varnish/
+# http://blog.haproxy.com/2012/08/25/haproxy-varnish-and-the-single-hostname-website/
+
+# TODO: What's new in Version 1.6
+# http://blog.haproxy.com/2015/10/14/whats-new-in-haproxy-1-6/
+
 - name: "Proxy | Add Apt Repositories"
-  apt_repository: repo='{{item}}'
-                  state=present
+  apt_repository:
+    repo='{{ item }}'
+    state=present
   with_items:
-    - "ppa:vbernat/haproxy-1.5"
+    - "ppa:vbernat/haproxy-1.6"
 
 - name: "Proxy | Install some packages"
-  apt: pkg={{item}} state=installed
+  apt:
+    pkg='{{ item }}'
+    state=installed
   with_items:
     - haproxy
     - hatop
@@ -20,25 +30,28 @@
     - php5-mysql
 
 - name: "Proxy | create directories"
-  file: dest='{{item}}'
-        state=directory
-        mode=755
+  file:
+    dest='{{ item }}'
+    state=directory
+    mode='755'
   with_items:
     - /etc/haproxy/certs
     - /etc/haproxy/update
 
 - name: "Proxy | Install hatop shortcut"
-  copy: src=usr_local_bin_hatop
-        dest=/usr/local/bin/hatop
-        owner=root
-        group=root
-        mode=755
+  copy:
+    src='usr_local_bin_hatop'
+    dest='/usr/local/bin/hatop'
+    owner='root'
+    group='root'
+    mode='755'
 
 - name: "Proxy | Install log rotator"
-  copy: src=etc_logrotate_d_haproxy
-        dest=/etc/logrotate.d/haproxy
-        owner=root
-        group=root
-        mode=644
+  copy:
+    src='etc_logrotate_d_haproxy'
+    dest='/etc/logrotate.d/haproxy'
+    owner='root'
+    group='root'
+    mode='644'
 
 - include: configure.yml