diff --git a/mock-core-configs/etc/mock/mageia-10-i586.cfg b/mock-core-configs/etc/mock/mageia-10-i586.cfg
deleted file mode 120000
index 59ad0cbb9..000000000
--- a/mock-core-configs/etc/mock/mageia-10-i586.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mageia-cauldron-i586.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/mageia-10-i686.cfg b/mock-core-configs/etc/mock/mageia-10-i686.cfg
new file mode 120000
index 000000000..e8e823767
--- /dev/null
+++ b/mock-core-configs/etc/mock/mageia-10-i686.cfg
@@ -0,0 +1 @@
+mageia-cauldron-i686.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/mageia-cauldron-i586.cfg b/mock-core-configs/etc/mock/mageia-cauldron-i686.cfg
similarity index 75%
rename from mock-core-configs/etc/mock/mageia-cauldron-i586.cfg
rename to mock-core-configs/etc/mock/mageia-cauldron-i686.cfg
index ab2ba1d6e..36387e59e 100644
--- a/mock-core-configs/etc/mock/mageia-cauldron-i586.cfg
+++ b/mock-core-configs/etc/mock/mageia-cauldron-i686.cfg
@@ -1,4 +1,4 @@
-config_opts['target_arch'] = 'i586'
+config_opts['target_arch'] = 'i686'
 config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
 
 include('templates/mageia-cauldron.tpl')
diff --git a/releng/release-notes-next/cauldron-i686.config b/releng/release-notes-next/cauldron-i686.config
new file mode 100644
index 000000000..357f66db9
--- /dev/null
+++ b/releng/release-notes-next/cauldron-i686.config
@@ -0,0 +1,2 @@
+Add i686 configuration for Mageia Cauldron and Mageia 10, and remove
+corresponding i586 configurations ([PR#1360][]).