diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index eb79632c06..c7faf7b25c 100644
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -174,7 +174,10 @@ outputs:
             - null
       kolla_config:
         /var/lib/kolla/config_files/haproxy.json:
-          command: /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg
+          # HAProxy 1.8 doesn't ship haproxy-systemd-wrapper, we have
+          # to use a new dedicated option for live config reload.
+          # Note: we can't use quotes in kolla command, hence the workaround
+          command: bash -c $* -- eval if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then exec /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg; else exec /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -Ws; fi
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 38c92e263e..b1d793db10 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@ -177,7 +177,10 @@ outputs:
             data: *tls_mapping
       kolla_config:
         /var/lib/kolla/config_files/haproxy.json:
-          command: /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg
+          # HAProxy 1.8 doesn't ship haproxy-systemd-wrapper, we have
+          # to use a new dedicated option for live config reload.
+          # Note: we can't use quotes in kolla command, hence the workaround
+          command: bash -c $* -- eval if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then exec /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg; else exec /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -Ws; fi
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"