diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml
index 313078a37d..69c2c17d85 100644
--- a/playbooks/groups/people.yml
+++ b/playbooks/groups/people.yml
@@ -1,3 +1,4 @@
+---
 # Create a people server
 #
 #
@@ -8,12 +9,12 @@
 - name: make the box be real
   hosts: people
   user: root
-  gather_facts: True
+  gather_facts: yes
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+    - /srv/web/infra/ansible/vars/global.yml
+    - "/srv/private/ansible/vars.yml"
+    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
 
@@ -63,7 +64,8 @@
   roles:
   - base
   - collectd/base
-  - { role: openvpn/client, when: env != "staging" }
+  - role: openvpn/client
+    when: env != "staging"
   - ipa/client
   - hosts
   - nagios_client
diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml
index 068c8c1f88..4a776b4f19 100644
--- a/roles/people/tasks/main.yml
+++ b/roles/people/tasks/main.yml
@@ -16,7 +16,7 @@
   - libxml2-python
   - tree            # requested in ticket 5148
   - mod_ssl
-  - python36-jinja2 # needed now for make-people-page.py
+  - python36-jinja2  # needed now for make-people-page.py
   when: inventory_hostname.startswith('people02')
   tags:
   - packages
@@ -175,8 +175,9 @@
 
 - name: set the SELinux policy for the planet dir
   command: semanage fcontext -a -t httpd_sys_content_t "/srv/planet(/.*)?"
-  when: gitcontext.stdout.find('httpd_sys_content_t') == -1
-  when: inventory_hostname.startswith('people02')
+  when: >-
+    gitcontext.stdout.find('httpd_sys_content_t') == -1
+    and inventory_hostname.startswith('people02')
   tags:
   - config
   - selinux
@@ -217,7 +218,8 @@
 # It's also safe to aways run.
 #
 - name: set quotas for people who have more set
-  command: xfs_quota -x -c 'limit bsoft={{ item.quota }} bhard={{ item.quota }} {{ item.user }}' /srv
+  command: >-
+    xfs_quota -x -c 'limit bsoft={{ item.quota }} bhard={{ item.quota }} {{ item.user }}' /srv
   with_items:
   - {user: adamwill, quota: 8g}
   - {user: apache, quota: 1000g}