diff --git a/defaults/main.yaml b/defaults/main.yaml
index b10e5a3..1bd7317 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -84,13 +84,13 @@ nodepool_file_nodepool_launcher_service_config_group: root
 nodepool_file_nodepool_launcher_service_config_owner: root
 
 nodepool_service_nodepool_builder_daemon_reload: true
-nodepool_service_nodepool_builder_enabled: yes
+nodepool_service_nodepool_builder_enabled: true
 nodepool_service_nodepool_builder_manage: true
 nodepool_service_nodepool_builder_name: nodepool-builder
 nodepool_service_nodepool_builder_state: started
 
 nodepool_service_nodepool_launcher_daemon_reload: true
-nodepool_service_nodepool_launcher_enabled: yes
+nodepool_service_nodepool_launcher_enabled: true
 nodepool_service_nodepool_launcher_manage: true
 nodepool_service_nodepool_launcher_name: nodepool-launcher
 nodepool_service_nodepool_launcher_state: started
diff --git a/tasks/config.yaml b/tasks/config.yaml
index a87b6b2..22ea91f 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -13,7 +13,7 @@
 # under the License.
 ---
 - name: Create required directories.
-  become: yes
+  become: true
   file:
     group: "{{ nodepool_user_group }}"
     owner: "{{ nodepool_user_name }}"
@@ -26,7 +26,7 @@
     - /var/log/nodepool
 
 - name: Install nodepool configuration.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_nodepool_yaml_dest }}"
     group: "{{ nodepool_file_nodepool_yaml_group }}"
@@ -36,7 +36,7 @@
   register: nodepool_file_nodepool_yaml
 
 - name: Install nodepool secure configuration.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_secure_conf_dest }}"
     group: "{{ nodepool_file_secure_conf_group }}"
@@ -46,7 +46,7 @@
   register: nodepool_file_secure_conf
 
 - name: Install builder logging configuration file.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_builder_logging_conf_dest }}"
     group: "{{ nodepool_file_builder_logging_conf_group }}"
@@ -56,7 +56,7 @@
   register: nodepool_file_builder_logging_conf
 
 - name: Install launcher logging configuration file.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_launcher_logging_conf_dest }}"
     group: "{{ nodepool_file_launcher_logging_conf_group }}"
diff --git a/tasks/install.yaml b/tasks/install.yaml
index de78f3b..1758e2d 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -18,7 +18,7 @@
   when: nodepool_build_depends is not defined
 
 - name: Ensure build dependencies are installed
-  become: yes
+  become: true
   package:
     name: "{{ nodepool_build_depends }}"
     state: installed
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index 401dd79..1e7e77f 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -13,7 +13,7 @@
 # under the License.
 ---
 - name: Install nodepool using pip.
-  become: yes
+  become: true
   pip:
     executable: "{{ nodepool_pip_executable|default(omit) }}"
     editable : "{{ nodepool_pip_editable|default(omit) }}"
diff --git a/tasks/pre.yaml b/tasks/pre.yaml
index 5adcad2..067f9de 100644
--- a/tasks/pre.yaml
+++ b/tasks/pre.yaml
@@ -13,14 +13,14 @@
 # under the License.
 ---
 - name: Create group account.
-  become: yes
+  become: true
   group:
     name: "{{ nodepool_user_group }}"
 
 - name: Create user account.
-  become: yes
+  become: true
   user:
-    createhome: yes
+    createhome: true
     group: "{{ nodepool_user_group }}"
     home: "{{ nodepool_user_home }}"
     name: "{{ nodepool_user_name }}"
diff --git a/tasks/service.yaml b/tasks/service.yaml
index 66b5a48..859536c 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -73,7 +73,7 @@
   when: nodepool_file_nodepool_launcher_service_config_src is not defined
 
 - name: Install nodepool-builder service script into place.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_nodepool_builder_service_dest }}"
     group: "{{ nodepool_file_nodepool_builder_service_group }}"
@@ -84,7 +84,7 @@
   when: nodepool_file_nodepool_builder_service_manage
 
 - name: Create nodepool-builder service config directory.
-  become: yes
+  become: true
   file:
     group: "{{ nodepool_file_nodepool_builder_service_config_group }}"
     owner: "{{ nodepool_file_nodepool_builder_service_config_owner }}"
@@ -93,7 +93,7 @@
   when: nodepool_file_nodepool_builder_service_config_manage
 
 - name: Install nodepool-builder service config into place.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_nodepool_builder_service_config_dest  }}"
     group: "{{ nodepool_file_nodepool_builder_service_config_group  }}"
@@ -104,7 +104,7 @@
   when: nodepool_file_nodepool_builder_service_config_manage
 
 - name: Install nodepool-launcher service script into place.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_nodepool_launcher_service_dest }}"
     group: "{{ nodepool_file_nodepool_launcher_service_group }}"
@@ -115,7 +115,7 @@
   when: nodepool_file_nodepool_launcher_service_manage
 
 - name: Create nodepool-launcher service config directory.
-  become: yes
+  become: true
   file:
     group: "{{ nodepool_file_nodepool_launcher_service_config_group }}"
     owner: "{{ nodepool_file_nodepool_launcher_service_config_owner }}"
@@ -124,7 +124,7 @@
   when: nodepool_file_nodepool_launcher_service_config_manage
 
 - name: Install nodepool-launcher service config into place.
-  become: yes
+  become: true
   template:
     dest: "{{ nodepool_file_nodepool_launcher_service_config_dest  }}"
     group: "{{ nodepool_file_nodepool_launcher_service_config_group  }}"
@@ -135,7 +135,7 @@
   when: nodepool_file_nodepool_launcher_service_config_manage
 
 - name: Enable nodepool-builder service.
-  become: yes
+  become: true
   systemd:
     daemon_reload: "{{ nodepool_service_nodepool_builder_daemon_reload }}"
     enabled: "{{ nodepool_service_nodepool_builder_enabled }}"
@@ -145,7 +145,7 @@
   when: nodepool_service_nodepool_builder_manage
 
 - name: Enable nodepool-launcher service.
-  become: yes
+  become: true
   systemd:
     daemon_reload: "{{ nodepool_service_nodepool_launcher_daemon_reload }}"
     enabled: "{{ nodepool_service_nodepool_launcher_enabled }}"