diff --git a/Client/Client.csproj b/Client/Client.csproj
index c6ead189..8d29ebe4 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -3,40 +3,29 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     
-    <Version>0.3.0</Version>
+    <Version>0.4.0</Version>
     <Authors>Christopher Zell</Authors>
     <Company />
     <Description>Client to communicate with a Zeebe broker.
 
 Uses GRPC as protocol for communication.
 For more information about the zeebe project please visit http://zeebe.io</Description>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/zeebe-io/zb-csharp-client</PackageProjectUrl>
-    <PackageTags>zeebe, zb, zb-csharp, zb-client</PackageTags>
-
-    <AssemblyVersion>0.0.1.0</AssemblyVersion>
-    <FileVersion>0.0.1.0</FileVersion>
-    <PackageReleaseNotes>Catch up with the Zeebe Java and Go clients.
+    <PackageTags>zeebe, zb, zb-csharp, zb-client, grpc</PackageTags>
 
-The Zeebe C# client supports now new features like:
-
-* deploy a workflow
-* create a workflow instance
-* cancel a workflow instance
-* update payload
-* update retries
-* resolve an incident
-* list workflows
-* get workflow resource
+    <AssemblyVersion>0.4.0</AssemblyVersion>
+    <FileVersion>0.4.0</FileVersion>
+    <PackageReleaseNotes>Migrate to .NET Standard 2.0
 
 This release is based on the zeebe 0.14.0 release (https://github.com/zeebe-io/zeebe).</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>zb-client</PackageId>
-    <Product>Zeebe C# client</Product>    
-
-
-
+    <Product>Zeebe C# client</Product>
+    <RepositoryUrl>https://github.com/zeebe-io/zb-csharp-client</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIconUrl>http://zeebe.io/img/zeebe-logo.svg</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Client/Client.nuspec b/Client/Client.nuspec
deleted file mode 100644
index 0c0b7594..00000000
--- a/Client/Client.nuspec
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>zb-client</id>
-    <version>0.3.0</version>
-    <title>Zeebe C# client</title>
-    <authors>Christopher Zell</authors>
-    <owners>Zelldon</owners>
-    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-    <projectUrl>https://github.com/zeebe-io/zb-csharp-client</projectUrl>
-    <iconUrl>http://zeebe.io/img/zeebe-logo.svg</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-
-    <description>
-        Represents an Zeebe C# client.
-
-	Uses GRPC as protocol to communicate with the Zeebe Broker.
-        For more information about the zeebe project please visit http://zeebe.io
-    </description>
-    <releaseNotes>
-	Catch up with the Zeebe Java and Go clients.
-
-        The Zeebe C# client supports now new features like:
-
-         * deploy a workflow
-         * create a workflow instance
-         * cancel a workflow instance
-         * update payload
-         * update retries
-         * resolve an incident
-         * list workflows
-         * get workflow resource
-
-	This release is based on the zeebe 0.14.0 release (https://github.com/zeebe-io/zeebe).
-    </releaseNotes>
-    <summary>Client to communicate with an zeebe broker.</summary>
-    <tags>zeebe, zb, zb-csharp, zb-client</tags>
-  </metadata>
-</package>
diff --git a/Zeebe.sln b/Zeebe.sln
index 40f0de29..5871660e 100644
--- a/Zeebe.sln
+++ b/Zeebe.sln
@@ -1,12 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.106
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{C0AC4BD3-E0E9-4F2E-96EA-D1BC0EDCFCC7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.UnitTests", "Client.UnitTests\Client.UnitTests.csproj", "{1FD8CCE3-CF60-4611-AFB7-E4254ACD8F9F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.UnitTests", "Client.UnitTests\Client.UnitTests.csproj", "{1FD8CCE3-CF60-4611-AFB7-E4254ACD8F9F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Examples", "Client.Examples\Client.Examples.csproj", "{06578991-00CD-4EF7-A12B-63E915A0CECC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.Examples", "Client.Examples\Client.Examples.csproj", "{06578991-00CD-4EF7-A12B-63E915A0CECC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,7 +40,6 @@ Global
 		{06578991-00CD-4EF7-A12B-63E915A0CECC}.Release|x64.ActiveCfg = Release|Any CPU
 		{06578991-00CD-4EF7-A12B-63E915A0CECC}.Release|x64.Build.0 = Release|Any CPU
 		{06578991-00CD-4EF7-A12B-63E915A0CECC}.Release|x86.ActiveCfg = Release|Any CPU
-		{06578991-00CD-4EF7-A12B-63E915A0CECC}.Release|x86.Build.0 = Release|Any CPU	
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE