diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index 9d1c6408fa..a29f74d759 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -13,7 +13,8 @@ mariadb_services:
       mariadb:
         enabled: "{{ enable_mariadb|bool and not enable_external_mariadb_load_balancer|bool }}"
         mode: "tcp"
-        port: "{{ mariadb_port }}"
+        port: "{{ database_port }}"
+        listen_port: "{{ mariadb_port }}"
         frontend_tcp_extra:
           - "option clitcpka"
           - "timeout client 3600s"
@@ -25,7 +26,8 @@ mariadb_services:
       mariadb_external_lb:
         enabled: "{{ enable_mariadb|bool and enable_external_mariadb_load_balancer|bool }}"
         mode: "tcp"
-        port: "{{ mariadb_port }}"
+        port: "{{ database_port }}"
+        listen_port: "{{ mariadb_port }}"
         frontend_tcp_extra:
           - "option clitcpka"
           - "timeout client 3600s"
diff --git a/releasenotes/notes/fix-haproxy-database-port-mapping-46bdf2a0ffc253c7.yaml b/releasenotes/notes/fix-haproxy-database-port-mapping-46bdf2a0ffc253c7.yaml
new file mode 100644
index 0000000000..aec3512123
--- /dev/null
+++ b/releasenotes/notes/fix-haproxy-database-port-mapping-46bdf2a0ffc253c7.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - MariaDB is now exposed via HAProxy on the ``database_port`` and
+    not the ``mariadb_port``. Out of the box these are both the same,
+    but if you have customised ``mariadb_port`` so that it is different
+    to the ``database_port`` and you have a service talking to it
+    via HAProxy on that port then you should review your configuration.