diff --git a/.github/ISSUE_TEMPLATE/success-story.md b/.github/ISSUE_TEMPLATE/success-story.md
index e63b662..a28b08b 100644
--- a/.github/ISSUE_TEMPLATE/success-story.md
+++ b/.github/ISSUE_TEMPLATE/success-story.md
@@ -8,7 +8,7 @@ labels: kind/consumer-experience, kind/documentation, triage/untriaged
 
 We 💖 to hear about how, where and what you're doing with Uno. Sharing this information is one of the kindest things you can do in open-source and the maintainers love hearing about success stories. Instead of raising a new GitHub issue could you please comment in the existing thread?
 
-https://github.com/nventive/Uno/issues/18#issuecomment-494887105
+https://github.com/unoplatform/Uno/issues/18#issuecomment-494887105
 
 If you are feeling extra generous, how about authoring up a blog post and then letting us know about it so that we can retweet it?
 
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
index a3a6379..bbc3cb4 100644
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -12,6 +12,6 @@ If you're looking for help, check [Stack Overflow](https://stackoverflow.com/que
 
 You can also post your question in the [Uno gitter room](https://gitter.im/uno-platform/Lobby) or [on Twitter using the #unoplatform](https://twitter.com/search?q=%23unoplatform) hashtag.
 
-For organizations that want a deeper level of support beyond our community support, please [contact us](https://platform.uno/contact/). Our professional support is more than a contract – it is a shared responsibility for your project success. Our engineering team will collaborate with you to ensure the success of your projects, and our custom application development team at nventive is also available to lend its expertise.
+For organizations that want a deeper level of support beyond our community support, please [contact us](https://platform.uno/contact/). Our professional support is more than a contract – it is a shared responsibility for your project success. Our engineering team will collaborate with you to ensure the success of your projects, and our custom application development team at unoplatform is also available to lend its expertise.
 
-If the matter is security related, please disclose it privately via https://github.com/nventive/Uno/security/ -->
+If the matter is security related, please disclose it privately via https://github.com/unoplatform/uno/security/ -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f081282..d8ac85c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -32,11 +32,11 @@ What kind of change does this PR introduce?
 Please check if your PR fulfills the following requirements:
 
 - [ ] Tested code with current [supported SDKs](../README.md#supported)
-- [ ] Docs have been added/updated which fit [documentation template](https://github.com/nventive/Uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
+- [ ] Docs have been added/updated which fit [documentation template](https://github.com/unoplatform/uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
 - [ ] [Unit Tests and/or UI Tests](doc/articles/working-with-the-samples-apps.md) for the changes have been added (for bug fixes / features) (if applicable)
 - [ ] [Wasm UI Tests](doc/articles/working-with-the-samples-apps.md#running-the-webassembly-ui-tests-snapshots) are not showing unexpected any differences. Validate PR `Screenshots Compare Test Run` results.
 - [ ] Contains **NO** breaking changes
-- [ ] Updated the [Release Notes](https://github.com/nventive/Uno/tree/master/doc/ReleaseNotes)
+- [ ] Updated the [Release Notes](https://github.com/unoplatform/Uno/tree/master/doc/ReleaseNotes)
 - [ ] Associated with an issue (GitHub or internal)
 
 <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f081282..841cbc9 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -32,11 +32,11 @@ What kind of change does this PR introduce?
 Please check if your PR fulfills the following requirements:
 
 - [ ] Tested code with current [supported SDKs](../README.md#supported)
-- [ ] Docs have been added/updated which fit [documentation template](https://github.com/nventive/Uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
+- [ ] Docs have been added/updated which fit [documentation template](https://github.com/unoplatform/Uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
 - [ ] [Unit Tests and/or UI Tests](doc/articles/working-with-the-samples-apps.md) for the changes have been added (for bug fixes / features) (if applicable)
 - [ ] [Wasm UI Tests](doc/articles/working-with-the-samples-apps.md#running-the-webassembly-ui-tests-snapshots) are not showing unexpected any differences. Validate PR `Screenshots Compare Test Run` results.
 - [ ] Contains **NO** breaking changes
-- [ ] Updated the [Release Notes](https://github.com/nventive/Uno/tree/master/doc/ReleaseNotes)
+- [ ] Updated the [Release Notes](https://github.com/unoplatform/Uno/tree/master/doc/ReleaseNotes)
 - [ ] Associated with an issue (GitHub or internal)
 
 <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aa2d291..6fe4d34 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -110,6 +110,15 @@ jobs:
       working-directory: extensions/azuredevops
       run: .\node_modules\.bin\tsc -project .\tsconfig.json --listEmittedFiles --locale en-US --isolatedModules
 
+    - name: Update Versions
+      run: |
+        # update the version from the task manifest task.json file so that it matches steps.gitversion.outputs.MajorMinorPatch
+        $taskManifest = Get-Content -Path .\extensions\azuredevops\canaryUpdater\task.json -Raw | ConvertFrom-Json
+        $taskManifest.version.Major = "${{ steps.gitversion.outputs.Major }}"
+        $taskManifest.version.Minor = "${{ steps.gitversion.outputs.Minor }}"
+        $taskManifest.version.Patch = "${{ steps.gitversion.outputs.Patch }}"
+        $taskManifest | ConvertTo-Json -Depth 100 | Set-Content -Path .\extensions\azuredevops\canaryUpdater\task.json
+
     - name: Package Extension
       working-directory: extensions/azuredevops
       run: tfx extension create --json --no-color --output-path .\artifacts\Build.Tasks.${{ steps.gitversion.outputs.MajorMinorPatch }}.vsix --override "{""version"":""${{ steps.gitversion.outputs.MajorMinorPatch }}""}"
@@ -208,19 +217,23 @@ jobs:
       - build-extensions
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
       - name: Download Artifacts
         uses: actions/download-artifact@v2
         with:
           name: extensions
           path: artifacts
 
+      - name: Install tfx
+        working-directory: extensions/azuredevops
+        run: npm install tfx-cli@0.7.x -g --no-audit --no-fund
+    
       - name: Publish to VS Marketplace
         shell: pwsh
         run: |
-            dotnet tool update -g dotnet-vs
             $vsix = Get-ChildItem -Path .\artifacts -Filter *.vsix | Select-Object -First 1
 
-            & "$(vs where release --prop=InstallationPath)/VSSDK/VisualStudioIntegration/Tools/Bin/VsixPublisher.exe" publish `
-            -payload "$vsix" `
-            -publishManifest "extensions/azuredevops/vss-extension.json" `
-            -personalAccessToken "${{ secrets.VS_VSIX_PAT }}"
+            tfx extension publish --vsix "$vsix" --no-wait-validation -t "${{ secrets.VS_VSIX_PAT }}"
+
diff --git a/extensions/azuredevops/README.md b/extensions/azuredevops/README.md
index abe5a3c..3417f30 100644
--- a/extensions/azuredevops/README.md
+++ b/extensions/azuredevops/README.md
@@ -1,6 +1,6 @@
 # unoplatform-Build-Tools
 
-This is the code for the [unoplatform Build Tools](https://marketplace.visualstudio.com/items?itemName=nventivecorp.unoplatform) Azure Pipelines extension.
+This is the code for the [Uno Build Tools](https://marketplace.visualstudio.com/items?itemName=nventivecorp.unoplatform) Azure Pipelines extension.
 
 ## Features
 
diff --git a/extensions/azuredevops/canaryUpdater/icon.png b/extensions/azuredevops/canaryUpdater/icon.png
index 1a199b9..111f2cb 100644
Binary files a/extensions/azuredevops/canaryUpdater/icon.png and b/extensions/azuredevops/canaryUpdater/icon.png differ
diff --git a/extensions/azuredevops/canaryUpdater/task.json b/extensions/azuredevops/canaryUpdater/task.json
index ad70a4e..fb117be 100644
--- a/extensions/azuredevops/canaryUpdater/task.json
+++ b/extensions/azuredevops/canaryUpdater/task.json
@@ -1,9 +1,9 @@
 {
-	"id": "95170664-b64e-4571-9cd4-936b3a626292",
-	"name": "nventiveCanaryUpdater",
+	"id": "32CDFE1A-1E67-47B5-9195-FEDBFC338DB9",
+	"name": "unoplatformCanaryUpdater",
 	"friendlyName": "Canary Updater",
 	"description": "A task to update a Canary build. The update is split in 3 phases :\n - Optional: merge of the canary branch with a given target branch (usually master) \n - Update of the NuGet packages; the versions used by the updater are calculated through the branch name (canaries/dev for dev, canaries/beta+dev for beta and stable, etc.); stable is always appended to the versions. \n - Optional: commit the changes and push the changes.",
-	"helpMarkDown": "[unoplatform](http://www.unoplatform.com/)",
+	"helpMarkDown": "[unoplatform](http://platform.uno/docs)",
 	"category": "Build",
 	"author": "unoplatform",
 	"version": {
@@ -210,7 +210,7 @@
 			"type": "string",
 			"label": "NuGet Updater version",
 			"groupName": "updater",
-			"defaultValue": "2.1.1",
+			"defaultValue": "1.0.0",
 			"required": true,
 			"helpMarkDown": "The of the NuGet updater to use. See https://www.nuget.org/packages/unoplatform.nuget.updater.tool for the list of available versions",
 			"properties": {
diff --git a/extensions/azuredevops/canaryUpdater/task.ts b/extensions/azuredevops/canaryUpdater/task.ts
index 4782180..f21d558 100644
--- a/extensions/azuredevops/canaryUpdater/task.ts
+++ b/extensions/azuredevops/canaryUpdater/task.ts
@@ -395,7 +395,7 @@ async function installNuGetUpdater(): Promise<boolean> {
     let dotnet = tl.tool(dotnetPath);
 
     let installationTool = dotnet
-        .arg([ "tool", "install", "unoplatform.NuGet.Updater.Tool", "--version", toolVersion, "--tool-path", tl.getVariable("Agent.TempDirectory"), "--ignore-failed-sources" ]);
+        .arg([ "tool", "install", "Uno.NuGet.Updater.Tool", "--version", toolVersion, "--tool-path", tl.getVariable("Agent.TempDirectory"), "--ignore-failed-sources" ]);
 
     await installationTool.exec(<IExecOptions>{ outStream: getConsoleStream(false) });
 
diff --git a/extensions/azuredevops/logo.png b/extensions/azuredevops/logo.png
index 1a199b9..111f2cb 100644
Binary files a/extensions/azuredevops/logo.png and b/extensions/azuredevops/logo.png differ
diff --git a/extensions/azuredevops/vss-extension.json b/extensions/azuredevops/vss-extension.json
index 1aa52d6..f784d84 100644
--- a/extensions/azuredevops/vss-extension.json
+++ b/extensions/azuredevops/vss-extension.json
@@ -2,16 +2,26 @@
 	"manifestVersion": 1,
 	"id": "unoplatform-build-tools",
 	"version": "0.0.0",
-	"name": "unoplatform Build Tools",
+	"name": "Uno Platform Build Tools",
 	"description": "The Canary Updater tool by Uno Platform",
 	"publisher": "unoplatform",
+	"public": true,
+	"tags": [
+		"Extension",
+		"Marketplace",
+		"Package",
+		"Install",
+		"Build",
+		"Azure Pipelines",
+		"Azure DevOps Extensions"
+	],
 	"targets": [
 		{
 			"id": "Microsoft.VisualStudio.Services"
 		}
 	],
 	"categories": [
-		"Build and release"
+		"Azure Pipelines"
 	],
 	"icons": {
 		"default": "logo.png"
@@ -21,10 +31,10 @@
 			"path": "overview.md"
 		}
 	},
-  "repository": {
-	"type": "git",
-	"uri": "https://github.com/unoplatform/nuget.updater"
-  },
+	"repository": {
+		"type": "git",
+		"uri": "https://github.com/unoplatform/nuget.updater"
+	},
 	"contributions": [
 		{
 			"id": "unoplatform.canaryUpdater",
@@ -37,9 +47,7 @@
 			}
 		}
 	],
-	"scopes": [
-		"vso.work"
-	],
+	"scopes": [],
 	"files": [
 		{
 			"path": "canaryUpdater"