diff --git a/anda/terra/mock-configs/terra-38-aarch64.cfg b/anda/terra/mock-configs/terra-38-aarch64.cfg
deleted file mode 100644
index 42efc70495..0000000000
--- a/anda/terra/mock-configs/terra-38-aarch64.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '38'
-config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('aarch64',)
-
-include('templates/terra.tpl')
diff --git a/anda/terra/mock-configs/terra-38-x86_64.cfg b/anda/terra/mock-configs/terra-38-x86_64.cfg
deleted file mode 100644
index caa7a68cc3..0000000000
--- a/anda/terra/mock-configs/terra-38-x86_64.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '38'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-
-include('templates/terra.tpl')
diff --git a/anda/terra/mock-configs/terra-39-i386.cfg b/anda/terra/mock-configs/terra-39-i386.cfg
new file mode 100644
index 0000000000..7b57433f26
--- /dev/null
+++ b/anda/terra/mock-configs/terra-39-i386.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '39'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/terra.tpl')
diff --git a/anda/terra/mock-configs/terra-40-i386.cfg b/anda/terra/mock-configs/terra-40-i386.cfg
new file mode 100644
index 0000000000..6e2647df9a
--- /dev/null
+++ b/anda/terra/mock-configs/terra-40-i386.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/terra.tpl')
diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec
index dfe9dfc468..b816d72e5c 100644
--- a/anda/terra/mock-configs/terra-mock-configs.spec
+++ b/anda/terra/mock-configs/terra-mock-configs.spec
@@ -1,17 +1,20 @@
 Name:           terra-mock-configs
-Version:        9
+Version:        11
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos
 
 License:        MIT
 URL:            https://terra.fyralabs.com
 Source0:        terra.tpl
-Source1:        terra-38-x86_64.cfg
-Source2:        terra-38-aarch64.cfg
 Source3:        terra-39-x86_64.cfg
 Source4:        terra-39-aarch64.cfg
-Source5:        terra-rawhide-x86_64.cfg
-Source6:        terra-rawhide-aarch64.cfg
+Source5:        terra-40-x86_64.cfg
+Source6:        terra-40-aarch64.cfg
+Source7:        terra-40-i386.cfg
+Source8:        terra-39-i386.cfg
+Source9:        terra-rawhide-x86_64.cfg
+Source10:       terra-rawhide-aarch64.cfg
+Source11:       terra-rawhide-i386.cfg
 
 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
@@ -32,35 +35,32 @@ Obsoletes: anda-mock-configs < 3-2%{?dist}
 mkdir -p %{buildroot}%{_sysusersdir}
 mkdir -p %{buildroot}%{_sysconfdir}/mock/templates
 
-
 cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/
-cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/
-cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE7} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE8} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE9} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE10} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE11} %{buildroot}%{_sysconfdir}/mock/
 
-# For legacy compatibility, only while Terra 38 is still alive
-ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl
-ln -s %{_sysconfdir}/mock/terra-38-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-x86_64.cfg
-ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-aarch64.cfg
 
 %files
 %config %{_sysconfdir}/mock/templates/terra.tpl
-%config %{_sysconfdir}/mock/terra-rawhide-x86_64.cfg
-%config %{_sysconfdir}/mock/terra-rawhide-aarch64.cfg
-%config %{_sysconfdir}/mock/terra-39-x86_64.cfg
-%config %{_sysconfdir}/mock/terra-39-aarch64.cfg
-%config %{_sysconfdir}/mock/terra-38-x86_64.cfg
-%config %{_sysconfdir}/mock/terra-38-aarch64.cfg
-%config %{_sysconfdir}/mock/templates/anda.tpl
-%config %{_sysconfdir}/mock/anda-38-x86_64.cfg
-%config %{_sysconfdir}/mock/anda-38-aarch64.cfg
+%config %{_sysconfdir}/mock/terra-*-x86_64.cfg
+%config %{_sysconfdir}/mock/terra-*-aarch64.cfg
+%config %{_sysconfdir}/mock/terra-*-i386.cfg
+
 
 %changelog
-* Mon Jan 15 2024 madonuko <mado@fyralabs.com> - 9.1
-- Update for Terra rawhide
+* Wed Jul 18 2024 Cappy Ishihara <cappy@fyralabs.com> - 11-1
+- Include multilib mock files for x86-based systems (backwards compatibility)
+
+* Wed Jul 10 2024 madonuko <mado@fyralabs.com> - 10-1
+- Include mock files for Terra 40
+- Remove mock files for Terra 38
 
 * Mon Jan 08 2024 Lleyton Gray <lleyton@fyralabs.com> - 7-1
 - Bump ccache max size to 10G
diff --git a/anda/terra/mock-configs/terra-rawhide-i386.cfg b/anda/terra/mock-configs/terra-rawhide-i386.cfg
new file mode 100644
index 0000000000..518184ea6d
--- /dev/null
+++ b/anda/terra/mock-configs/terra-rawhide-i386.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = 'rawhide'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/terra.tpl')