diff --git a/components/opdk-iptables-block.yml b/components/opdk-iptables-block.yml
index 59e0dc0..744c8b3 100644
--- a/components/opdk-iptables-block.yml
+++ b/components/opdk-iptables-block.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
+  serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index 3e71e16..9955c6d 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
+  serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
diff --git a/components/opdk-upgrade-reachability-component.yml b/components/opdk-upgrade-reachability-component.yml
index 7dd477a..613b39e 100644
--- a/components/opdk-upgrade-reachability-component.yml
+++ b/components/opdk-upgrade-reachability-component.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
+  serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
diff --git a/upgrade.yml b/upgrade.yml
index 7781cb3..7d06dec 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -1,23 +1,37 @@
 ---
 - include: configuration/update_cache.yml
+  tags:
+  - ds
+  - ms
+  - qpid
+  - rmp
+  - pg
+  - pgmaster
+  - pgstandby
 
 - include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
     hosts: ms
     upgrade_component: ldap
+  tags:
+  - ms
 
 - include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
     hosts: ds
     upgrade_component: cs
+  tags:
+  - ds
 
 - include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
     hosts: ds
     upgrade_component: zk
+  tags:
+  - zk
 
 - include: components/opdk-iptables-block.yml
   vars:
@@ -25,6 +39,8 @@
     hosts: qpid
     server_type_name: qs
     upgrade_component: qpid
+  tags:
+  - qpid
 
 - include: components/opdk-upgrade-reachability-component.yml
   vars:
@@ -32,18 +48,24 @@
     hosts: pg
     server_type_name: ps
     upgrade_component: edge
+  tags:
+  - pg
 
 - include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
     hosts: ds[0,2]
     upgrade_component: edge
+  tags:
+  - ds
 
 - include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
     hosts: ms
     upgrade_component: edge
+  tags:
+  - ms
 
 - include: components/opdk-upgrade-reachability-component.yml
   vars:
@@ -51,9 +73,13 @@
     hosts: rmp
     server_type_name: router
     upgrade_component: edge
+  tags:
+  - rmp
 
 - include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
     hosts: ms
     upgrade_component: ui
+  tags:
+  - ui
\ No newline at end of file