diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index 63f740c..a266279 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -3,9 +3,8 @@
   serial: 1
   gather_facts: no
   roles:
-  - apigee-opdk-setup-java-home
+  - { role: apigee-opdk-setup-java-home, tags: ['apigee-pre-req', 'java_home'] }
   - { role: apigee-opdk-setup-bootstrap, tags: ['apigee-pre-req', 'apigee-bootstrap'] }
-  - apigee-opdk-setup-component-installer
-  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-  tags:
-  - apigee-component
+  - { role: apigee-opdk-setup-silent-installation-config, tags: ['apigee-pre-req', 'apigee-silent-config'] }
+  - { role: apigee-opdk-setup-component-installer, tags: ['apigee-component'] }
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}', tags: ['apigee-component'] }
diff --git a/upgrade-rollback.yml b/upgrade-rollback.yml
index b3f6d95..c95afb3 100644
--- a/upgrade-rollback.yml
+++ b/upgrade-rollback.yml
@@ -1,7 +1,7 @@
 ---
 - name: Update the ansible cache
   hosts: planet
-  tags: ['cache']
+  tags: ['cache', 'apigee-pre-req' ]
   gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
@@ -11,6 +11,7 @@
 - name: Rolling back installation and bootstrap
   hosts: '{{ hosts }}'
   gather_facts: no
+  tags: ['rollback']
   vars:
     remove_apigee: true
     opdk_version: 4.16.01
@@ -19,6 +20,7 @@
 
 - name: Bootstap to the specified version on attribute opdk_version
   include: components/opdk-install-component.yml
+  tags: ['install']
   vars:
     opdk_version: 4.16.01
     component_profile: "{{ component }}"
diff --git a/upgrade.yml b/upgrade.yml
index 89934d1..0dca576 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -22,8 +22,7 @@
   vars:
     hosts: planet
     upgrade_edge: true
-  tags:
-  - installer
+  tags: ['installer']
 
 - name: Upgrade Cassandra
   include: components/opdk-upgrade-component.yml
@@ -31,8 +30,7 @@
     upgrade_edge: true
     hosts: ds
     upgrade_component: cs,zk
-  tags:
-  - cs-zk
+  tags: ['cs-zk']
 
 - name: Upgrade qpid
   include: components/opdk-upgrade-component.yml
@@ -43,8 +41,7 @@
     - qs
     upgrade_component: qpid
     block_port: '{{ qpid_messaging_port }}'
-  tags:
-  - qpid_only
+  tags: ['qpid']
 
 - name: Upgrade ldap
   include: components/opdk-upgrade-component.yml
@@ -52,8 +49,7 @@
     upgrade_edge: true
     hosts: ldap
     upgrade_component: ldap
-  tags:
-  - ldap
+  tags: ['ldap']
 
 - name: Upgrade qpid
   include: components/opdk-upgrade-component.yml
@@ -62,8 +58,7 @@
     hosts: qpid
     upgrade_component: edge
     block_port: '{{ qpid_messaging_port }}'
-  tags:
-  - qpid_edge
+  tags: ['qpid_edge']
 
 - name: Upgrade ms
   include: components/opdk-upgrade-component.yml
@@ -71,8 +66,7 @@
     upgrade_edge: true
     hosts: ms
     upgrade_component: edge
-  tags:
-  - ms_edge
+  tags: ['ms_edge']
 
 - name: Upgrade rmp
   include: components/opdk-upgrade-component.yml
@@ -83,8 +77,7 @@
     upgrade_edge: true
     hosts: rmp
     upgrade_component: edge
-  tags:
-  - rmp_edge
+  tags: ['rmp']
 
 - name: Upgrade ui
   include: components/opdk-upgrade-component.yml
@@ -92,8 +85,7 @@
     upgrade_edge: true
     hosts: ui
     upgrade_component: ui
-  tags:
-  - ui
+  tags: ['ui']
 
 - name: Stop Postgres components
   hosts: pg
@@ -137,7 +129,7 @@
   serial: 1
   gather_facts: no
   become: yes
-  tags: ['pg_control']
+  tags: ['pg', 'pg_control']
   vars:
     pg_control_old: "{{ apigee_installation_home }}/data/apigee-postgresql/pgdata-9.3.old/global/pg_control.old"
     pg_control: "{{ apigee_installation_home }}/data/apigee-postgresql/pgdata-9.3.old/global/pg_control"