diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml
index ae5d7292b3..aa274cc310 100644
--- a/ansible/roles/prometheus/defaults/main.yml
+++ b/ansible/roles/prometheus/defaults/main.yml
@@ -97,11 +97,15 @@ prometheus_services:
         mode: "http"
         external: false
         port: "{{ prometheus_openstack_exporter_port }}"
+        backend_http_extra:
+          - "timeout server {{ prometheus_openstack_exporter_timeout }}"
       prometheus_openstack_exporter_external:
         enabled: "{{ enable_prometheus_openstack_exporter_external | bool }}"
         mode: "http"
         external: true
         port: "{{ prometheus_openstack_exporter_port }}"
+        backend_http_extra:
+          - "timeout server {{ prometheus_openstack_exporter_timeout }}"
   prometheus-elasticsearch-exporter:
     container_name: prometheus_elasticsearch_exporter
     group: prometheus-elasticsearch-exporter
diff --git a/releasenotes/notes/bug-2006051-135bd20d5c465517.yaml b/releasenotes/notes/bug-2006051-135bd20d5c465517.yaml
new file mode 100644
index 0000000000..2a27a82881
--- /dev/null
+++ b/releasenotes/notes/bug-2006051-135bd20d5c465517.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes 504 timeout when scraping openstack exporter.
+    Ensures that HAProxy server timeout is the same as the
+    scrape timeout for the openstack exporter backend.
+    `LP#2006051 <https://launchpad.net/bugs/2006051>`__