diff --git a/Directory.Build.props b/Directory.Build.props
index 7b696a1..754cdf2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.816.0</VersionPrefix>
+    <VersionPrefix>3.900.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
diff --git a/src/VirtoCommerce.PushMessages.ExperienceApi/Schemas/PushMessagesSchema.cs b/src/VirtoCommerce.PushMessages.ExperienceApi/Schemas/PushMessagesSchema.cs
index 8fe7179..8676446 100644
--- a/src/VirtoCommerce.PushMessages.ExperienceApi/Schemas/PushMessagesSchema.cs
+++ b/src/VirtoCommerce.PushMessages.ExperienceApi/Schemas/PushMessagesSchema.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using GraphQL;
 using GraphQL.Resolvers;
-using GraphQL.Subscription;
 using GraphQL.Types;
 using Microsoft.AspNetCore.Authorization;
 using VirtoCommerce.PushMessages.ExperienceApi.Authorization;
@@ -20,12 +19,12 @@ public class PushMessagesSchema(IPushMessageHub eventBroker, IAuthorizationServi
     {
         public void Build(ISchema schema)
         {
-            var messageAddedEventStreamFieldType = new EventStreamFieldType
+            var messageAddedEventStreamFieldType = new FieldType
             {
                 Name = "pushMessageCreated",
-                Type = GraphTypeExtenstionHelper.GetActualType<NonNullGraphType<PushMessageType>>(),
+                Type = GraphTypeExtensionHelper.GetActualType<NonNullGraphType<PushMessageType>>(),
                 Resolver = new FuncFieldResolver<ExpPushMessage>(ResolveMessage),
-                AsyncSubscriber = new AsyncEventStreamResolver<ExpPushMessage>(Subscribe)
+                StreamResolver = new SourceStreamResolver<ExpPushMessage>(Subscribe)
             };
             schema.Subscription.AddField(messageAddedEventStreamFieldType);
         }
@@ -35,7 +34,7 @@ private ExpPushMessage ResolveMessage(IResolveFieldContext context)
             return context.Source as ExpPushMessage;
         }
 
-        private async Task<IObservable<ExpPushMessage>> Subscribe(IResolveEventStreamContext context)
+        private async ValueTask<IObservable<ExpPushMessage>> Subscribe(IResolveFieldContext context)
         {
             var authorizationResult = await authorizationService.AuthorizeAsync(context.GetCurrentPrincipal(), null, new PushMessagesAuthorizationRequirement());
             if (!authorizationResult.Succeeded)
diff --git a/src/VirtoCommerce.PushMessages.ExperienceApi/VirtoCommerce.PushMessages.ExperienceApi.csproj b/src/VirtoCommerce.PushMessages.ExperienceApi/VirtoCommerce.PushMessages.ExperienceApi.csproj
index 500632f..6d55131 100644
--- a/src/VirtoCommerce.PushMessages.ExperienceApi/VirtoCommerce.PushMessages.ExperienceApi.csproj
+++ b/src/VirtoCommerce.PushMessages.ExperienceApi/VirtoCommerce.PushMessages.ExperienceApi.csproj
@@ -12,7 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.814.0" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.900.0" />
     <PackageReference Include="VirtoCommerce.Platform.Caching" Version="3.853.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/VirtoCommerce.PushMessages.Web/Module.cs b/src/VirtoCommerce.PushMessages.Web/Module.cs
index 18e8184..fc76c65 100644
--- a/src/VirtoCommerce.PushMessages.Web/Module.cs
+++ b/src/VirtoCommerce.PushMessages.Web/Module.cs
@@ -1,12 +1,11 @@
 using System;
-using GraphQL.Server;
-using MediatR;
+using GraphQL;
+using GraphQL.MicrosoftDI;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using VirtoCommerce.CustomerModule.Core.Events;
 using VirtoCommerce.Platform.Core.Events;
 using VirtoCommerce.Platform.Core.Modularity;
@@ -32,7 +31,6 @@
 using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.Xapi.Core.Extensions;
 using VirtoCommerce.Xapi.Core.Infrastructure;
-using VirtoCommerce.Xapi.Core.Models;
 
 namespace VirtoCommerce.PushMessages.Web;
 
@@ -83,12 +81,11 @@ public void Initialize(IServiceCollection serviceCollection)
         serviceCollection.AddSingleton<IPushMessageJobService, PushMessageJobService>();
 
         // GraphQL
-        var assemblyMarker = typeof(AssemblyMarker);
-        var graphQlBuilder = new CustomGraphQLBuilder(serviceCollection);
-        graphQlBuilder.AddGraphTypes(assemblyMarker);
-        serviceCollection.AddMediatR(assemblyMarker);
-        serviceCollection.AddAutoMapper(assemblyMarker);
-        serviceCollection.AddSchemaBuilders(assemblyMarker);
+        _ = new GraphQLBuilder(serviceCollection, builder =>
+        {
+            builder.AddSchema(serviceCollection, typeof(AssemblyMarker));
+        });
+
         serviceCollection.AddDistributedMessageService(Configuration);
         serviceCollection.AddSingleton<XapiPushMessageRecipientChangedEventHandler>();
         serviceCollection.AddSingleton<IAuthorizationHandler, PushMessagesAuthorizationHandler>();
@@ -99,8 +96,7 @@ public void PostInitialize(IApplicationBuilder appBuilder)
     {
         var serviceProvider = appBuilder.ApplicationServices;
 
-        var playgroundOptions = appBuilder.ApplicationServices.GetService<IOptions<GraphQLPlaygroundOptions>>();
-        appBuilder.UseSchemaGraphQL<ScopedSchemaFactory<AssemblyMarker>>(playgroundOptions?.Value?.Enable ?? true, "pushMessages");
+        appBuilder.UseScopedSchema<AssemblyMarker>("pushMessages");
 
         // Register settings
         var settingsRegistrar = serviceProvider.GetRequiredService<ISettingsRegistrar>();
diff --git a/src/VirtoCommerce.PushMessages.Web/module.manifest b/src/VirtoCommerce.PushMessages.Web/module.manifest
index 5db2437..1f81a26 100644
--- a/src/VirtoCommerce.PushMessages.Web/module.manifest
+++ b/src/VirtoCommerce.PushMessages.Web/module.manifest
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.PushMessages</id>
-  <version>3.816.0</version>
+  <version>3.900.0</version>
   <version-tag></version-tag>
 
   <platformVersion>3.853.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Customer" version="3.817.0" />
-    <dependency id="VirtoCommerce.Xapi" version="3.814.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.900.0" />
   </dependencies>
 
   <title>Push Messages</title>
@@ -37,7 +37,7 @@
   <moduleType>VirtoCommerce.PushMessages.Web.Module, VirtoCommerce.PushMessages.Web</moduleType>
 
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2024 VirtoCommerce. All rights reserved</copyright>
+  <copyright>Copyright © 2024–2025 VirtoCommerce. All rights reserved</copyright>
   <tags>extension module</tags>
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
 </module>