diff --git a/apigee-analysis.yml b/apigee-analysis.yml
index 0b9b3d6..144fca7 100644
--- a/apigee-analysis.yml
+++ b/apigee-analysis.yml
@@ -297,6 +297,7 @@
     include_vars: '~/.apigee-secure/credentials.yml'
 
   roles:
+    - { role: apigee-opdk-server-self, server_types: ['ps'], tags: ['self'] }
     - { role: apigee-opdk-server-registration-state, username: "{{ opdk_user_email }}", password: "{{ opdk_user_pass }}", server_self: "{{ edge_ps_self }}", mgmt_server_ip: "{{ local_mgmt_ip }}" }
 
 - name: Analytics group scope state
@@ -319,7 +320,7 @@
   serial: 1
   tasks:
   - name: Gather qpid stats
-    shell: "{{ qpid-stat }} -g"
+    shell: "{{ qpid_stat }} -g"
     register: results
 
 - name: Qpid queue depth