diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index c93cc292c..d2fa1e140 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -885,6 +885,7 @@ class tripleo::haproxy (
       ip_addresses      => hiera('neutron_api_node_ips', $controller_hosts_real),
       server_names      => hiera('neutron_api_node_names', $controller_hosts_names_real),
       mode              => 'http',
+      listen_options    => merge($default_listen_options, { 'balance' => $haproxy_lb_mode_longrunning }),
       public_ssl_port   => $ports[neutron_api_ssl_port],
       service_network   => $neutron_network,
       member_options    => union($haproxy_member_options, $internal_tls_member_options),
@@ -899,6 +900,7 @@ class tripleo::haproxy (
       ip_addresses      => hiera('cinder_api_node_ips', $controller_hosts_real),
       server_names      => hiera('cinder_api_node_names', $controller_hosts_names_real),
       mode              => 'http',
+      listen_options    => merge($default_listen_options, { 'balance' => $haproxy_lb_mode_longrunning }),
       public_ssl_port   => $ports[cinder_api_ssl_port],
       service_network   => $cinder_network,
       member_options    => union($haproxy_member_options, $internal_tls_member_options),
@@ -1120,6 +1122,7 @@ class tripleo::haproxy (
   if $swift_proxy_server {
     $swift_proxy_server_listen_options = {
       'option'         => [ 'httpchk GET /healthcheck', ],
+      'balance'        => $haproxy_lb_mode_longrunning,
       'timeout client' => '2m',
       'timeout server' => '2m',
     }
@@ -1227,6 +1230,7 @@ class tripleo::haproxy (
       public_ssl_port   => $ports[ironic_inspector_ssl_port],
       service_network   => $ironic_inspector_network,
       mode              => 'http',
+      listen_options    => merge($default_listen_options, { 'balance' => $haproxy_lb_mode_longrunning }),
     }
   }
 
@@ -1449,7 +1453,13 @@ class tripleo::haproxy (
       mode              => 'http',
       public_ssl_port   => $ports[ceph_rgw_ssl_port],
       service_network   => $ceph_rgw_network,
-      listen_options    => merge($default_listen_options, { 'option' => [ 'httpchk GET /swift/healthcheck' ] }),
+      listen_options    => merge(
+        $default_listen_options,
+        {
+          'option'  => [ 'httpchk GET /swift/healthcheck' ],
+          'balance' => $haproxy_lb_mode_longrunning
+        }
+      ),
       member_options    => union($haproxy_member_options, $internal_tls_member_options),
     }
   }
diff --git a/releasenotes/notes/haproxy-leastconn-overrides-bdb2068ef794ff1d.yaml b/releasenotes/notes/haproxy-leastconn-overrides-bdb2068ef794ff1d.yaml
index 7cce3d861..090fe21fb 100644
--- a/releasenotes/notes/haproxy-leastconn-overrides-bdb2068ef794ff1d.yaml
+++ b/releasenotes/notes/haproxy-leastconn-overrides-bdb2068ef794ff1d.yaml
@@ -1,11 +1,9 @@
 ---
-features:
-  - |
-    Add `haproxy_lb_mode_longrunning` parameter for the use with the services
-    that may have longrunning API requests. Defaults to 'leastconn' (replaces
-    the HAProxy default 'roundrobin').
 upgrade:
   - |
     Since Heat API can be given longrunning API requests its backends will
     become load-balanced based on LRU 'leastconn' algorithm and its sessions
     will also benefit from the TCP-keepalive feature of HAProxy.
+
+    Some of the other services with the longrunning requests notion will start
+    using the 'leastconn' LRU LB as well.
diff --git a/spec/classes/tripleo_haproxy_spec.rb b/spec/classes/tripleo_haproxy_spec.rb
index ce5554ba5..d7519fa23 100644
--- a/spec/classes/tripleo_haproxy_spec.rb
+++ b/spec/classes/tripleo_haproxy_spec.rb
@@ -187,6 +187,48 @@ describe 'tripleo::haproxy' do
         )
       end
     end
+
+    describe "APIs with long running actions to use leastconn" do
+      before :each do
+        params.merge!({
+          :neutron            => true,
+          :cinder             => true,
+          :swift_proxy_server => true,
+          :heat_api           => true,
+          :heat_cfn           => true,
+          :ironic_inspector   => true,
+          :ceph_rgw           => true,
+        })
+      end
+
+      %w(neutron cinder swift_proxy_server heat_cfn ironic-inspector ceph_rgw).each do |api|
+        it 'should configure haproxy ' + api + ' endpoint' do
+          is_expected.to contain_haproxy__listen(api)
+          p = catalogue.resource('tripleo::haproxy::endpoint', api).send(:parameters)
+          expect(p).to include(listen_options: a_hash_including('balance' => 'leastconn'))
+        end
+      end
+    end
+
+    describe "source-based sticky sessions w/o use of consistent hashing" do
+      before :each do
+        params.merge!({
+          :etcd            => true,
+          :ceph_grafana    => true,
+          :ceph_dashboard  => true,
+          :nova_novncproxy => true,
+        })
+      end
+
+      %w(etcd ceph_grafana ceph_dashboard nova_novncproxy).each do |svc|
+        it 'should configure haproxy ' + svc + ' endpoint' do
+          is_expected.to contain_haproxy__listen(svc)
+          p = catalogue.resource('tripleo::haproxy::endpoint', svc).send(:parameters)
+          expect(p).to include(listen_options: a_hash_including(
+            'balance' => 'source'))
+        end
+      end
+    end
   end
 
   on_supported_os.each do |os, facts|