diff --git a/upgrade-edge-planet.yml b/upgrade-edge-planet.yml
index 18d97fb..3752501 100644
--- a/upgrade-edge-planet.yml
+++ b/upgrade-edge-planet.yml
@@ -43,34 +43,12 @@
     debug:
       msg: "Upgrading component qpid on {{ inventory_hostname }} ( {{ ansible_hostname }} )"
 
-  - name: Work around remove for Qpid upgrade
-    ignore_errors: yes
-    become: true
-    yum:
-      name: "{{ item }}"
-      state: absent
-    with_items:
-    - qpid-cpp-server
-    - qpid-cpp-server-linearstore
-    - qpid-tools qpid-qmf
-    - python-qpid
-    - qpid-cpp-client
-    - qpid-proton-c
-
-  - name: Work around install for Qpid upgrade
-    become: true
-    yum:
-      name: "{{ item }}"
-      state: present
-    with_items:
-    - yum-plugin-priorities
-    - apigee-qpidd
-
   roles:
   - { role: apigee-opdk-setup-silent-installation-config, opdk_version: "{{ upgrade_from_opdk_version }}", tags: ['qpid-config']}
   - { role: apigee-opdk-start-components }
   - { role: apigee-opdk-set-reachable, reachability: False, server_types: ['qs'], tags: ['qpid-reachability-false'] }
   - { role: apigee-opdk-iptables-port-block, destination_port: '{{ qpid_messaging_port }}', tags: ['qpid-port-block'] }
+  - { role: apigee-opdk-update-component-qpidd, tags: ['qpid-upgrade'] }
   - { role: apigee-opdk-update-component,  component: 'qpid', tags: ['qpid-upgrade'] }
   - { role: apigee-opdk-iptables-flush, tags: ['qpid-iptables-flush'] }
   - { role: apigee-opdk-set-reachable, reachability: True, server_types: ['qs'], tags: ['qpid-reachability-true'] }