diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory
deleted file mode 100644
index bf3a3bb8a..000000000
--- a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chown=portage:portage path=/var/calculate pkg(sys-apps/calculate-utils:3)>=3.6.6&&exists(/var/calculate/custom-overlay/metadata/layout.conf)==
diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory
new file mode 100644
index 000000000..217564987
--- /dev/null
+++ b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory
@@ -0,0 +1 @@
+# Calculate chown=portage:portage path=/var/calculate/repos pkg(sys-apps/calculate-utils:3)>=3.6.6&&exists(/var/calculate/repos/custom/metadata/layout.conf)==
diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/metadata/layout.conf b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/metadata/layout.conf
similarity index 100%
rename from profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/metadata/layout.conf
rename to profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/metadata/layout.conf
diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/profiles/repo_name b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/profiles/repo_name
similarity index 100%
rename from profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/profiles/repo_name
rename to profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/profiles/repo_name
diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf
index fa701c93f..2e52f7fb0 100644
--- a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf
+++ b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf
@@ -1,3 +1,3 @@
 # Calculate append=after path=/etc/portage/repos.conf name=zz-calculate.conf pkg(sys-apps/calculate-utils:3)>=3.6.6&&grep(/etc/portage/repos.conf/zz-calculate.conf,\[custom\])== protected
 [custom]
-location = /var/calculate/custom-overlay
+location = /var/calculate/repos/custom