diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
new file mode 100644
index 0000000..dcf2f08
--- /dev/null
+++ b/components/opdk-install-component.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+  serial: 1
+  roles:
+  - apigee-opdk-setup-component-installer
+  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
+  tags:
+  - apigee-component
diff --git a/upgrade.yml b/upgrade.yml
index 7ee6116..882656c 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -6,14 +6,13 @@
 
 - name: All components should be running
   hosts: planet
+  tags: ['start']
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   tasks:
   - name: All components should be running
     shell: "{{ apigee_all }} start"
-    tags:
-    - started
 
 - name: Update the installer for planet
   include: components/opdk-update-installer.yml
@@ -32,6 +31,14 @@
   tags:
   - cs-zk
 
+- name: Restore qpid component that is mysteriously uninstalled
+  include: components/opdk-install-component.yml
+  vars:
+    hosts: 'dc-1-qpid'
+    component_profile: 'qs'
+  tags:
+  - qpid_reinstall
+
 - name: Upgrade qpid
   include: components/opdk-upgrade-component.yml
   vars:
@@ -132,7 +139,7 @@
 
 - name: Upgrade Postgres master
   hosts: pgmaster
-  tags: ['pgmaster','pg']
+  tags: ['pgmaster_db_upgrade','pg']
   gather_facts: no
   serial: 1
   vars_files: