diff --git a/tasks/install.yaml b/tasks/install.yaml
index 4b01091..4435300 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -27,11 +27,33 @@
     diskimage_builder_pkg_name: "{{ __diskimage_builder_pkg_name }}"
   when: diskimage_builder_pkg_name is not defined
 
-- include: install/debian.yaml
-  when: ansible_os_family == 'Debian'
+# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
+- name: Ensure EPEL is enabled.
+  package:
+    pkg: epel-release
+    state: installed
+  when: (diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip') and
+        ansible_os_family == 'RedHat'
 
-- include: install/redhat.yaml
-  when: ansible_os_family == 'RedHat'
+- name: Ensure build dependencies are installed.
+  package:
+    name: "{{ item }}"
+    state: installed
+  with_items: diskimage_builder_build_depends
+  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
+
+- name: Ensure dependencies are installed.
+  package:
+    pkg: "{{ item }}"
+    state: installed
+  with_items: diskimage_builder_depends
+  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
+
+- name: Install diskimage-builder from OS package.
+  package:
+    pkg: "{{ diskimage_builder_pkg_name }}"
+    state: installed
+  when: diskimage_builder_install_method == 'pkg'
 
 - include: install/git.yaml
   when: diskimage_builder_install_method == 'git'
diff --git a/tasks/install/debian.yaml b/tasks/install/debian.yaml
deleted file mode 100644
index bb7dfbf..0000000
--- a/tasks/install/debian.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Ensure build dependencies are installed.
-  apt:
-    pkg: "{{ item }}"
-    state: installed
-  with_items: diskimage_builder_build_depends
-  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
-
-- name: Ensure dependencies are installed.
-  apt:
-    pkg: "{{ item }}"
-    state: installed
-  with_items: diskimage_builder_depends
-  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
-
-- name: Install diskimage-builder using apt.
-  apt:
-    pkg: "{{ diskimage_builder_pkg_name }}"
-    state: installed
-  when: diskimage_builder_install_method == 'pkg'
diff --git a/tasks/install/redhat.yaml b/tasks/install/redhat.yaml
deleted file mode 100644
index 1f97e80..0000000
--- a/tasks/install/redhat.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
-- name: Ensure EPEL is enabled.
-  yum:
-    pkg: epel-release
-    state: installed
-  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
-
-- name: Ensure build dependencies are installed.
-  yum:
-    pkg: "{{ item }}"
-    state: installed
-  with_items: diskimage_builder_build_depends
-  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
-
-- name: Ensure dependencies are installed.
-  yum:
-    pkg: "{{ item }}"
-    state: installed
-  with_items: diskimage_builder_depends
-  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
-
-- name: Install diskimage-builder using yum.
-  yum:
-    pkg: "{{ diskimage_builder_pkg_name }}"
-    state: installed
-  when: diskimage_builder_install_method == 'pkg'