diff --git a/op-mode-definitions/container.xml.in b/op-mode-definitions/container.xml.in
index 4aa13e913..bb6f97b02 100644
--- a/op-mode-definitions/container.xml.in
+++ b/op-mode-definitions/container.xml.in
@@ -1,180 +1,207 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="add">
     <children>
       <node name="container">
         <properties>
           <help>Add container image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Pull a new image for container</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py add_image --name "${4}"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="connect">
     <children>
       <tagNode name="container">
         <properties>
           <help>Attach to a running container</help>
           <completionHelp>
             <path>container name</path>
           </completionHelp>
         </properties>
         <command>sudo podman exec --interactive --tty "$3" /bin/sh</command>
       </tagNode>
     </children>
   </node>
   <node name="delete">
     <children>
       <node name="container">
         <properties>
           <help>Delete container image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Delete container image</help>
               <completionHelp>
                 <list>all</list>
                 <script>sudo podman image ls -q</script>
               </completionHelp>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py delete_image --name "${4}"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="generate">
     <children>
       <node name="container">
         <properties>
           <help>Generate Container Image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Name of container image (tag)</help>
             </properties>
             <children>
               <tagNode name="path">
                 <properties>
                   <help>Path to Dockerfile</help>
                   <completionHelp>
                     <list>&lt;filename&gt;</list>
                   </completionHelp>
                 </properties>
                 <command>sudo podman build --net host --layers --force-rm --tag "$4" $6</command>
               </tagNode>
             </children>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="monitor">
     <children>
       <node name="log">
         <children>
           <tagNode name="container">
             <properties>
               <help>Monitor last lines of container log</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>sudo podman logs --follow --names "$4"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="show">
     <children>
       <node name="container">
         <properties>
           <help>Show containers</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/container.py show_container</command>
         <children>
-          <leafNode name="image">
+          <node name="json">
+            <properties>
+              <help>Show containers in JSON format</help>
+            </properties>
+            <!-- no admin check -->
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_container --raw</command>
+          </node>
+          <node name="image">
             <properties>
               <help>Show container image</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py show_image</command>
-          </leafNode>
+            <children>
+              <node name="json">
+                <properties>
+                  <help>Show container image in JSON format</help>
+                </properties>
+                <!-- no admin check -->
+                <command>sudo ${vyos_op_scripts_dir}/container.py show_image --raw</command>
+              </node>
+            </children>
+          </node>
           <tagNode name="log">
             <properties>
               <help>Show logs from a given container</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
+            <!-- no admin check -->
             <command>sudo podman logs --names "$4"</command>
           </tagNode>
-          <leafNode name="network">
+          <node name="network">
             <properties>
               <help>Show available container networks</help>
             </properties>
+            <!-- no admin check -->
             <command>sudo ${vyos_op_scripts_dir}/container.py show_network</command>
-          </leafNode>
+            <children>
+              <node name="json">
+                <properties>
+                  <help>Show available container networks in JSON format</help>
+                </properties>
+                <!-- no admin check -->
+                <command>sudo ${vyos_op_scripts_dir}/container.py show_network --raw</command>
+              </node>
+            </children>
+          </node>
         </children>
       </node>
       <node name="log">
         <children>
           <tagNode name="container">
             <properties>
               <help>Show logs from a given container</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>sudo podman logs --names "$4"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="restart">
     <children>
       <tagNode name="container">
         <properties>
           <help>Restart a given container</help>
           <completionHelp>
             <path>container name</path>
           </completionHelp>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/container.py restart --name="$3"</command>
       </tagNode>
     </children>
   </node>
   <node name="update">
     <properties>
       <help>Update data for a service</help>
     </properties>
     <children>
       <node name="container">
         <properties>
           <help>Update a container image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Update container image</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>if cli-shell-api existsActive container name "$4"; then sudo podman pull $(cli-shell-api returnActiveValue container name "$4" image); else echo "Container $4 does not exist"; fi</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>