diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml
index 85adaf0e473..aebc7a6a805 100644
--- a/builds/checkin/dotnet.yaml
+++ b/builds/checkin/dotnet.yaml
@@ -32,7 +32,6 @@ jobs:
     pool:
       vmImage: "ubuntu-18.04"
     steps:
-      - template: ../templates/install-dotnet3.yaml
       - task: Bash@3
         displayName: Install Prerequisites
         inputs:
diff --git a/builds/ci/dotnet.yaml b/builds/ci/dotnet.yaml
index 6495177d1e3..59f6cc10375 100644
--- a/builds/ci/dotnet.yaml
+++ b/builds/ci/dotnet.yaml
@@ -30,7 +30,6 @@ jobs:
             IotDevice3ConnStr2,
             IotHubConnStr2,
             IotHubMqttHeadCert
-      - template: ../templates/install-dotnet3.yaml
       - task: Bash@3
         displayName: Install Prerequisites
         inputs:
diff --git a/builds/misc/images-release.yaml b/builds/misc/images-release.yaml
index 6c4d6eb29c4..e758ff653fa 100644
--- a/builds/misc/images-release.yaml
+++ b/builds/misc/images-release.yaml
@@ -12,15 +12,11 @@ stages:
     dependsOn: []
     jobs:
     - job: BuildDotnetComponents
-      # This job is run on a hosted linux agent, which needs dotnet 2 and 3 installed as a manual step. 
       # The code sign steps will fail unless we explicitly say to use dotnet 2 before.
       # This means we have to toggle back and forth between primary dotnet installations for the sign and build.
       # TODO: Investigate why we have to toggle primary installs on linux, when we didn't have to do this on windows (now removed).
       displayName: Build Dotnet Components
       steps: 
-        # Dotnet 2 needed for codesign
-        - template: ../templates/install-dotnet2.yaml
-        - template: ../templates/install-dotnet3.yaml
         - template: ../templates/dotnet3-globaljson.yaml # use dotnet 3 as primary install for build
         # Build
         - task: ShellScript@2
diff --git a/builds/templates/dotnet2-globaljson.yaml b/builds/templates/dotnet2-globaljson.yaml
index 834f56b6385..ac3bd9a90e0 100644
--- a/builds/templates/dotnet2-globaljson.yaml
+++ b/builds/templates/dotnet2-globaljson.yaml
@@ -4,4 +4,4 @@ steps:
     displayName: 'Use dotnet 2'
     inputs:
       targetType: 'inline'
-      script: 'dotnet new globaljson --force --sdk-version 2.2.207'
+      script: 'dotnet new globaljson --force --sdk-version 2.1'
diff --git a/builds/templates/dotnet3-globaljson.yaml b/builds/templates/dotnet3-globaljson.yaml
index 116eb0fa7ad..4e4c77a860c 100644
--- a/builds/templates/dotnet3-globaljson.yaml
+++ b/builds/templates/dotnet3-globaljson.yaml
@@ -4,4 +4,4 @@ steps:
     displayName: 'Use dotnet 3'
     inputs:
       targetType: 'inline'
-      script: 'dotnet new globaljson --force --sdk-version 3.1.202'
+      script: 'dotnet new globaljson --force --sdk-version 3.1'
diff --git a/builds/templates/install-dotnet2.yaml b/builds/templates/install-dotnet2.yaml
deleted file mode 100644
index f0a2e512695..00000000000
--- a/builds/templates/install-dotnet2.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-steps:
-  - task: UseDotNet@2
-    displayName: Install .NET Core sdk
-    inputs:
-      packageType: sdk
-      version: 2.2.207
\ No newline at end of file
diff --git a/builds/templates/install-dotnet3.yaml b/builds/templates/install-dotnet3.yaml
deleted file mode 100644
index 011424886f0..00000000000
--- a/builds/templates/install-dotnet3.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-steps:
-  - task: UseDotNet@2
-    displayName: Install .NET Core sdk
-    inputs:
-      packageType: sdk
-      version: 3.1.202
diff --git a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj
index 80bd376bda6..624ba7333b4 100644
--- a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj
+++ b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj
@@ -18,14 +18,20 @@
     <Title>Microsoft Azure Edge Function extension</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://github.com/Azure/iotedge/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>This package contains binding extensions for IoTEdge.</Description>
     <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
+    <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/Azure/iotedge</PackageProjectUrl>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>IoT Microsoft Azure IoTEdge Functions</PackageTags>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\..\..\..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="images\icon.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.36.3" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.27" />
diff --git a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/images/icon.png b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/images/icon.png
new file mode 100644
index 00000000000..1e58d764e3b
Binary files /dev/null and b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/images/icon.png differ