diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 039d31bb7ce414a6f8de273a012a849f9443b9b2..799ea9593d63a6e9fd36e3251551fcedf62502c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -433,7 +433,7 @@ single-sign-on-helm-release:
   script:
     - *debug_information
     # Add optional override values we need for the CI pipeline only
-    - '[ -f ./install/ci-overrides/oas-${APP}-override.yaml ] && kubectl apply -n oas-apps -f ./install/ci-overrides/oas-${APP}-override.yaml'
+    - '[ -f ./install/overrides/oas-${APP}-override.yaml ] && kubectl apply -n oas-apps -f ./install/ci-overrides/oas-${APP}-override.yaml'
     - bash ./install/install-${APP}.sh
   extends:
     - .ssh_setup
diff --git a/docs/advanced_installation.rst b/docs/advanced_installation.rst
index 3698806a7f5c1556f91e8e34446d280ef43850c3..afb92a7ea8da60afeb6eddc8af4480b8065dc563 100644
--- a/docs/advanced_installation.rst
+++ b/docs/advanced_installation.rst
@@ -132,7 +132,7 @@ Example: Customize Nextcloud to work with staging certificates
 
 Our CI pipeline works with staging certificates from Let's Encrypt, for that
 reason we need to allow insecure connections for the integration with
-ONLYOFFICE. You can find the file at ``install/ci-overrides/oas-nextcloud-override.yaml``.
+ONLYOFFICE. You can find the file at ``install/overrides/oas-nextcloud-override.yaml``.
 
 To apply it, run the following commands:
 
@@ -147,7 +147,7 @@ To apply it, run the following commands:
    # same namespace as your helmrelease with the '-n' argument
    kubectl apply \
      -n oas-apps \
-     -f ./install/ci-overrides/oas-nextcloud-override.yaml
+     -f ./install/overrides/oas-nextcloud-override.yaml
 
 Adding custom apps to the cluster
 =================================
diff --git a/docs/installation_instructions.rst b/docs/installation_instructions.rst
index b8e65fc83cc68283e94e66599c0526b03eae7140..8aba8812ff2014e95db7cb09cf74377f9f613266 100644
--- a/docs/installation_instructions.rst
+++ b/docs/installation_instructions.rst
@@ -341,7 +341,7 @@ directory **on your provisioning machine**. Don't forget to replace
 
 .. code:: bash
 
-   export CLUSTER_DIR=oas.example.org
+   export CLUSTER_DIR=clusters/oas.example.org
    # Copy the installation kustomization to your cluster directory
    cp install/kustomization.yaml clusters/$CLUSTER_DIR/
    # Tell kubectl to use your cluster's kube_config
@@ -352,11 +352,12 @@ directory **on your provisioning machine**. Don't forget to replace
 After you have executed that code, your terminal should show: 
 
 .. code:: bash
+
    secret/oas-cluster-variables configured
 
 Next, run:
 
-.. code:: 
+.. code::
 
    ./install/install-openappstack.sh
 
@@ -370,7 +371,7 @@ to install:
 
 - Nextcloud and Onlyoffice with ``install-nextcloud.sh``
 - Rocket.Chat with ``install-rocketchat.sh``
-- ONLYOFFICE with ``install-onlyoffice.sh``
+- WordPress with ``install-wordpress.sh``
 - Velero with ``install-velero.sh`` (make sure you have configured it in
   :ref:`backups-with-velero`).
 
diff --git a/install/ci-overrides/oas-nextcloud-override.yaml b/install/overrides/oas-nextcloud-override.yaml
similarity index 100%
rename from install/ci-overrides/oas-nextcloud-override.yaml
rename to install/overrides/oas-nextcloud-override.yaml