diff --git a/_toc.yml b/_toc.yml
index 723ef5b5..3ac354df 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -88,6 +88,7 @@ chapters:
           - file: admin-guide/configuration/labview
           - file: admin-guide/configuration/configuration_email
           - file: admin-guide/configuration/selinux_configuration
+      - file: admin-guide/custom_repositories
       - file: admin-guide/troubleshooting
         sections:
           - file: admin-guide/troubleshooting/deployment
@@ -109,8 +110,6 @@ chapters:
       - file: admin-guide/virtual_machines
       - file: admin-guide/container
       - file: admin-guide/certificates
-      - file: admin-guide/accounts-and-groups
-      - file: admin-guide/active-directory
       - file: admin-guide/puppet
         sections:
           - file: admin-guide/puppet/overview
@@ -135,9 +134,10 @@ chapters:
           - file: engineering-guide/lxweb00
       - file: engineering-guide/infrastructure_administration
       - file: engineering-guide/troubleshooting
+      - file: engineering-guide/accounts-and-groups
+      - file: engineering-guide/active-directory
       - file: engineering-guide/initial_setup
       - file: engineering-guide/test_systems
-      - file: engineering-guide/custom_repositories
       - file: engineering-guide/new_sysdb_environment
       - file: engineering-guide/ipxe
       - file: engineering-guide/puppet
diff --git a/engineering-guide/custom_repositories.md b/admin-guide/custom_repositories.md
similarity index 90%
rename from engineering-guide/custom_repositories.md
rename to admin-guide/custom_repositories.md
index a09f5914..8cfaff53 100644
--- a/engineering-guide/custom_repositories.md
+++ b/admin-guide/custom_repositories.md
@@ -43,14 +43,14 @@ kinit
 Custom repositories are provided by the central repository server as all other repositories. They will be available on the URL
 
 ```
-https://repos.psi.ch/<os>/latest/<repository_name>
+https://repos.psi.ch/<os>/latest/<repository_name>
 ```
 
 The custom repositories are snapshotted and tagged as any other repository.
 
 Inside __hiera__ please use the URL:
 ```
-https://$lx_reposerver/&lt;os>/latest/&lt;repository_name>
+https://$lx_reposerver/<os>/$lx_repo_tag/<repository_name>
 ```
 This ensures that the systems will always use the correct repository server url to access the repositories. (e.g. in the DMZ/extranet the DNS hostname of the repository is different ...)
 
@@ -70,11 +70,11 @@ The structure of the share is usually as follows:
 The access control is done by a Unix group usually named `unx-<something>_adm` (most of the time this is a group that also gives access to hiera repos)
 
 
-## Preparation for new Custom RPM Repository
+## Preparation for new Custom RPM Repository (by Linux Team)
 
-The packages_misc share is only root writeable from lx-sync-01.psi.ch. Therefore the initial setup needs to be done there.
+The `packages_misc` share is only root writeable from lx-sync-01.psi.ch. Therefore the initial setup needs to be done there.
 
-Creation of a new repo (on lx-sync-01 in /packages_misc):
+Creation of a new repo (on lx-sync-01 in `/packages_misc`):
 ```
 cd /packages_misc
 mkdir <reponame>
diff --git a/admin-guide/accounts-and-groups.md b/engineering-guide/accounts-and-groups.md
similarity index 100%
rename from admin-guide/accounts-and-groups.md
rename to engineering-guide/accounts-and-groups.md
diff --git a/admin-guide/active-directory.md b/engineering-guide/active-directory.md
similarity index 100%
rename from admin-guide/active-directory.md
rename to engineering-guide/active-directory.md