diff --git a/_toc.yml b/_toc.yml
index 7d19ebf..723ef5b 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -38,7 +38,6 @@ chapters:
           - file: admin-guide/deployment/rhel8/index
             sections:
               - file: admin-guide/deployment/rhel8/hardware_compatibility
-              - file: admin-guide/deployment/rhel8/installation
               - file: admin-guide/deployment/rhel8/nvidia
               - file: admin-guide/deployment/rhel8/kerberos
               - file: admin-guide/deployment/rhel8/desktop
@@ -46,7 +45,6 @@ chapters:
           - file: admin-guide/deployment/rhel9/index
             sections:
               - file: admin-guide/deployment/rhel9/hardware_compatibility
-              - file: admin-guide/deployment/rhel9/installation
           - file: admin-guide/deployment/basic_installation
           - file: admin-guide/deployment/re_installation
           - file: admin-guide/deployment/console_installation
diff --git a/admin-guide/deployment/basic_installation.md b/admin-guide/deployment/basic_installation.md
index 0943455..a47b79b 100644
--- a/admin-guide/deployment/basic_installation.md
+++ b/admin-guide/deployment/basic_installation.md
@@ -18,6 +18,19 @@ The default way to interact with sysdb is to use [bob](https://git.psi.ch/linux-
 
 Altenatively you many have on your workstation a local copy of `bob`. This can be done by installing the RPM from the pli-misc repository - https://repos.psi.ch/rhel8/latest/pli-misc/ or by installing the Python package manually. More details regaring `bob` can be found [here](https://git.psi.ch/linux-infra/bob).
 
+## Hardware/VM Requirements
+
+For hardware based system please check the Hardware compatibility page for
+- [RHEL8](rhel8/hardware_compatibility.md)
+- [RHEL9](rhel9/hardware_compatibility.md)
+
+In any case these are the **minimal** system requirements:
+- RHEL8
+   - RAM: 4GB
+   - Harddisk: 33GB
+- RHEL9
+   - RAM: 4GB
+   - Harddisk: 64GB
 
 ## Sysdb Configuration
 
@@ -92,3 +105,27 @@ bob node set-attr $FQDN system_disk=md126
 ```
 
 It is also possible to customize the partitioning by using the `partitions` attribute on sysdb. See https://git.psi.ch/linux-infra/bob for more details.
+
+
+##  BIOS / UEFI Boot
+
+All systems should use UEFI boot for booting! BIOS based boot should only be used where UEFI is not an option.
+
+### UEFI
+
+__NOTE:__ After the installation the boot order will be changed to localboot again! So if you reinstall make sure that you re-set the bootorder via the efi menu or the commandline: https://linux.die.net/man/8/efibootmgr
+
+```bash
+[root@lx-test-02 ~]# efibootmgr
+BootCurrent: 0004
+BootOrder: 0004,0002,0000,0001,0003
+Boot0000* EFI Virtual disk (0.0)
+Boot0001* EFI VMware Virtual SATA CDROM Drive (0.0)
+Boot0002* EFI Network
+Boot0003* EFI Internal Shell (Unsupported option)
+Boot0004* Red Hat Enterprise Linux
+
+[root@lx-test-02 ~]# efibootmgr --bootorder 2,4,0,1,3
+```
+
+(there is no need to have the leading 000 )
diff --git a/admin-guide/deployment/rhel8/_static/installation_ipxe_select_rhel8.png b/admin-guide/deployment/rhel8/_static/installation_ipxe_select_rhel8.png
deleted file mode 100644
index 86198af..0000000
Binary files a/admin-guide/deployment/rhel8/_static/installation_ipxe_select_rhel8.png and /dev/null differ
diff --git a/admin-guide/deployment/rhel8/index.md b/admin-guide/deployment/rhel8/index.md
index 3d2e003..e4941d2 100644
--- a/admin-guide/deployment/rhel8/index.md
+++ b/admin-guide/deployment/rhel8/index.md
@@ -15,7 +15,7 @@ Bugs and issues can be reported in the [Linux Issues project](https://git.psi.ch
 
 ## Documenation
 
-* [Installation](installation)
+* [Installation](../basic_installation.md)
 * [CUDA and Nvidia Drivers](nvidia)
 * [Kerberos](kerberos)
 * [Desktop](desktop)
diff --git a/admin-guide/deployment/rhel8/installation.md b/admin-guide/deployment/rhel8/installation.md
deleted file mode 100644
index d0f6894..0000000
--- a/admin-guide/deployment/rhel8/installation.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Installation
-
-## Minimal HW/VM Requirements
-- 4GB RAM
-- 33GB Disk
-
-## Network Installation
-
-The machine you want to install needs to be [registered in `sysdb`](../../deployment/basic_installation.md). 
-
-### Installation with UEFI
-This is the default (and only really supported) installation mode - No manual steps are needed!
-
-__NOTE:__ After the installation the boot order will be changed to localboot again! So if you reinstall make sure that you re-set the bootorder via the efi menu or the commandline: https://linux.die.net/man/8/efibootmgr
-```
-[root@lx-test-02 ~]# efibootmgr
-BootCurrent: 0004
-BootOrder: 0004,0002,0000,0001,0003
-Boot0000* EFI Virtual disk (0.0)
-Boot0001* EFI VMware Virtual SATA CDROM Drive (0.0)
-Boot0002* EFI Network
-Boot0003* EFI Internal Shell (Unsupported option)
-Boot0004* Red Hat Enterprise Linux
-
-[root@lx-test-02 ~]# efibootmgr --bootorder 2,4,0,1,3
-```
-(there is no need to have the leading 000 )
-
-### Installation with Legacy BIOS 
-Start the machine and select network boot (if not already the default), then you get following menu, where the default depends on the `sysdb` configuration, but you may override it manualy:
-
-![select RHEL 8 installation](_static/installation_ipxe_select_rhel8.png)
-
diff --git a/admin-guide/deployment/rhel9/index.md b/admin-guide/deployment/rhel9/index.md
index bfaf95c..e4563d0 100644
--- a/admin-guide/deployment/rhel9/index.md
+++ b/admin-guide/deployment/rhel9/index.md
@@ -1,5 +1,8 @@
 # Red Hat Enterprise Linux 9
 
+## Hardware Compatibility
+- [Hardware Compatibility](hardware_compatibility.md)
+
 ## Alpha Testing
 
 We encourage you to install RHEL9 on testing systems and tell us what we may have broken, what bugs you run into and what features you are missing. Please be aware of certain things we changed on how we want the base operating system to work, listed below.
@@ -9,6 +12,9 @@ Bugs and issues can be reported in the [Linux Issues project](https://git.psi.ch
 Additional ressource [Considerations in adopting RHEL 9](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/considerations_in_adopting_rhel_9/index#doc-wrapper)
 
 
+## Install Documentation
+* [Installation Documentation](../basic_installation.md)
+
 ## Changes for Base Installation
 
 ### No Support for AFS
@@ -57,6 +63,4 @@ Changed the ammount of packages installed by default on workstation installation
 | `inkscape1` | `inkscape` | Also affects `inkscape-docs` and `inkscape-view` |
 
 
-### Documenatation
 
-* [Installation](../basic_installation.md)
diff --git a/admin-guide/deployment/rhel9/installation.md b/admin-guide/deployment/rhel9/installation.md
deleted file mode 100644
index 8077c8f..0000000
--- a/admin-guide/deployment/rhel9/installation.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Installation
-
-## Minimal HW/VM Requirements
-- 4GB RAM
-- 64GB Disk
-
-## Network Installation
-
-The machine you want to install needs to be [registered in `sysdb`](../basic_installation.md).
-
-### Installation with UEFI
-Default and supported mode.
-
-### Installation with Legacy BIOS 
-Not supported!