diff --git a/cli/azd/cmd/testdata/TestFigSpec.ts b/cli/azd/cmd/testdata/TestFigSpec.ts
index cd2ecde9942..f60a6bfe9be 100644
--- a/cli/azd/cmd/testdata/TestFigSpec.ts
+++ b/cli/azd/cmd/testdata/TestFigSpec.ts
@@ -4093,7 +4093,7 @@ const completionSpec: Fig.Spec = {
 						},
 						{
 							name: ['--output', '-o'],
-							description: 'Path to the output directory. Defaults to ./bin folder.',
+							description: 'Path to the output directory.',
 							args: [
 								{
 									name: 'output',
@@ -4112,7 +4112,7 @@ const completionSpec: Fig.Spec = {
 					options: [
 						{
 							name: ['--capabilities'],
-							description: 'The list of capabilities for the extension (e.g., custom-commands,lifecycle-events,mcp-server,service-target-provider).',
+							description: 'The list of capabilities for the extension (e.g., custom-commands,lifecycle-events,mcp-server,service-target-provider,framework-service-provider,metadata,provisioning-provider).',
 							isRepeatable: true,
 							args: [
 								{
@@ -4156,10 +4156,29 @@ const completionSpec: Fig.Spec = {
 								},
 							],
 						},
+						{
+							name: ['--output', '-o'],
+							description: 'The output format',
+							args: [
+								{
+									name: 'output',
+								},
+							],
+						},
 						{
 							name: ['--registry', '-r'],
 							description: 'When set will create a local extension source registry.',
 						},
+						{
+							name: ['--tags'],
+							description: 'Optional tags for the extension, comma-separated or repeatable (max 10 tags, 64 characters each).',
+							isRepeatable: true,
+							args: [
+								{
+									name: 'tags',
+								},
+							],
+						},
 					],
 				},
 				{
@@ -4177,7 +4196,7 @@ const completionSpec: Fig.Spec = {
 						},
 						{
 							name: ['--output', '-o'],
-							description: 'Path to the artifacts output directory. If not provided, will use local registry artifacts path.',
+							description: 'Path to the artifacts output directory. If omitted, uses the local registry artifacts path.',
 							args: [
 								{
 									name: 'output',
@@ -4204,6 +4223,15 @@ const completionSpec: Fig.Spec = {
 								},
 							],
 						},
+						{
+							name: ['--output', '-o'],
+							description: 'The output format',
+							args: [
+								{
+									name: 'output',
+								},
+							],
+						},
 						{
 							name: ['--registry', '-r'],
 							description: 'Path to the extension source registry',
@@ -4273,6 +4301,15 @@ const completionSpec: Fig.Spec = {
 								},
 							],
 						},
+						{
+							name: ['--output', '-o'],
+							description: 'The output format',
+							args: [
+								{
+									name: 'output',
+								},
+							],
+						},
 						{
 							name: ['--prerelease'],
 							description: 'Create a pre-release version',
@@ -4309,10 +4346,32 @@ const completionSpec: Fig.Spec = {
 				{
 					name: ['version'],
 					description: 'Prints the version of the application',
+					options: [
+						{
+							name: ['--output', '-o'],
+							description: 'The output format',
+							args: [
+								{
+									name: 'output',
+								},
+							],
+						},
+					],
 				},
 				{
 					name: ['watch'],
 					description: 'Watches the azd extension project for file changes and rebuilds it.',
+					options: [
+						{
+							name: ['--output', '-o'],
+							description: 'The output format',
+							args: [
+								{
+									name: 'output',
+								},
+							],
+						},
+					],
 				},
 			],
 		},
diff --git a/cli/azd/extensions/registry.json b/cli/azd/extensions/registry.json
index e00bf4ed361..cb27d2d01c8 100644
--- a/cli/azd/extensions/registry.json
+++ b/cli/azd/extensions/registry.json
@@ -1140,6 +1140,96 @@
               "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.10.0/microsoft-azd-extensions-windows-arm64.zip"
             }
           }
+        },
+        {
+          "version": "0.11.0",
+          "capabilities": [
+            "custom-commands",
+            "metadata"
+          ],
+          "usage": "azd x \u003ccommand\u003e [options]",
+          "examples": [
+            {
+              "name": "init",
+              "description": "Initialize a new azd extension project.",
+              "usage": "azd x init"
+            },
+            {
+              "name": "build",
+              "description": "Build the azd extension project.",
+              "usage": "azd x build"
+            },
+            {
+              "name": "pack",
+              "description": "Package the azd extension project into a distributable format and add to local registry.",
+              "usage": "azd x pack"
+            },
+            {
+              "name": "publish",
+              "description": "Publish the azd extension project to an extension source.",
+              "usage": "azd x publish"
+            },
+            {
+              "name": "release",
+              "description": "Create a new release of the azd extension project to a GitHub repository.",
+              "usage": "azd x release"
+            },
+            {
+              "name": "watch",
+              "description": "Watch for changes in the extension project and automatically rebuild and reload the extension.",
+              "usage": "azd x watch"
+            }
+          ],
+          "artifacts": {
+            "darwin/amd64": {
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "f6d47f6333f59e489c9f32c24f3abdb945235b8629abc6d2157e30f1b91814d9"
+              },
+              "entryPoint": "microsoft-azd-extensions-darwin-amd64",
+              "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.11.0/microsoft-azd-extensions-darwin-amd64.zip"
+            },
+            "darwin/arm64": {
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "6d2f6823fdb3f2343cd5de9e0cd740af9b59faf48cfa07f9b4f8a96a0d7d51f9"
+              },
+              "entryPoint": "microsoft-azd-extensions-darwin-arm64",
+              "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.11.0/microsoft-azd-extensions-darwin-arm64.zip"
+            },
+            "linux/amd64": {
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "10a88883a3144e2d577755972cf9c958bb7bf99946c2ef09c9fbd7f6bc522418"
+              },
+              "entryPoint": "microsoft-azd-extensions-linux-amd64",
+              "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.11.0/microsoft-azd-extensions-linux-amd64.tar.gz"
+            },
+            "linux/arm64": {
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "011e4433cb1e1ff15cd8b7b20e3b3db90ac86476ee1a6ee86b44a118b553a34c"
+              },
+              "entryPoint": "microsoft-azd-extensions-linux-arm64",
+              "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.11.0/microsoft-azd-extensions-linux-arm64.tar.gz"
+            },
+            "windows/amd64": {
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "81e21c0591073af8759073cdc0aa5356350b29dfa565d4296d81770eb9250155"
+              },
+              "entryPoint": "microsoft-azd-extensions-windows-amd64.exe",
+              "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.11.0/microsoft-azd-extensions-windows-amd64.zip"
+            },
+            "windows/arm64": {
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "29d7667e5c5fe398b2bc2d49d8cd50c4ec2d7a80af39b5dc2661e0a279096b07"
+              },
+              "entryPoint": "microsoft-azd-extensions-windows-arm64.exe",
+              "url": "https://github.com/Azure/azure-dev/releases/download/azd-ext-microsoft-azd-extensions_0.11.0/microsoft-azd-extensions-windows-arm64.zip"
+            }
+          }
         }
       ]
     },