diff --git a/mariadb.changes b/mariadb.changes
index 03822d0..2ccea42 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct  7 15:02:44 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Fix socket address in mariadb@.socket file
+
 -------------------------------------------------------------------
 Mon Sep 20 09:01:17 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/mariadb.spec b/mariadb.spec
index a9c841e..039108d 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -665,6 +665,10 @@ install -D -m 644 %{_sourcedir}/mariadb.target '%{buildroot}'%{_unitdir}/mariadb
 ln -sf %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service
 ln -sf %{_unitdir}/mariadb@.service %{buildroot}%{_unitdir}/mysql@.service
 
+# Replace the default socket for multi instance mariadb with the one used by
+# mysql-systemd-helper
+sed -e 's:mysql.sock-%I:mysql.%I.sock:' -i %{buildroot}%{_unitdir}/mariadb@.socket
+
 # Tmpfiles file to exclude mysql tempfiles that are auto-cleaned up
 # bnc#852451
 mkdir -p %{buildroot}%{_tmpfilesdir}