diff --git a/.gitignore b/.gitignore
index 54f4866299bd643ed7e1e98d18ebbc3a3f18f7d5..2ace1cb32533096d86ea94a3d0bea8ca5a42d95c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Ignore custom files created when following the README.md
-!ansible/group_vars/cluster/settings.yml.example
-/ansible/group_vars/cluster/settings*
+!ansible/group_vars/all/settings.yml.example
+/ansible/group_vars/all/settings*
 !/ansible/inventory.yml.example
 /ansible/inventory*
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef3194a59114f07af37ebe77d0f7f121103ba9d3..7f76ec5a84af1349d9da4a4049a90d9ccc4959c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ bootstrap:
     - ANSIBLE_HOST_KEY_CHECKING=False python3 -u ./ci-bootstrap.py --create-droplet --create-domain-records --run-ansible --ansible-param skip-tags=helmfile
   artifacts:
     paths:
-    - ansible/rke.log
+    - test/rke.log
     - test/inventory.yml
     - test/group_vars/all/settings.yml
     expire_in: 1 month
diff --git a/test/ci-bootstrap.py b/test/ci-bootstrap.py
index 367ec79aff4afd2bd7d9f500f5c0e396c01efb97..89c8c3a2332091adfd7b4a3dcd14a967c1535ef2 100755
--- a/test/ci-bootstrap.py
+++ b/test/ci-bootstrap.py
@@ -274,9 +274,9 @@ def write_behave_config(settings=None):
         nextcloud_admin_password = yaml.safe_load(stream)
 
     behave_config = configparser.ConfigParser()
-    behave_config['behave'] = {'stop': True}
-    behave_config['behave'] = {'format': 'rerun'}
-    behave_config['behave'] = {'outfiles': 'rerun_failing.features'}
+    behave_config['behave'] = {}
+    behave_config['behave']['format'] = 'rerun'
+    behave_config['behave']['outfiles'] = 'rerun_failing.features'
     behave_config['behave.userdata'] = {}
     behave_config['behave.userdata']['nextcloud.url'] = \
         'https://files.{}'.format(settings['domain'])