diff --git a/roles/compute-diag/tasks/main.yml b/roles/compute-diag/tasks/main.yml
index d6290b9..88a6300 100644
--- a/roles/compute-diag/tasks/main.yml
+++ b/roles/compute-diag/tasks/main.yml
@@ -14,4 +14,5 @@
    - "cat /etc/resolv.conf"
    - "ifconfig -a"
    - "route -n"
+   - "sudo ovs-vsctl show"
 
diff --git a/roles/head-diag/tasks/main.yml b/roles/head-diag/tasks/main.yml
index f21ab89..1b40a2d 100644
--- a/roles/head-diag/tasks/main.yml
+++ b/roles/head-diag/tasks/main.yml
@@ -50,10 +50,17 @@
 - name: ONOS diag collection - ONOS CLI
   shell: "sshpass -p 'karaf' ssh -p 8101 karaf@onos-cord {{ item }} > ~/{{ diag_dir }}/onos/{{ item | regex_replace('[^\\w-]', '_') }}"
   with_items:
-   - "cordvtn-nodes"
+   - "apps -s -a"
+   - "bundle:list"
    - "cordvtn-node-check nova-compute-1"
-   - "hosts"
+   - "cordvtn-nodes"
    - "dhcp-list"
+   - "flows"
+   - "hosts"
+   - "log:display"
+   - "nodes"
+   - "ports"
+   - "summary"
 
 - name: XOS diag collection
   shell: "ssh ubuntu@xos-1 \"{{ item }}\" > ~/{{ diag_dir }}/xos/{{ item | regex_replace('[^\\w-]', '_')}}"