diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e32b0be1187..54ed33258b1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -229,3 +229,5 @@
 /src/confidentialledger/ @kairu-ms @lynshi
 
 /src/quota/ @kairu-ms @ZengTaoxu
+
+/src/amg/ @yugangw-msft
diff --git a/src/amg/azext_amg/commands.py b/src/amg/azext_amg/commands.py
index 84218f33240..313ad74134e 100644
--- a/src/amg/azext_amg/commands.py
+++ b/src/amg/azext_amg/commands.py
@@ -14,7 +14,7 @@ def load_command_table(self, _):
         g.custom_command('create', 'create_grafana', validator=process_grafana_create_namespace)
         g.custom_command('delete', 'delete_grafana')
         g.custom_command('list', 'list_grafana')
-        g.custom_command('show', 'show_grafana')
+        g.custom_show_command('show', 'show_grafana')
 
     with self.command_group('grafana dashboard') as g:
         g.custom_command('create', 'create_dashboard')