diff --git a/meta/main.yml b/meta/main.yml
index e78e0f21..85816342 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and setup of octavia
   company: Rackspace
   license: Apache2
-  min_ansible_version: 2.0
+  min_ansible_version: 2.2
   platforms:
     - name: Ubuntu
       versions:
@@ -35,4 +35,4 @@ dependencies:
     when:
       - ansible_pkg_mgr == 'apt'
   - galera_client
-  - openstack_openrc
\ No newline at end of file
+  - openstack_openrc
diff --git a/tasks/octavia_install.yml b/tasks/octavia_install.yml
index aa01169c..ad519a68 100644
--- a/tasks/octavia_install.yml
+++ b/tasks/octavia_install.yml
@@ -13,15 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: octavia_install_apt.yml
-  static: no
-  when:
-    - ansible_pkg_mgr == 'apt'
-
-- include: octavia_install_yum.yml
-  static: no
-  when:
-    - ansible_pkg_mgr == 'yum'
+- name: Install apt packages
+  package:
+    name: "{{ octavia_distro_packages }}"
+    state: "{{ octavia_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/octavia_install_apt.yml b/tasks/octavia_install_apt.yml
deleted file mode 100644
index 469d5a95..00000000
--- a/tasks/octavia_install_apt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Copyright 2017, Rackspace US, 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: Install apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ octavia_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ octavia_distro_packages }}"
diff --git a/tasks/octavia_install_yum.yml b/tasks/octavia_install_yum.yml
deleted file mode 100644
index 2d86bc88..00000000
--- a/tasks/octavia_install_yum.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# Copyright 2017, Rackspace US, 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: Install yum packages
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ octavia_package_state }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ octavia_distro_packages }}"
-