diff --git a/tasks/haproxy_install_apt.yml b/tasks/haproxy_install_apt.yml
index 9fb376e..a6533a3 100644
--- a/tasks/haproxy_install_apt.yml
+++ b/tasks/haproxy_install_apt.yml
@@ -16,7 +16,6 @@
 # NOTE(cloudnull) This can be removed when we drop 14.04 support
 - include: haproxy_add_ppa_repo.yml
   when:
-    - haproxy_ssl | bool
     - ansible_distribution_version | version_compare('16.04', '<')
 
 #TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
diff --git a/templates/service.j2 b/templates/service.j2
index 86e5e3d..e799bb3 100644
--- a/templates/service.j2
+++ b/templates/service.j2
@@ -25,7 +25,7 @@
 {% endif -%}
 
 {% for vip_bind in vip_binds %}
-{% if item.service.haproxy_redirect_http_port is defined %}
+{% if item.service.haproxy_redirect_http_port is defined and item.service.haproxy_ssl %}
 {% if (loop.index == 1 or item.service.haproxy_ssl_all_vips | default(false) | bool) %}
 
 frontend {{ item.service.haproxy_service_name }}-redirect-front-{{ loop.index }}