diff --git a/NuGet.Config b/NuGet.Config
index e86194b..30e14a7 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <add key="Azure Artifacts nanoFramework dev" value="https://pkgs.dev.azure.com/nanoframework/feed/_packaging/sandbox/nuget/v3/index.json" protocolVersion="3" />
         <add key="NuGet" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="Azure Artifacts nanoFramework dev" value="https://pkgs.dev.azure.com/nanoframework/feed/_packaging/sandbox/nuget/v3/index.json" protocolVersion="3" />
     </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/README.md b/README.md
index bb9ac99..c9803f1 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoframework.WebServer&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoframework.WebServer) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoframework.WebServer&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoframework.WebServer) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.WebServer.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.WebServer/) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg?logo=discord&logoColor=white&label=Discord&color=7289DA)](https://discord.gg/gCyBu8T)
 
-![nanoFramework logo](https://github.com/nanoframework/Home/blob/main/resources/logo/nanoFramework-repo-logo.png)
+![nanoFramework logo](https://raw.githubusercontent.com/nanoframework/Home/main/resources/logo/nanoFramework-repo-logo.png)
 
 -----
 
-### Welcome to the **nanoFramework** WebServer repository!
+### Welcome to the .NET **nanoFramework** WebServer repository
 
 ## Build status
 
@@ -384,7 +384,7 @@ The **nanoFramework** WebServer library is licensed under the [MIT license](LICE
 
 ## Code of Conduct
 
-This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behaviour in our community.
 For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
 
 ### .NET Foundation
diff --git a/assets/nf-logo.png b/assets/nf-logo.png
index 6f576ca..572c4ff 100644
Binary files a/assets/nf-logo.png and b/assets/nf-logo.png differ
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 39b30f2..72d7a1d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,11 +2,13 @@ trigger:
   branches:
     include: [main, develop, "release-*" ]
   paths:
-    exclude: [README.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
+    exclude: [README.md,  CHANGELOG.md, CODE_OF_CONDUCT.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
   tags:
     include: ["v*"]
 
 # PR always trigger build
+pr:
+  autoCancel: true
 
 # add nf-tools repo to resources (for Azure Pipelines templates)
 resources:
diff --git a/nanoFramework.WebServer.nuspec b/nanoFramework.WebServer.nuspec
index 34685c5..a3db9f6 100644
--- a/nanoFramework.WebServer.nuspec
+++ b/nanoFramework.WebServer.nuspec
@@ -2,28 +2,21 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>nanoFramework.WebServer</id>
-    <title>WebServer for nanoFramework</title>
+    <title>WebServer for .NET nanoFramework</title>
     <version>$version$</version>
     <authors>Laurent Ellerbach</authors>
-    <owners>nanoFramework project contributors,dotnetfoundation</owners>
-    <license type="file">LICENSE.md</license>
-    <projectUrl>https://github.com/nanoframework/nanoFramework.WebServer</projectUrl>
-    <icon>images\nf-logo.png</icon>
+    <owners>nanoframework,dotnetfoundation</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <developmentDependency>false</developmentDependency>
-    <description>
-      This is a simple multithread WebServer supporting simple controller and event based calls.
-
-Perfect for .NET nanoFramework REST API based project. Support all type of Http Methods.
-
-Perfect for simple embedded web pages, with Support of file on a storage (USB, SD Card, in Memory).
-
-Supports both HTTPS and HTTP.
-    </description>
+    <license type="file">LICENSE.md</license>
     <releaseNotes>
     </releaseNotes>
+    <readme>docs\README.md</readme>
+    <developmentDependency>false</developmentDependency>
+    <projectUrl>https://github.com/nanoframework/nanoFramework.WebServer</projectUrl>
+    <icon>images\nf-logo.png</icon>
     <repository type="git" url="https://github.com/nanoframework/nanoFramework.WebServer" commit="$commit$" />
     <copyright>Copyright (c) .NET Foundation and Contributors</copyright>
+    <description>This is a simple multithread WebServer supporting simple controller and event based calls.&#10;Perfect for .NET nanoFramework REST API based project. Support all type of Http Methods.&#10;Perfect for simple embedded web pages, with Support of file on a storage (USB, SD Card, in Memory).&#10;Supports both HTTPS and HTTP.</description>
     <tags>http https webserver net netmf nf nanoframework</tags>
     <dependencies>
       <dependency id="nanoFramework.CoreLibrary" version="1.10.5" />
@@ -39,7 +32,8 @@ Supports both HTTPS and HTTP.
   <files>
     <file src="nanoFramework.WebServer\bin\Release\nanoFramework.WebServer.*" target="lib" />
     <file src="assets\readme.txt" target="" />
-    <file src="assets\nf-logo.png" target="images\" />
+    <file src="README.md" target="docs\" />
+    <file src="assets\nf-logo.png" target="images" />
     <file src="LICENSE.md" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.WebServer/nanoFramework.WebServer.nfproj b/nanoFramework.WebServer/nanoFramework.WebServer.nfproj
index 4306449..5bf3bcc 100644
--- a/nanoFramework.WebServer/nanoFramework.WebServer.nfproj
+++ b/nanoFramework.WebServer/nanoFramework.WebServer.nfproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
+    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
   <PropertyGroup>