diff --git a/Tapeti.Annotations/Tapeti.Annotations.csproj b/Tapeti.Annotations/Tapeti.Annotations.csproj
index 5c1ef0d..11c27dc 100644
--- a/Tapeti.Annotations/Tapeti.Annotations.csproj
+++ b/Tapeti.Annotations/Tapeti.Annotations.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Annotations for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.Annotations.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -10,4 +17,11 @@
     <NoWarn>1701;1702</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.Annotations.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Annotations/Tapeti.Annotations.nuspec b/Tapeti.Annotations/Tapeti.Annotations.nuspec
deleted file mode 100644
index 87e40c7..0000000
--- a/Tapeti.Annotations/Tapeti.Annotations.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Annotations</id>
-    <version>$version$</version>
-    <title>Tapeti Annotations</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Annotations.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Annotations for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti</tags>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Autofac/Tapeti.Autofac.csproj b/Tapeti.Autofac/Tapeti.Autofac.csproj
index 4aabb0c..a1d9d12 100644
--- a/Tapeti.Autofac/Tapeti.Autofac.csproj
+++ b/Tapeti.Autofac/Tapeti.Autofac.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Autofac integration package for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti autofac</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -14,4 +21,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.SimpleInjector.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Autofac/Tapeti.Autofac.nuspec b/Tapeti.Autofac/Tapeti.Autofac.nuspec
deleted file mode 100644
index d788f49..0000000
--- a/Tapeti.Autofac/Tapeti.Autofac.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Autofac</id>
-    <version>$version$</version>
-    <title>Tapeti Autofac</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Autofac integration package for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti autofac</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Autofac" version="4.9.4" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.CastleWindsor/Tapeti.CastleWindsor.csproj b/Tapeti.CastleWindsor/Tapeti.CastleWindsor.csproj
index 2c81fe5..cb294d3 100644
--- a/Tapeti.CastleWindsor/Tapeti.CastleWindsor.csproj
+++ b/Tapeti.CastleWindsor/Tapeti.CastleWindsor.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Castle.Windsor integration package for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti castle windsor</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -14,4 +21,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.SimpleInjector.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.CastleWindsor/Tapeti.CastleWindsor.nuspec b/Tapeti.CastleWindsor/Tapeti.CastleWindsor.nuspec
deleted file mode 100644
index ac652ed..0000000
--- a/Tapeti.CastleWindsor/Tapeti.CastleWindsor.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.CastleWindsor</id>
-    <version>$version$</version>
-    <title>Tapeti Castle Windsor</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Castle.Windsor integration package for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti castle windsor</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Castle.Windsor" version="5.0.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Cmd/Tapeti.Cmd.csproj b/Tapeti.Cmd/Tapeti.Cmd.csproj
index d224a94..9379bdb 100644
--- a/Tapeti.Cmd/Tapeti.Cmd.csproj
+++ b/Tapeti.Cmd/Tapeti.Cmd.csproj
@@ -5,7 +5,12 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <Version>2.0.0</Version>
     <Authors>Mark van Renswoude</Authors>
-    <Company>Mark van Renswoude</Company>
+    <Company />
+    <Description></Description>
+    <PackageTags>rabbitmq tapeti</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <Version>2.0.0</Version>
     <Product>Tapeti Command-line Utility</Product>
   </PropertyGroup>
 
diff --git a/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.csproj b/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.csproj
index 9fd102a..056fe45 100644
--- a/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.csproj
+++ b/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Additional DataAnnotations attributes. Not specific to Tapeti, but useful for annotating message classes.</Description>
+    <PackageTags>rabbitmq tapeti dataannotations</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.DataAnnotations.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -14,4 +21,11 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.DataAnnotations.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.nuspec b/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.nuspec
deleted file mode 100644
index d1e1aa1..0000000
--- a/Tapeti.DataAnnotations.Extensions/Tapeti.DataAnnotations.Extensions.nuspec
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.DataAnnotations.Extensions</id>
-    <version>$version$</version>
-    <title>Tapeti DataAnnotations Extensions</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.DataAnnotations.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Additional DataAnnotations attributes. Not specific to Tapeti, but useful for annotating message classes.</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti dataannotations</tags>
-    <dependencies>
-      <dependency id="System.ComponentModel.Annotations" version="4.5.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj
index d0cac34..9a86c4b 100644
--- a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj
+++ b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>DataAnnotations validation extension for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti dataannotations</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.DataAnnotations.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -18,4 +25,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.DataAnnotations.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec b/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec
deleted file mode 100644
index 02b18c4..0000000
--- a/Tapeti.DataAnnotations/Tapeti.DataAnnotations.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.DataAnnotations</id>
-    <version>$version$</version>
-    <title>Tapeti DataAnnotations</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.DataAnnotations.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>DataAnnotations validation extension for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti dataannotations</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="System.ComponentModel.Annotations" version="4.5.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj
index 64e5907..2cb02b9 100644
--- a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj
+++ b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>SQL backing repository for the Tapeti Flow package</Description>
+    <PackageTags>rabbitmq tapeti flow sql</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.Flow.SQL.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -27,4 +34,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.Flow.SQL.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
deleted file mode 100644
index 15b5488..0000000
--- a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Flow.SQL</id>
-    <version>$version$</version>
-    <title>Tapeti Flow SQL</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Flow.SQL.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>SQL backing repository for the Tapeti Flow package</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti sql</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Tapeti.Flow" version="[$version$]" />
-      <dependency id="System.Data.SqlClient" version="4.5.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Flow/Tapeti.Flow.csproj b/Tapeti.Flow/Tapeti.Flow.csproj
index d2939b4..40f2f79 100644
--- a/Tapeti.Flow/Tapeti.Flow.csproj
+++ b/Tapeti.Flow/Tapeti.Flow.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Menno van Lavieren, Mark van Renswoude</Authors>
+    <Company />
+    <Description></Description>
+    <PackageTags>rabbitmq tapeti flow</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.Flow.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -15,4 +22,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.Flow.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Flow/Tapeti.Flow.nuspec b/Tapeti.Flow/Tapeti.Flow.nuspec
deleted file mode 100644
index 87504d0..0000000
--- a/Tapeti.Flow/Tapeti.Flow.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Flow</id>
-    <version>$version$</version>
-    <title>Tapeti Flow</title>
-    <authors>Menno van Lavieren, Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Flow.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Flow extension for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti flow</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Tapeti.Annotations" version="[$version$]" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Ninject/Tapeti.Ninject.csproj b/Tapeti.Ninject/Tapeti.Ninject.csproj
index 914e276..c16b08e 100644
--- a/Tapeti.Ninject/Tapeti.Ninject.csproj
+++ b/Tapeti.Ninject/Tapeti.Ninject.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Ninject integration package for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti ninject</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -14,4 +21,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.SimpleInjector.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Ninject/Tapeti.Ninject.nuspec b/Tapeti.Ninject/Tapeti.Ninject.nuspec
deleted file mode 100644
index c0709e1..0000000
--- a/Tapeti.Ninject/Tapeti.Ninject.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Ninject</id>
-    <version>$version$</version>
-    <title>Tapeti Ninject</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Ninject integration package for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti ninject</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Ninject" version="3.3.4" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Serilog/Tapeti.Serilog.csproj b/Tapeti.Serilog/Tapeti.Serilog.csproj
index 61b62da..fd1f6f5 100644
--- a/Tapeti.Serilog/Tapeti.Serilog.csproj
+++ b/Tapeti.Serilog/Tapeti.Serilog.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Hans Mulder, Mark van Renswoude</Authors>
+    <Company />
+    <Description>Serilog integration package for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti serilog</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.Serilog.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -18,4 +25,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.Serilog.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Serilog/Tapeti.Serilog.nuspec b/Tapeti.Serilog/Tapeti.Serilog.nuspec
deleted file mode 100644
index 451ec08..0000000
--- a/Tapeti.Serilog/Tapeti.Serilog.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Serilog</id>
-    <version>$version$</version>
-    <title>Tapeti Serilog</title>
-    <authors>Hans Mulder</authors>
-    <owners>Hans Mulder</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Serilog.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Serilog integration package for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti serilog</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Serilog" version="2.7.1" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj
index e9fa456..c941ce7 100644
--- a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj
+++ b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.csproj
@@ -3,6 +3,14 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>SimpleInjector integration package for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti simpleinjector</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
+    <Version>2.0.0</Version>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -18,4 +26,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.SimpleInjector.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
deleted file mode 100644
index 7005734..0000000
--- a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.SimpleInjector</id>
-    <version>$version$</version>
-    <title>Tapeti SimpleInjector</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>SimpleInjector integration package for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti simpleinjector</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="SimpleInjector" version="4.3.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.Transient/Tapeti.Transient.csproj b/Tapeti.Transient/Tapeti.Transient.csproj
index 21f80d7..02df581 100644
--- a/Tapeti.Transient/Tapeti.Transient.csproj
+++ b/Tapeti.Transient/Tapeti.Transient.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Menno van Lavieren, Mark van Renswoude</Authors>
+    <Company />
+    <Description>Transient extension for Tapeti Flow</Description>
+    <PackageTags>rabbitmq tapeti flow transient</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.Flow.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -14,4 +21,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.Flow.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.Transient/Tapeti.Transient.nuspec b/Tapeti.Transient/Tapeti.Transient.nuspec
deleted file mode 100644
index 41e1fa2..0000000
--- a/Tapeti.Transient/Tapeti.Transient.nuspec
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.Transient</id>
-    <version>$version$</version>
-    <title>Tapeti Transient</title>
-    <authors>Menno van Lavieren, Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Flow.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Transient extension for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti transient</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti.UnityContainer/Tapeti.UnityContainer.csproj b/Tapeti.UnityContainer/Tapeti.UnityContainer.csproj
index fe9aab8..1e3e4a2 100644
--- a/Tapeti.UnityContainer/Tapeti.UnityContainer.csproj
+++ b/Tapeti.UnityContainer/Tapeti.UnityContainer.csproj
@@ -3,6 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Unity container integration package for Tapeti</Description>
+    <PackageTags>rabbitmq tapeti unity</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
     <Version>2.0.0</Version>
   </PropertyGroup>
 
@@ -14,4 +21,11 @@
     <ProjectReference Include="..\Tapeti\Tapeti.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.SimpleInjector.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti.UnityContainer/Tapeti.UnityContainer.nuspec b/Tapeti.UnityContainer/Tapeti.UnityContainer.nuspec
deleted file mode 100644
index 356278a..0000000
--- a/Tapeti.UnityContainer/Tapeti.UnityContainer.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti.UnityContainer</id>
-    <version>$version$</version>
-    <title>Tapeti UnityContainer</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Unity container integration package for Tapeti</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti unity</tags>
-    <dependencies>
-      <dependency id="Tapeti" version="[$version$]" />
-      <dependency id="Unity" version="5.11.1" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/Tapeti/Tapeti.csproj b/Tapeti/Tapeti.csproj
index a1cb606..f701e63 100644
--- a/Tapeti/Tapeti.csproj
+++ b/Tapeti/Tapeti.csproj
@@ -4,6 +4,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Version>2.0.0</Version>
+    <Authors>Mark van Renswoude</Authors>
+    <Company />
+    <Description>Controller-based framework for RabbitMQ microservice architectures</Description>
+    <PackageTags>rabbitmq tapeti</PackageTags>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
+    <PackageIcon>Tapeti.png</PackageIcon>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,4 +27,11 @@
     <ProjectReference Include="..\Tapeti.Annotations\Tapeti.Annotations.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\resources\icons\Tapeti.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/Tapeti/Tapeti.nuspec b/Tapeti/Tapeti.nuspec
deleted file mode 100644
index 565e854..0000000
--- a/Tapeti/Tapeti.nuspec
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Tapeti</id>
-    <version>$version$</version>
-    <title>Tapeti</title>
-    <authors>Mark van Renswoude</authors>
-    <owners>Mark van Renswoude</owners>
-    <license type="expression">Unlicense</license>
-    <projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Controller-based framework for RabbitMQ microservice architectures</description>
-    <copyright></copyright>
-    <tags>rabbitmq tapeti</tags>
-    <dependencies>
-      <dependency id="Tapeti.Annotations" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="12.0.2"/>
-      <dependency id="RabbitMQ.Client" version="5.0.1"/>
-      <dependency id="System.Configuration.ConfigurationManager" version="4.5.0"/>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\Release\**" target="lib" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index f9ccb36..99d5395 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 
 install:
@@ -11,45 +11,44 @@ before_build:
 
 after_build:
   # Tapeti
-  - cmd: ECHO nuget pack Tapeti\Tapeti.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: nuget pack Tapeti\Tapeti.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti\Tapeti.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti\bin\Release\Tapeti.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Annotations
-  - cmd: nuget pack Tapeti.Annotations\Tapeti.Annotations.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Annotations.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Annotations\Tapeti.Annotations.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Annotations\bin\Release\Tapeti.Annotations.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.DataAnnotations
-  - cmd: nuget pack Tapeti.DataAnnotations\Tapeti.DataAnnotations.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.DataAnnotations.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.DataAnnotations\bin\Release\Tapeti.DataAnnotations.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.DataAnnotations.Extensions
-  - cmd: nuget pack Tapeti.DataAnnotations.Extensions\Tapeti.DataAnnotations.Extensions.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.DataAnnotations.Extensions.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.DataAnnotations.Extensions\Tapeti.DataAnnotations.Extensions.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.DataAnnotations.Extensions\bin\Release\Tapeti.DataAnnotations.Extensions.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Flow
-  - cmd: nuget pack Tapeti.Flow\Tapeti.Flow.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Flow.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Flow\Tapeti.Flow.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Flow\bin\Release\Tapeti.Flow.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Flow.SQL
-  - cmd: nuget pack Tapeti.Flow.SQL\Tapeti.Flow.SQL.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Flow.SQL.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Flow.SQL\Tapeti.Flow.SQL.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Flow.SQL\bin\Release\Tapeti.Flow.SQL.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Transient
-  - cmd: nuget pack Tapeti.Transient\Tapeti.Transient.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Transient.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Transient\Tapeti.Transient.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Transient\bin\Release\Tapeti.Transient.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Serilog
-  - cmd: nuget pack Tapeti.Serilog\Tapeti.Serilog.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Serilog.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Serilog\Tapeti.Serilog.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Serilog\bin\Release\Tapeti.Serilog.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.SimpleInjector
-  - cmd: nuget pack Tapeti.SimpleInjector\Tapeti.SimpleInjector.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.SimpleInjector.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.SimpleInjector\bin\Release\Tapeti.SimpleInjector.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Autofac
-  - cmd: nuget pack Tapeti.Autofac\Tapeti.Autofac.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Autofac.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Autofac\Tapeti.Autofac.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Autofac\bin\Release\Tapeti.Autofac.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.CastleWindsor
-  - cmd: nuget pack Tapeti.CastleWindsor\Tapeti.CastleWindsor.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.CastleWindsor.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.CastleWindsor\Tapeti.CastleWindsor.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.CastleWindsor\bin\Release\Tapeti.CastleWindsor.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.Ninject
-  - cmd: nuget pack Tapeti.Ninject\Tapeti.Ninject.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.Ninject.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.Ninject\Tapeti.Ninject.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.Ninject\bin\Release\Tapeti.Ninject.%GitVersion_NuGetVersion%.nupkg"
   # Tapeti.UnityContainer
-  - cmd: nuget pack Tapeti.UnityContainer\Tapeti.UnityContainer.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "Tapeti.UnityContainer.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: dotnet pack Tapeti.UnityContainer\Tapeti.UnityContainer.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
+  - cmd: appveyor PushArtifact "Tapeti.UnityContainer\bin\Release\Tapeti.UnityContainer.%GitVersion_NuGetVersion%.nupkg"
 
 build:
   project: Tapeti.sln