diff --git a/src/Microsoft.OpenApi.OData.Reader.snk b/src/Microsoft.OpenApi.OData.Reader.snk
deleted file mode 100644
index 64bf73d..0000000
Binary files a/src/Microsoft.OpenApi.OData.Reader.snk and /dev/null differ
diff --git a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
index 41be8a6..78e3408 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
+++ b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
@@ -12,7 +12,8 @@
     <LangVersion Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">latest</LangVersion>
     <LangVersion Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">latest</LangVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.OData.Reader.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\tool\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>true</DelaySign>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.OpenApi.OData.Reader/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi.OData.Reader/Properties/AssemblyInfo.cs
index c5a35d7..44ffc61 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Properties/AssemblyInfo.cs
@@ -7,4 +7,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Microsoft.OpenApi.OData.Reader.Tests," +
-    "PublicKey=002400000480000094000000060200000024000052534131000400000100010015bc58aa0b350eca7b7b843cf98484bdc92d23f0a5d6e05f0154594704ddd00702d0cce75db773558ef42de4efa4b54557d5cbcd1a842c58e5a6d3639cec008517150a1ef4fd400b97c68a71e442441d74a82cda48aa86a358c7ab369e56257ba00ac930b2c15bc49507e9d81d6971b5de62c237ff12ea4646344142bfc474b0")]
+    "PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
index 4326a4b..e31c46f 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
@@ -5,7 +5,8 @@
     <RootNamespace>Microsoft.OpenApi.OData.Reader.Tests</RootNamespace>
     <TargetFramework>net46</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.OData.Reader.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\tool\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>true</DelaySign>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tool/35MSSharedLib1024.snk b/tool/35MSSharedLib1024.snk
new file mode 100644
index 0000000..695f1b3
Binary files /dev/null and b/tool/35MSSharedLib1024.snk differ