diff --git a/_toc.yml b/_toc.yml
index 0f35b9b8..ac19977e 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -124,13 +124,13 @@ chapters:
         sections:
           - file: infrastructure-guide/puppet/modules
                 sections:
-                  - glob: admin-guide/puppet/roles/*
-                  - glob: admin-guide/puppet/roles/*/*
-                  - glob: admin-guide/puppet/profiles/*
-                  - glob: admin-guide/puppet/profiles/*/*
-                  - glob: admin-guide/puppet/profiles/*/*/*
-                  - glob: admin-guide/puppet/profiles/*/*/*/*
-                  - glob: admin-guide/puppet/components/*
+                  - glob: infrastructure-guide/puppet/roles/*
+                  - glob: infrastructure-guide/puppet/roles/*/*
+                  - glob: infrastructure-guide/puppet/profiles/*
+                  - glob: infrastructure-guide/puppet/profiles/*/*
+                  - glob: infrastructure-guide/puppet/profiles/*/*/*
+                  - glob: infrastructure-guide/puppet/profiles/*/*/*/*
+                  - glob: infrastructure-guide/puppet/components/*
 
   - file: rhel8/index
     sections:
diff --git a/admin-guide/puppet.md b/admin-guide/puppet.md
index 7c951b31..e9b95ce8 100644
--- a/admin-guide/puppet.md
+++ b/admin-guide/puppet.md
@@ -1,10 +1,4 @@
 # Puppet
 
-[Puppet](https://puppet.com/docs/puppet) is the *configuration management system* used to configure the hosts.
-
-Our [Puppet Dashboard](https://puppet01.psi.ch/puppetboard) gives an overview over all systems managed using Puppet at PSI.
-
-Contents:
-
 ```{tableofcontents}
 ```
diff --git a/admin-guide/puppet/general.rst b/admin-guide/puppet/general.rst
index 144797d9..c6f50c62 100644
--- a/admin-guide/puppet/general.rst
+++ b/admin-guide/puppet/general.rst
@@ -1,6 +1,11 @@
 General
 =======
 
+[Puppet](https://puppet.com/docs/puppet) is the *configuration management system* used to configure the hosts.
+
+Our [Puppet Dashboard](https://puppet01.psi.ch/puppetboard) gives an overview over all systems managed using Puppet at PSI.
+
+
 `Puppet <https://puppetlabs.com>`_ is the *configuration management system* used to configure the hosts.
 
 Introduction