diff --git a/defaults/main.yml b/defaults/main.yml
index d75a1e9..b6f65c8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,11 @@
 ---
+# defaults file for bootstrap
 
 # Do you want to wait for the host to be available?
-bootstrap_wait_for_host: no
+bootstrap_wait_for_host: false
 
 # The number of seconds you want to wait during connection test before failing.
 bootstrap_timeout: 3
 
-# Set role to use "become" or not.
-bootstrap_become: yes
+# Tell the role to "become" or not.
+bootstrap_become: true
diff --git a/meta/argument_specs.yml b/meta/argument_specs.yml
index 557bdd2..d5c30ca 100644
--- a/meta/argument_specs.yml
+++ b/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       bootstrap_wait_for_host:
         type: "bool"
-        default: no
+        default: false
         description: "Wait for the machine to be available."
       bootstrap_timeout:
         type: "int"
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 44852b5..a460645 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -3,13 +3,13 @@
   hosts: all
   # This role installs packages using the `raw` module and needs to connect as
   # `root`. (`sudo` is not available before bootstrapping.) All tasks in the
-  # role have `become` set to `no`, so you can use either `no` or `yes` for
-  # `become`, the role will not use become (so `sudo`) for any task.
-  become: yes  # `no` will also work.
+  # role have `become` set to `false`, so you can use either `false` or `true`
+  # for `become`, the role will not use become (so `sudo`) for any task.
+  become: true  # `false` will also work.
   # This role installs python, gathering facts can't be done before `python` is
   # installed. This role runs the `setup` module, so facts will be available
   # after running the role.
-  gather_facts: no
+  gather_facts: false
 
   roles:
     - role: ansible-role-bootstrap
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index c5c40d8..29b992f 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -1,8 +1,8 @@
 ---
 - name: Verify
   hosts: all
-  become: no
-  gather_facts: no
+  become: false
+  gather_facts: false
 
   tasks:
     - name: Test connection