diff --git a/admin-guide/deployment/rhel9/installation.md b/admin-guide/deployment/rhel9/installation.md
index 48a6d816..d857ee57 100644
--- a/admin-guide/deployment/rhel9/installation.md
+++ b/admin-guide/deployment/rhel9/installation.md
@@ -6,7 +6,7 @@
 
 ## Network Installation
 
-The machine you want to install needs to be [registered in `sysdb`](../admin-guide/deployment/sample). If you don't have the bob command installed locally you can login to __lxsup.psi.ch__ to use it. Remember that you need a valid Kerberos ticket before modifying a sysdb entry via `bob`.
+The machine you want to install needs to be [registered in `sysdb`](../basic_installation.md). If you don't have the bob command installed locally you can login to __lxsup.psi.ch__ to use it. Remember that you need a valid Kerberos ticket before modifying a sysdb entry via `bob`.
 More details regaring `bob` can be found [here](https://git.psi.ch/linux-infra/bob).
 
 Optional you can set `netboot` and RHEL 9 installer but that can also be selected manually in be boot menu:
diff --git a/admin-guide/guidelines.md b/admin-guide/guidelines.md
index 06600954..4dd7d058 100644
--- a/admin-guide/guidelines.md
+++ b/admin-guide/guidelines.md
@@ -39,7 +39,7 @@ It is in the responsibilty of the owner/administrator of a system to care about
 
 By default once a week (in the night from Sunday to Monday) security updates are automatically applied. Other updates, including Kernel updates, need to be installed manually.
 
-This is [configurable](configuration/package_updates), you may switch it off completely, make it run daily or make it install all updates.
+This is [configurable](configuration/package_updates.md), you may switch it off completely, make it run daily or make it install all updates.
 
 Reboots are never done automatically.
 
@@ -47,8 +47,8 @@ Also for software which have been installed from other sources than RPM package
 
 ### Snapshots
 
-On specially protected systems where stability is more important than being up-to-date, there is the option to freeze the provided RPM package version to a specified date. Also this can be [configured in Hiera](configuration/package_repositories)(chapter "Using Specific Package Repository Snapshot"). If such a system is set by such a "Repo Tag" to a specific snapshot, the update procedure cannot get newer than the given state.
+On specially protected systems where stability is more important than being up-to-date, there is the option to freeze the provided RPM package version to a specified date. Also this can be [configured in Hiera](configuration/package_repositories.md)(chapter "Using Specific Package Repository Snapshot"). If such a system is set by such a "Repo Tag" to a specific snapshot, the update procedure cannot get newer than the given state.
 
-Again, this should only be done for nodes in protected networks, e.g. with access restrictions through an [ssh gateway](../services-admin-guide/ssh_gateways) and requires consent with IT Security.
+Again, this should only be done for nodes in protected networks, e.g. with access restrictions through an [ssh gateway](../services/admin-guide/ssh_gateways.md) and requires consent with IT Security.
 
 
diff --git a/engineering-guide/overview_linux.drawio.svg b/engineering-guide/_static/overview_linux.drawio.svg
similarity index 100%
rename from engineering-guide/overview_linux.drawio.svg
rename to engineering-guide/_static/overview_linux.drawio.svg
diff --git a/engineering-guide/infrastructure_systems.md b/engineering-guide/infrastructure_systems.md
index 3463c8ab..c3875c27 100644
--- a/engineering-guide/infrastructure_systems.md
+++ b/engineering-guide/infrastructure_systems.md
@@ -3,11 +3,11 @@ List of systems and their primary role:
 
 
 __Core Infrastructure:__
-* [boot.psi.ch](boot_server)  - TFTP server for PXE booting
-* [sysdb.psi.ch](sysdb_server) - Runs sysdb, providing the dynamic iPXE, Grub and kickstart files
-* [puppet.psi.ch](puppet01) - puppet.psi.ch - Puppet server
-* [repos.psi.ch](repo_server) - Repository server
-* [lx-sync-01.psi.ch](sync_server) - System to mirror external yum repositories / packages / ...
+* [boot.psi.ch](boot_server.md)  - TFTP server for PXE booting
+* [sysdb.psi.ch](sysdb_server.md) - Runs sysdb, providing the dynamic iPXE, Grub and kickstart files
+* [puppet.psi.ch](puppet_server.md) - puppet.psi.ch - Puppet server
+* [repos.psi.ch](repo_server.md) - Repository server
+* [lx-sync-01.psi.ch](sync_server.md) - System to mirror external yum repositories / packages / ...
 
 * [lxweb00](lxweb00) - http://linux.web.psi.ch - legacy - 129.129.190.46 - Exports further repositories from AFS
 
@@ -31,7 +31,7 @@ __Enduser Systems__
 * cpw.psi.ch - Node to change passwords
 
 
-![](overview_linux.drawio.svg)
+![](_static/overview_linux.drawio.svg)
 
 
 ## SSH Certificates / Signing Public User Keys