diff --git a/tasks/modify_image.yml b/tasks/modify_image.yml
index 66a90b1..6583e0f 100644
--- a/tasks/modify_image.yml
+++ b/tasks/modify_image.yml
@@ -32,6 +32,7 @@
 
 - name: Modify image
   command: "{{ build_commands[container_build_tool] }} --tag {{ target_image | default(source_image) }}{{ modified_append_tag }} --file Dockerfile.modified --network host ./"
-  become: true
+  #FIXME: buildah should not required root commands to build an image
+  become: "{{ true if build_commands[container_build_tool] == 'buildah' else false }}"
   args:
     chdir: "{{ modify_dir_path }}"