diff --git a/_toc.yml b/_toc.yml
index 3ac354df..7a155464 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -52,42 +52,9 @@ chapters:
 
       - file: admin-guide/configuration
         sections:
-          - file: admin-guide/configuration/icinga2
-          - file: admin-guide/configuration/packages
-          - file: admin-guide/configuration/python
-          - file: admin-guide/configuration/conda
-          - file: admin-guide/configuration/package_updates
-          - file: admin-guide/configuration/package_repositories
-          - file: admin-guide/configuration/services
-          - file: admin-guide/configuration/mount
-          - file: admin-guide/configuration/distribute_files
-          - file: admin-guide/configuration/resize_vm_disk
-          - file: admin-guide/configuration/partitioning
-          - file: admin-guide/configuration/networking
-          - file: admin-guide/configuration/host_rename
-          - file: admin-guide/configuration/xrdp
-          - file: admin-guide/configuration/puppet_agent
-          - file: admin-guide/configuration/sudo
-          - file: admin-guide/configuration/eaccounts
-          - file: admin-guide/configuration/ntp_client
-          - file: admin-guide/configuration/keyboard_layout
-          - file: admin-guide/configuration/autologin
-          - file: admin-guide/configuration/screen_lock
-          - file: admin-guide/configuration/banner_message
-          - file: admin-guide/configuration/alternative_desktops
-          - file: admin-guide/configuration/central_logging_elastic
-          - file: admin-guide/configuration/syslog_forwarding
-          - file: admin-guide/configuration/journald
-          - file: admin-guide/configuration/metrics_telegraf
-          - file: admin-guide/configuration/ntp_server
-          - file: admin-guide/configuration/nfs_server
-          - file: admin-guide/configuration/sshd_configuration
-          - file: admin-guide/configuration/sftp_server
-          - file: admin-guide/configuration/ssh_host_hopping
-          - file: admin-guide/configuration/citrix_vda
-          - file: admin-guide/configuration/labview
-          - file: admin-guide/configuration/configuration_email
-          - file: admin-guide/configuration/selinux_configuration
+          - glob: admin-guide/configuration/*
+          - glob: admin-guide/configuration/*/*
+
       - file: admin-guide/custom_repositories
       - file: admin-guide/troubleshooting
         sections:
diff --git a/admin-guide/configuration/monitoring.md b/admin-guide/configuration/monitoring.md
new file mode 100644
index 00000000..7a835040
--- /dev/null
+++ b/admin-guide/configuration/monitoring.md
@@ -0,0 +1,4 @@
+# Monitoring Configuration Guides
+
+```{tableofcontents}
+
diff --git a/admin-guide/configuration/central_logging_elastic.md b/admin-guide/configuration/monitoring/central_logging_elastic.md
similarity index 100%
rename from admin-guide/configuration/central_logging_elastic.md
rename to admin-guide/configuration/monitoring/central_logging_elastic.md
diff --git a/admin-guide/configuration/icinga2.md b/admin-guide/configuration/monitoring/icinga2.md
similarity index 100%
rename from admin-guide/configuration/icinga2.md
rename to admin-guide/configuration/monitoring/icinga2.md