diff --git a/NuGet.Config b/NuGet.Config
index c982f5720..6fd1189ec 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <add key="localfeed" value="libs" />
+	<add key="myget.org" value="https://dotnet.myget.org/F/orleans-ci/api/v3/index.json" protocolVersion="3" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/src/Squidex.Domain.Apps.Entities/AppProvider.cs b/src/Squidex.Domain.Apps.Entities/AppProvider.cs
index b0f8870a9..781184d7b 100644
--- a/src/Squidex.Domain.Apps.Entities/AppProvider.cs
+++ b/src/Squidex.Domain.Apps.Entities/AppProvider.cs
@@ -47,14 +47,14 @@ namespace Squidex.Domain.Apps.Entities
                         return (null, null);
                     }
 
-                    var schema = await grainFactory.GetGrain<ISchemaGrain>(id).GetStateAsync();
+                    var schema = await GetSchemaAsync(appId, id, false);
 
-                    if (!IsExisting(schema, false))
+                    if (schema == null)
                     {
                         return (null, null);
                     }
 
-                    return (app.Value, schema.Value);
+                    return (app.Value, schema);
                 }
             });
         }
diff --git a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
index 710bcc1e1..1912227c2 100644
--- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
+++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
@@ -14,8 +14,8 @@
     <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.3-ci.20180511.2" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.3-ci.20180511.2" />
     <PackageReference Include="NodaTime" Version="2.2.5" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
index 96dcbebf2..81c348fd3 100644
--- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
+++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
@@ -10,9 +10,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Orleans.Core" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="2.0.3-ci.20180511.2" />
+    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.3-ci.20180511.2" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.3-ci.20180511.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NodaTime" Version="2.2.5" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
diff --git a/src/Squidex/Config/Orleans/ClientWrapper.cs b/src/Squidex/Config/Orleans/ClientWrapper.cs
index d6e9c35e8..355534f05 100644
--- a/src/Squidex/Config/Orleans/ClientWrapper.cs
+++ b/src/Squidex/Config/Orleans/ClientWrapper.cs
@@ -31,6 +31,7 @@ namespace Squidex.Config.Orleans
                 .Configure<ClusterOptions>(options =>
                 {
                     options.ClusterId = "squidex";
+                    options.ServiceId = "squidex";
                 })
                 .ConfigureServices((context, services) =>
                 {
diff --git a/src/Squidex/Config/Orleans/SiloWrapper.cs b/src/Squidex/Config/Orleans/SiloWrapper.cs
index 2209b3643..85ad4f0b9 100644
--- a/src/Squidex/Config/Orleans/SiloWrapper.cs
+++ b/src/Squidex/Config/Orleans/SiloWrapper.cs
@@ -68,6 +68,7 @@ namespace Squidex.Config.Orleans
                     .Configure<ClusterOptions>(options =>
                     {
                         options.ClusterId = "squidex";
+                        options.ServiceId = "squidex";
                     })
                     .ConfigureLogging((hostingContext, builder) =>
                     {