diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
index 62f448a84..e438c0882 100644
--- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
+++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
@@ -11,8 +11,10 @@ parameter_defaults:
     modify_vars:
       tasks_from: yum_update.yml
       yum_repos_dir_path: /etc/yum.repos.d
-      container_build_tool: buildah
       update_repo: "{{ update_containers_repo }}"
+{% if  release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] %}
+      container_build_tool: buildah
+{% endif %}
 {% endif %}
     set:
       tag: "{{ container_build_id }}"