diff --git a/_toc.yml b/_toc.yml
index 73773b83..f80770d3 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -27,6 +27,14 @@ chapters:
   - file: admin-guide/index
     sections:
       - file: admin-guide/guidelines
+      - file: admin-guide/deployment
+        sections:
+          - file: admin-guide/deployment/sample
+          - file: admin-guide/deployment/consoles
+          - file: admin-guide/deployment/dmz
+          - file: admin-guide/deployment/reinstall
+          - file: admin-guide/deployment/partitioning
+          - file: admin-guide/deployment/sysdb_env
       - file: admin-guide/configuration
         sections:
           - file: admin-guide/configuration/icinga2
@@ -61,16 +69,6 @@ chapters:
           - file: admin-guide/configuration/citrix_vda
           - file: admin-guide/configuration/configuration_email
           - file: admin-guide/configuration/selinux_configuration
-      - file: admin-guide/deployment
-        sections:
-          - file: admin-guide/deployment/sample
-          - file: admin-guide/deployment/consoles
-          - file: admin-guide/deployment/dmz
-          - file: admin-guide/deployment/reinstall
-          - file: admin-guide/deployment/partitioning
-          - file: admin-guide/deployment/sysdb_env
-          - file: admin-guide/deployment/ipxe
-          - file: admin-guide/deployment/kickstart
       - file: admin-guide/troubleshooting
         sections:
           - file: admin-guide/troubleshooting/deployment
@@ -130,6 +128,7 @@ chapters:
       - file: infrastructure-guide/initial_setup
       - file: infrastructure-guide/test_systems
       - file: infrastructure-guide/custom_repositories
+      - file: infrastructure-guide/ipxe
 
   - file: rhel8/index
     sections:
diff --git a/admin-guide/deployment/kickstart.rst b/admin-guide/deployment/kickstart.rst
deleted file mode 100644
index 2526a20c..00000000
--- a/admin-guide/deployment/kickstart.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Kickstart
-=========
-
-The auto-generated Grub or iPXE configuration will, when installing RHEL, instruct
-the RHEL installer to download the Kickstart configuration from
-``https://sysdb.psi.ch/kickstart/v1/config?fqdn=<FQDN>&instrepo=<INSTREPO>``,
-where ``<FQDN>`` is the FQDN of the host to be installed, and ``<INSTREPO>`` is
-the installation repository to be used.
-
-The web service will auto-generate the Kickstart configuration for the client
-based on information in sysdb, e.g. the release to be installed.
diff --git a/admin-guide/deployment/_static/legacy_boot.png b/infrastructure-guide/_static/legacy_boot.png
similarity index 100%
rename from admin-guide/deployment/_static/legacy_boot.png
rename to infrastructure-guide/_static/legacy_boot.png
diff --git a/admin-guide/deployment/_static/legacy_boot.puml b/infrastructure-guide/_static/legacy_boot.puml
similarity index 100%
rename from admin-guide/deployment/_static/legacy_boot.puml
rename to infrastructure-guide/_static/legacy_boot.puml
diff --git a/admin-guide/deployment/_static/uefi_boot.png b/infrastructure-guide/_static/uefi_boot.png
similarity index 100%
rename from admin-guide/deployment/_static/uefi_boot.png
rename to infrastructure-guide/_static/uefi_boot.png
diff --git a/admin-guide/deployment/_static/uefi_boot.puml b/infrastructure-guide/_static/uefi_boot.puml
similarity index 100%
rename from admin-guide/deployment/_static/uefi_boot.puml
rename to infrastructure-guide/_static/uefi_boot.puml
diff --git a/admin-guide/deployment/ipxe.md b/infrastructure-guide/ipxe.md
similarity index 100%
rename from admin-guide/deployment/ipxe.md
rename to infrastructure-guide/ipxe.md