diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58dd4ec66b35e7cb137d1118d48923b822c58a4b..1eb8030458efdca29dd80810abeebbaa943f06bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ setup-openappstack:
     # Copy inventory files to ansible folder for use in install-apps step
     - chmod 700 ansible
     - cp clusters/${CI_COMMIT_REF_SLUG}/inventory.yml ansible/
-    - cp clusters/${CI_COMMIT_REF_SLUG}/settings.yml ansible/group_vars/all/
+    - cp clusters/${CI_COMMIT_REF_SLUG}/group_vars/all/settings.yml ansible/group_vars/all/
     # Set up cluster
     - python3 -m openappstack $HOSTNAME install
     # Show versions of installed apps/binaries
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 9a2600d2139556a1db9ffb7f2a7e04b43d37d234..1dc5d425f1631461570118d7b50a529af8848240 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -6,7 +6,7 @@ Note: `cluster$` indicates that the commands should be run as root on your OAS c
 
 If you encounter problems when you upgrade your cluster, please make sure first
 to include all potential new values of `ansible/group_vars/all/settings.yml.example`
-to your `clusters/YOUR_CLUSTERNAME/settings.yml`, and rerun the installation
+to your `clusters/YOUR_CLUSTERNAME/group_vars/all/settings.yml`, and rerun the installation
 script.
 
 
@@ -20,7 +20,7 @@ debug this:
 
 Did you create your cluster using the `--acme-staging` argument?
 Please check the resulting value of the `acme_staging` key in
-`clusters/YOUR_CLUSTERNAME/settings.yml`. If this is set to `true`, certificates
+`clusters/YOUR_CLUSTERNAME/group_vars/all/settings.yml`. If this is set to `true`, certificates
 are fetched from the [Let's Encrypt staging API](https://letsencrypt.org/docs/staging-environment/),
 which can't be validated by default in your browser.
 
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index 12880f030b24284eb12b98f80b554ec410356ca9..139a5359240ac6986f4a7d7a1ec085dd2e418963 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -172,7 +172,8 @@ class Cluster:
     @property
     def settings_file(self):
         """Path to the ansible settings.yml for this cluster"""
-        return os.path.join(self.cluster_dir, 'settings.yml')
+        return os.path.join(self.cluster_dir, 'group_vars', 'all',
+                            'settings.yml')
 
     @property
     def behave_file(self):