diff --git a/anda/mock-configs/terra-39-aarch64.cfg b/anda/mock-configs/terra-39-aarch64.cfg
new file mode 100644
index 0000000000..4136783d27
--- /dev/null
+++ b/anda/mock-configs/terra-39-aarch64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '39'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/terra.tpl')
diff --git a/anda/mock-configs/terra-39-x86_64.cfg b/anda/mock-configs/terra-39-x86_64.cfg
new file mode 100644
index 0000000000..c4cff70d68
--- /dev/null
+++ b/anda/mock-configs/terra-39-x86_64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '39'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/terra.tpl')
diff --git a/anda/mock-configs/terra-mock-configs.spec b/anda/mock-configs/terra-mock-configs.spec
index b90044330d..fff7f1fa38 100644
--- a/anda/mock-configs/terra-mock-configs.spec
+++ b/anda/mock-configs/terra-mock-configs.spec
@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        4
+Version:        5
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos
 
@@ -8,6 +8,8 @@ URL:            http://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
 
 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
@@ -32,14 +34,18 @@ 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/
 
-# For legacy compatibility, remove in next Terra release
+# 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-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
@@ -47,7 +53,11 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a
 %config %{_sysconfdir}/mock/anda-38-aarch64.cfg
 
 %changelog
+* Wed Sug 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 5-1
+- Update for Terra 39
+
 * Thu May 18 2023 Lleyton Gray <lleyton@fyralabs.com>
 - Rename to terra-mock-configs and rename files to terra
+
 * Mon Oct 03 2022 Cappy Ishihara <cappy@cappuchino.xyz>
 - Intial Release
diff --git a/anda/terra-release/terra-release.spec b/anda/terra-release/terra-release.spec
index e2dc2c4d92..5f7b941900 100644
--- a/anda/terra-release/terra-release.spec
+++ b/anda/terra-release/terra-release.spec
@@ -1,5 +1,5 @@
 Name:           terra-release
-Version:        38
+Version:        39
 Release:        1
 Summary:        Release package for Terra
 
@@ -24,5 +24,8 @@ install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE0}
 %config(noreplace) %{_sysconfdir}/yum.repos.d/terra.repo
 
 %changelog
+* Wed Sug 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 39-1
+- Update for Terra 39
+
 * Sat May 6 2023 Lleyton Gray <lleyton@fyralabs.com> - 38-1
 - Initial package