diff --git a/anda/terra/mock-configs/terra-40-aarch64.cfg b/anda/terra/mock-configs/terra-40-aarch64.cfg
new file mode 100644
index 0000000000..b5e1e14f5f
--- /dev/null
+++ b/anda/terra/mock-configs/terra-40-aarch64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/terra.tpl')
diff --git a/anda/terra/mock-configs/terra-40-x86_64.cfg b/anda/terra/mock-configs/terra-40-x86_64.cfg
new file mode 100644
index 0000000000..b3cc8cafc4
--- /dev/null
+++ b/anda/terra/mock-configs/terra-40-x86_64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+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-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec
index dab6e25cdf..cc23801c17 100644
--- a/anda/terra/mock-configs/terra-mock-configs.spec
+++ b/anda/terra/mock-configs/terra-mock-configs.spec
@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        7
+Version:        8
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos
 
@@ -10,6 +10,8 @@ Source1:        terra-38-x86_64.cfg
 Source2:        terra-38-aarch64.cfg
 Source3:        terra-39-x86_64.cfg
 Source4:        terra-39-aarch64.cfg
+Source5:		terra-40-x86_64.cfg
+Source6:		terra-40-aarch64.cfg
 
 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
@@ -36,6 +38,8 @@ 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/
 
 # For legacy compatibility, only while Terra 38 is still alive
 ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl
@@ -44,6 +48,8 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a
 
 %files
 %config %{_sysconfdir}/mock/templates/terra.tpl
+%config %{_sysconfdir}/mock/terra-40-x86_64.cfg
+%config %{_sysconfdir}/mock/terra-40-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
@@ -53,6 +59,9 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a
 %config %{_sysconfdir}/mock/anda-38-aarch64.cfg
 
 %changelog
+* Tue Feb 13 2024 madonuko <mado@fyralabs.com> - 8-1
+- Update for Terra 40
+
 * Mon Jan 08 2024 Lleyton Gray <lleyton@fyralabs.com> - 7-1
 - Bump ccache max size to 10G
 
diff --git a/anda/terra/release/terra-release.spec b/anda/terra/release/terra-release.spec
index 3735763f30..8316d57311 100644
--- a/anda/terra/release/terra-release.spec
+++ b/anda/terra/release/terra-release.spec
@@ -1,6 +1,6 @@
 Name:           terra-release
-Version:        39
-Release:        2
+Version:        40
+Release:        1
 Summary:        Release package for Terra
 
 License:        MIT
@@ -24,6 +24,9 @@ install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE0}
 %config(noreplace) %{_sysconfdir}/yum.repos.d/terra.repo
 
 %changelog
+* Tue Feb 13 2024 madonuko <mado@fyralabs.com> - 40-1
+- Update for Terra 40
+
 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 39-2
 - Add source repository