diff --git a/defaults/main.yaml b/defaults/main.yaml
index 35f19fe..ef12b6c 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -12,6 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
+# tasks/main.yaml
+diskimage_builder_task_manager:
+  - install
+
 # tasks/config.yaml
 diskimage_builder_git_dest: /opt/git/ansible-role-diskimage-builder/openstack/diskimage-builder
 diskimage_builder_git_uri: https://git.openstack.org/openstack/diskimage-builder
diff --git a/tasks/install.yaml b/tasks/install.yaml
index 24e812c..3157688 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -28,6 +28,7 @@
   when: diskimage_builder_package_name is not defined
 
 - name: Ensure build dependencies are installed.
+  become: yes
   package:
     name: "{{ item }}"
     state: installed
@@ -35,6 +36,7 @@
   when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
 
 - name: Ensure dependencies are installed.
+  become: yes
   package:
     name: "{{ item }}"
     state: installed
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
index f7d1959..95d729f 100644
--- a/tasks/install/git.yaml
+++ b/tasks/install/git.yaml
@@ -13,12 +13,14 @@
 # under the License.
 ---
 - name: Git clone diskimage-builder.
+  become: yes
   git:
     dest: "{{ diskimage_builder_git_dest }}"
     repo: "{{ diskimage_builder_git_uri }}"
     version: "{{ diskimage_builder_git_version }}"
 
 - name: Pip install diskimage-builder from local git repo.
+  become: yes
   pip:
     extra_args: "{{ diskimage_builder_pip_extra_args|default(omit) }}"
     name: "file://{{ diskimage_builder_git_dest }}"
diff --git a/tasks/install/package.yaml b/tasks/install/package.yaml
index eaecea5..a257b75 100644
--- a/tasks/install/package.yaml
+++ b/tasks/install/package.yaml
@@ -13,6 +13,7 @@
 # under the License.
 ---
 - name: Install diskimage-builder from package.
+  become: yes
   package:
     name: "{{ diskimage_builder_package_name }}"
     state: installed
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index a9c4345..6e0b33f 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -13,6 +13,7 @@
 # under the License.
 ---
 - name: Install diskimage-builder using pip.
+  become: yes
   pip:
     extra_args: "{{ diskimage_builder_pip_extra_args|default(omit) }}"
     name: "{{ diskimage_builder_pip_name }}"
diff --git a/tasks/main.yaml b/tasks/main.yaml
index ebbfbf9..af0cac6 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -15,5 +15,7 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yaml"
 
-- include: install.yaml
-  become: yes
+- include: "{{ diskimage_builder_task }}.yaml"
+  with_items: "{{ diskimage_builder_task_manager }}"
+  loop_control:
+    loop_var: diskimage_builder_task