diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml
index 999471d12e0939611b5baca849f92f15afd8667b..7a07ae984c935b60ea89c7d034ac94ff1fffcb6b 100644
--- a/roles/wsgi_website/tasks/main.yml
+++ b/roles/wsgi_website/tasks/main.yml
@@ -12,7 +12,7 @@
     uid: "{{ admin_uid | default(omit) }}"
     group: "{{ user }}"
     shell: /bin/bash
-    createhome: yes
+    createhome: true
     home: "{{ home }}"
     state: present
 
@@ -46,8 +46,8 @@
     uid: "{{ uid | default(omit) }}"
     group: "{{ user }}"
     comment: "umask=0007"
-    system: yes
-    createhome: no
+    system: true
+    createhome: false
     state: present
     home: "{{ home }}"
 
@@ -55,7 +55,7 @@
   user:
     name: www-data
     groups: "{{ user }}"
-    append: yes
+    append: true
   notify:
     - Restart nginx
 
@@ -97,7 +97,7 @@
   command: '/usr/bin/virtualenv --prompt "({{ fqdn }})" "{{ home }}/virtualenv"'
   args:
     creates: "{{ home }}/virtualenv/bin/activate"
-  become: yes
+  become: true
   become_user: "{{ admin }}"
   tags:
     # [ANSIBLE0012] Commands should not change things if nothing needs doing
@@ -122,7 +122,7 @@
     mode: 0750
 
 - name: Install WSGI server
-  become: yes
+  become: true
   become_user: "{{ admin }}"
   pip:
     name: "{{ item.package }}"
@@ -143,7 +143,7 @@
   when: "wsgi_requirements"
 
 - name: Install additional packages in Python virtual environment
-  become: yes
+  become: true
   become_user: "{{ admin }}"
   pip:
     name: "{{ virtualenv_packages }}"
@@ -180,7 +180,7 @@
 - name: Enable the website service
   service:
     name: "{{ fqdn }}"
-    enabled: yes
+    enabled: true
     state: started
 
 - name: Create directory where static files can be served from