diff --git a/haproxy-backports-preferences/.kitchen.yml b/haproxy-backports-preferences/.kitchen.yml
deleted file mode 100644
index b21cc3db..00000000
--- a/haproxy-backports-preferences/.kitchen.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-driver:
-  name: docker
-  privileged: true
-  use_sudo: false
-
-provisioner:
-  name: ansible_playbook
-  hosts: test-kitchen
-  roles_path: ../
-  ansible_verbose: true
-  require_ansible_source: false
-  require_chef_for_busser: false
-  idempotency_test: true
-
-platforms:
-  - name: debian
-    driver_config:
-      image: evolix/ansible:2.2.1
-
-suites:
-  - name: default
-    provisioner:
-      name: ansible_playbook
-      playbook: ./tests/test.yml
-
-transport:
-  max_ssh_sessions: 6
diff --git a/haproxy-backports-preferences/README.md b/haproxy-backports-preferences/README.md
deleted file mode 100644
index ad4ffbf9..00000000
--- a/haproxy-backports-preferences/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# haproxy-backports-preferences
-
-Configure APT to prefer haproxy package from jessie-backports.
-
-There is no variable, just a files copied to `/etc/apt/preferences.d/`.
diff --git a/haproxy-backports-preferences/handlers/main.yml b/haproxy-backports-preferences/handlers/main.yml
deleted file mode 100644
index e68f5c28..00000000
--- a/haproxy-backports-preferences/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: apt update
-  apt:
-    update_cache: yes
diff --git a/haproxy-backports-preferences/meta/main.yml b/haproxy-backports-preferences/meta/main.yml
deleted file mode 100644
index 9483c01e..00000000
--- a/haproxy-backports-preferences/meta/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-galaxy_info:
-  author: Evolix
-  description: Configure APT to prefer haproxy package from jessie-backports
-
-  issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues
-
-  license: GPLv2
-
-  min_ansible_version: 2.2
-
-  platforms:
-  - name: Debian
-    versions:
-    - jessie
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
diff --git a/haproxy-backports-preferences/tasks/main.yml b/haproxy-backports-preferences/tasks/main.yml
deleted file mode 100644
index 8d096541..00000000
--- a/haproxy-backports-preferences/tasks/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Prefer HAProxy package from jessie-backports
-  copy:
-    src: haproxy_preferences
-    dest: /etc/apt/preferences.d/999-haproxy
-    force: yes
-    mode: "0640"
-  notify: apt update
-
-- meta: flush_handlers
diff --git a/haproxy-backports-preferences/tests/test.yml b/haproxy-backports-preferences/tests/test.yml
deleted file mode 100644
index 8d667e49..00000000
--- a/haproxy-backports-preferences/tests/test.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- hosts: test-kitchen
-  roles:
-    - role: haproxy-backports-preferences
diff --git a/haproxy/README.md b/haproxy/README.md
index 864a9601..9f597baa 100644
--- a/haproxy/README.md
+++ b/haproxy/README.md
@@ -8,7 +8,7 @@ Everything is in the `tasks/main.yml` file.
 
 ## Available variables
 
-There is no variable.
+* `haproxy_jessie_backports` : on Debian Jessie, we can prefer v1.7 from backports (default: `False`)
 
 ## Configuration templates
 
diff --git a/haproxy/defaults/main.yml b/haproxy/defaults/main.yml
new file mode 100644
index 00000000..ea4a8e38
--- /dev/null
+++ b/haproxy/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+
+haproxy_jessie_backports: False
diff --git a/haproxy-backports-preferences/files/haproxy_preferences b/haproxy/files/haproxy_apt_preferences
similarity index 100%
rename from haproxy-backports-preferences/files/haproxy_preferences
rename to haproxy/files/haproxy_apt_preferences
diff --git a/haproxy/tasks/main.yml b/haproxy/tasks/main.yml
index a699b366..4f0e7820 100644
--- a/haproxy/tasks/main.yml
+++ b/haproxy/tasks/main.yml
@@ -5,6 +5,10 @@
     state: installed
   tags:
   - haproxy
+  - packages
+
+- include: jessie_backports.yml
+  when: ansible_distribution_release == "jessie" and haproxy_jessie_backports
 
 - name: Install HAProxy package
   apt:
@@ -12,6 +16,7 @@
     state: installed
   tags:
   - haproxy
+  - packages
 
 - name: Copy HAProxy configuration
   template:
@@ -26,3 +31,4 @@
   notify: reload haproxy
   tags:
   - haproxy
+  - config
diff --git a/haproxy/tasks/packages_jessie_backports.yml b/haproxy/tasks/packages_jessie_backports.yml
new file mode 100644
index 00000000..024909c3
--- /dev/null
+++ b/haproxy/tasks/packages_jessie_backports.yml
@@ -0,0 +1,20 @@
+---
+
+- name: Prefer HAProxy package from jessie-backports
+  copy:
+    src: haproxy_apt_preferences
+    dest: /etc/apt/preferences.d/999-haproxy
+    force: yes
+    mode: "0640"
+  register: haproxy_apt_preferences
+  tags:
+  - haproxy
+  - packages
+
+- name: update apt
+  apt:
+    update_cache: yes
+  when: haproxy_apt_preferences | changed
+  tags:
+  - haproxy
+  - packages