diff --git a/README.md b/README.md
index 7a014e6..3dba5de 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,8 @@ For full details, please see the general [PVC install documentation](https://par
 0. Create a set of vars in `group_vars`, using `group_vars/default` as an example. Ensure
    that all desired coordinators are configured with the `is_coordinator: yes` flag.
 0. Run the `pvc.yml` playbook against the servers. If this is the very first run for a given
-   cluster, use the `-e bootstrap=yes` variable to ensure the Ceph, Patroni, and PVC clusters
-   are initialized.
+   cluster, use the `-e do_bootstrap=yes` variable to ensure the Ceph, Patroni, and PVC
+   clusters are initialized.
 
 ## License
 
diff --git a/roles/pvc/tasks/ceph/main.yml b/roles/pvc/tasks/ceph/main.yml
index d8773d8..217d663 100644
--- a/roles/pvc/tasks/ceph/main.yml
+++ b/roles/pvc/tasks/ceph/main.yml
@@ -40,7 +40,7 @@
     state: directory
 
 - include: ceph/bootstrap.yml
-  when: bootstrap is defined and bootstrap
+  when: do_bootstrap is defined and do_bootstrap
   run_once: yes
 
 - name: install configurations
diff --git a/roles/pvc/tasks/libvirt/main.yml b/roles/pvc/tasks/libvirt/main.yml
index 2b203e5..22b30e5 100644
--- a/roles/pvc/tasks/libvirt/main.yml
+++ b/roles/pvc/tasks/libvirt/main.yml
@@ -34,7 +34,7 @@
   notify: restart libvirtd
 
 - include: libvirt/bootstrap.yml
-  when: bootstrap is defined and bootstrap
+  when: do_bootstrap is defined and do_bootstrap
   run_once: yes
 
 - name: get ceph libvirt secret key
diff --git a/roles/pvc/tasks/patroni/main.yml b/roles/pvc/tasks/patroni/main.yml
index 2c5a7a4..1949465 100644
--- a/roles/pvc/tasks/patroni/main.yml
+++ b/roles/pvc/tasks/patroni/main.yml
@@ -88,7 +88,7 @@
 
 - include: patroni/bootstrap.yml
   run_once: yes
-  when: bootstrap is defined and bootstrap
+  when: do_bootstrap is defined and do_bootstrap
 
 - name: start but disable services (managed by PVC)
   service:
diff --git a/roles/pvc/tasks/pvc/main.yml b/roles/pvc/tasks/pvc/main.yml
index 8cd67cf..c94416d 100644
--- a/roles/pvc/tasks/pvc/main.yml
+++ b/roles/pvc/tasks/pvc/main.yml
@@ -52,7 +52,7 @@
 
 - include: pvc/bootstrap.yml
   run_once: yes
-  when: bootstrap is defined and bootstrap and is_coordinator
+  when: do_bootstrap is defined and do_bootstrap and is_coordinator
 
 - meta: flush_handlers
 
diff --git a/roles/pvc/tasks/zookeeper/main.yml b/roles/pvc/tasks/zookeeper/main.yml
index 96c5a65..1872a5d 100644
--- a/roles/pvc/tasks/zookeeper/main.yml
+++ b/roles/pvc/tasks/zookeeper/main.yml
@@ -49,6 +49,6 @@
     - zookeeper
 
 - include: zookeeper/bootstrap.yml
-  when: bootstrap is defined and bootstrap
+  when: do_bootstrap is defined and do_bootstrap
 
 - meta: flush_handlers