diff --git a/install-edge-aio.yml b/install-edge-aio.yml
index c132bfb..9191835 100644
--- a/install-edge-aio.yml
+++ b/install-edge-aio.yml
@@ -1,23 +1,57 @@
 ---
 - name: Update planet cache
-  include: apigee-planet-cache.yml
+  tags: ['cache']
+  import_playbook: apigee-planet-cache.yml
   vars:
-    target_hosts: planet
+    target_hosts: edge
 
 - name: Install and configure OS pre-requisites
-  include: apigee-os-pre-requisites.yml
+  import_playbook: apigee-os-pre-requisites.yml
+  tags: ['os']
   vars:
-    target_hosts: planet
+    target_hosts: edge
 
 - name: Install Apigee pre-requisites
-  include: apigee-pre-requisites-bootstrap.yml
+  import_playbook: apigee-pre-requisites-common-install.yml
+  tags: ['common']
   vars:
-    target_hosts: planet
+    target_hosts: edge
 
-- name: Configure Apigee pre-requisites
-  include: apigee-edge-configuration.yml
+- name: Install and configure Openldap pre-requisites
+  import_playbook: apigee-os-pre-requisites-epel.yml
+  tags: ['os', 'os-epel']
   vars:
-    target_hosts: planet
+    target_hosts: edge
+
+- name: Install and configure Openldap pre-requisites
+  import_playbook: apigee-os-pre-requisites-openldap.yml
+  tags: ['os', 'os-openldap']
+  vars:
+    target_hosts: ms
+
+- name: Install and configure Pip pre-requisites
+  import_playbook: apigee-os-pre-requisites-pip.yml
+  tags: ['os', 'os-pip']
+  vars:
+    target_hosts: edge
+
+- name: Install and configure Postgres pre-requisites
+  import_playbook: apigee-os-pre-requisites-postgres.yml
+  tags: ['os', 'os-postgres']
+  vars:
+    target_hosts: edge
+
+- name: Install Apigee pre-requisites
+  import_playbook: apigee-pre-requisites-bootstrap.yml
+  tags: ['bootstrap']
+  vars:
+    target_hosts: edge
+
+- name: Install Apigee pre-requisites
+  import_playbook: apigee-pre-requisites-common-install.yml
+  tags: ['common']
+  vars:
+    target_hosts: edge
 
 - name: Install and configure Apigee Edge AIO
   hosts: planet