diff --git a/deployment/puppet/openstack/manifests/ha/horizon.pp b/deployment/puppet/openstack/manifests/ha/horizon.pp
index 098e7eb34a..bdb6895296 100644
--- a/deployment/puppet/openstack/manifests/ha/horizon.pp
+++ b/deployment/puppet/openstack/manifests/ha/horizon.pp
@@ -55,9 +55,9 @@ class openstack::ha::horizon (
       server_names           => undef,
       ipaddresses            => undef,
       haproxy_config_options => {
-        'option'   => 'http-buffer-request',
-        'timeout'  => 'http-request 10s',
-        'redirect' => 'scheme https if !{ ssl_fc }'
+        'option'       => 'http-buffer-request',
+        'timeout'      => 'http-request 10s',
+        'http-request' => 'redirect location https://%[req.hdr(Host)]/horizon',
       },
     }
 
diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb
index b330f4cb49..1cb08a66f6 100644
--- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb
+++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb
@@ -33,9 +33,9 @@ describe manifest do
             'server_names'           => nil,
             'ipaddresses'            => nil,
             'haproxy_config_options' => {
-              'option'   => 'http-buffer-request',
-              'timeout'  => 'http-request 10s',
-              'redirect' => 'scheme https if !{ ssl_fc }'
+              'option'       => 'http-buffer-request',
+              'timeout'      => 'http-request 10s',
+              'http-request' => 'redirect location https://%[req.hdr(Host)]/horizon',
             }
           )
           should_not contain_haproxy__balancermember('horizon')