diff --git a/meta/main.yml b/meta/main.yml
index 683f21e..d7c72f2 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,9 +1,24 @@
+---
+# Copyright 2016, Comcast Corporation
+#
+# 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.
+
 galaxy_info:
   author: Comcast Corporation
   description: Install and configure OpenStack Rally
   company: Comcast Corportation
   license: Apache2
-  min_ansible_version: 2.0
+  min_ansible_version: 2.2
   platforms:
     - name: Ubuntu
       versions:
diff --git a/tasks/rally_install.yml b/tasks/rally_install.yml
index d3c339d..819f409 100644
--- a/tasks/rally_install.yml
+++ b/tasks/rally_install.yml
@@ -13,9 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: rally_install_apt.yml
-  static: no
-  when: ansible_pkg_mgr == 'apt'
+- name: Install distro packages
+  package:
+    name: "{{ rally_distro_packages }}"
+    state: "{{ rally_package_state }}"
+    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+    cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
 
 - name: Create developer mode constraint file
   copy:
diff --git a/tasks/rally_install_apt.yml b/tasks/rally_install_apt.yml
deleted file mode 100644
index 3eb1a2d..0000000
--- a/tasks/rally_install_apt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Copyright 2016, Comcast Corporation
-#
-# 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: Install apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ rally_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ rally_distro_packages }}"