diff --git a/ansible/roles/haproxy-config/tasks/main.yml b/ansible/roles/haproxy-config/tasks/main.yml
index 07caf04463..19920d463a 100644
--- a/ansible/roles/haproxy-config/tasks/main.yml
+++ b/ansible/roles/haproxy-config/tasks/main.yml
@@ -3,6 +3,8 @@
   vars:
     service: "{{ item.value }}"
     haproxy_templates:
+      - "{{ node_custom_config }}/haproxy-config/{{ inventory_hostname }}/{{ item.key }}.cfg"
+      - "{{ node_custom_config }}/haproxy-config/{{ item.key }}.cfg"
       - "{{ node_custom_config }}/haproxy-config/{{ inventory_hostname }}/{{ haproxy_service_template }}"
       - "{{ node_custom_config }}/haproxy-config/{{ haproxy_service_template }}"
       - "templates/{{ haproxy_service_template }}"
diff --git a/releasenotes/notes/support-haproxy-service-override-85bcc4d3c0af6cf2.yaml b/releasenotes/notes/support-haproxy-service-override-85bcc4d3c0af6cf2.yaml
new file mode 100644
index 0000000000..0cf8de19e2
--- /dev/null
+++ b/releasenotes/notes/support-haproxy-service-override-85bcc4d3c0af6cf2.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Adds a means of overriding the haproxy config of individual
+    services. Custom template files can be placed under
+    ``{{ node_custom_config }}/haproxy-config/`` to be rendered
+    with the same variables as the generic template.
+    Template file names must match the service to override eg.
+    ``nova-novncproxy.cfg``.