diff --git a/op-mode-definitions/show-monitoring.xml.in b/op-mode-definitions/show-monitoring.xml.in
index 2651b34387..9fd60e45ad 100644
--- a/op-mode-definitions/show-monitoring.xml.in
+++ b/op-mode-definitions/show-monitoring.xml.in
@@ -2,12 +2,68 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-      <leafNode name="monitoring">
+      <node name="monitoring">
         <properties>
           <help>Show currently monitored services</help>
         </properties>
-        <command>vtysh -c "show debugging"</command>
-      </leafNode>
+        <children>
+          <node name="frr">
+            <properties>
+              <help>Show currently monitored FRR services</help>
+            </properties>
+            <command>vtysh -c "show debugging"</command>
+            <children>
+              <node name="zebra">
+                <properties>
+                  <help>Show Zebra routing information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+                <children>
+                  <node name="client">
+                    <properties>
+                      <help>Client information</help>
+                    </properties>
+                    <children>
+                      <node name="summary">
+                        <properties>
+                          <help>Brief summary</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+                      </node>
+                    </children>
+                  </node>
+                  <node name="dplane">
+                    <properties>
+                      <help>Zebra dataplane information</help>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+                  </node>
+                  <node name="router">
+                    <properties>
+                      <help>Zebra router information</help>
+                    </properties>
+                    <children>
+                      <node name="table">
+                        <properties>
+                          <help>Zebra routing table information</help>
+                        </properties>
+                        <children>
+                          <node name="summary">
+                            <properties>
+                              <help>Summary information</help>
+                            </properties>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh "show ${@:4}"</command>
+                          </node>
+                        </children>
+                      </node>
+                    </children>
+                  </node>
+                </children>
+              </node>
+            </children>
+          </node>
+        </children>
+      </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-zebra.xml.in b/op-mode-definitions/show-zebra.xml.in
deleted file mode 100644
index 69991a1d57..0000000000
--- a/op-mode-definitions/show-zebra.xml.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="show">
-    <children>
-      <node name="zebra">
-        <properties>
-          <help>Show Zebra routing information</help>
-        </properties>
-        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        <children>
-          <node name="client">
-            <properties>
-              <help>Client information </help>
-            </properties>
-            <children>
-              <node name="summary">
-                <properties>
-                  <help>Brief Summary</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-              </node>
-            </children>
-          </node>
-          <node name="dplane">
-            <properties>
-              <help>Zebra dataplane information</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          </node>
-          <node name="router">
-            <properties>
-              <help>Zebra Router Information</help>
-            </properties>
-            <children>
-              <node name="table">
-                <properties>
-                  <help>Table Information about this Zebra Router</help>
-                </properties>
-                <children>
-                  <node name="summary">
-                    <properties>
-                      <help>Summary Information</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                  </node>
-                </children>
-              </node>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>