diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst
index bb7496826..c0d74874c 100644
--- a/admin_manual/configuration_server/index.rst
+++ b/admin_manual/configuration_server/index.rst
@@ -19,7 +19,6 @@ Server configuration
    antivirus_configuration
    reverse_proxy_configuration
    automatic_configuration
-   server_tuning
    theming
    oauth2
 
diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst
index e6113e042..d2bc4784a 100644
--- a/admin_manual/installation/index.rst
+++ b/admin_manual/installation/index.rst
@@ -14,3 +14,4 @@ Installation
    php_72_installation
    selinux_configuration
    nginx
+   server_tuning
diff --git a/admin_manual/configuration_server/server_tuning.rst b/admin_manual/installation/server_tuning.rst
similarity index 97%
rename from admin_manual/configuration_server/server_tuning.rst
rename to admin_manual/installation/server_tuning.rst
index 192d83470..6b02f183b 100644
--- a/admin_manual/configuration_server/server_tuning.rst
+++ b/admin_manual/installation/server_tuning.rst
@@ -5,7 +5,7 @@ Server tuning
 Using cron to perform background jobs
 -------------------------------------
 
-See :doc:`background_jobs_configuration` for a description and the 
+See :doc:`../configuration_server/background_jobs_configuration` for a description and the
 benefits.
 
 Reducing system load
@@ -28,7 +28,7 @@ Caching
 
 Caching improves performance by storing data, code, and other objects in memory. 
 Memory cache configuration for the Nextcloud server must be installed and configured.
-See :doc:`caching_configuration`.
+See :doc:`../configuration_server/caching_configuration`.
 
 Using MariaDB/MySQL instead of SQLite
 -------------------------------------
diff --git a/go.php b/go.php
index c80c2c1d4..14e2f47b8 100644
--- a/go.php
+++ b/go.php
@@ -22,9 +22,9 @@ $mapping = array(
     'admin-ldap'              => '/admin_manual/configuration_user/user_auth_ldap.html',
     'admin-mysql-utf8mb4'     => '/admin_manual/configuration_database/mysql_4byte_support.html',
     'admin-nginx'             => '/admin_manual/installation/nginx.html',
-    'admin-performance'       => '/admin_manual/configuration_server/server_tuning.html',
+    'admin-performance'       => '/admin_manual/installation/server_tuning.html',
     'admin-php-fpm'           => '/admin_manual/installation/source_installation.html#php-fpm-tips-label',
-    'admin-php-opcache'       => '/admin_manual/configuration_server/server_tuning.html#enable-php-opcache',
+    'admin-php-opcache'       => '/admin_manual/installation/server_tuning.html#enable-php-opcache',
     'admin-provisioning-api'  => '/admin_manual/configuration_user/user_provisioning_api.html',
     'admin-reverse-proxy'     => '/admin_manual/configuration_server/reverse_proxy_configuration.html',
     'admin-security'          => '/admin_manual/configuration_server/harden_server.html',