diff --git a/Pushy/Pushy/Program.cs b/Pushy/Pushy/Program.cs
index 4d7e4e6..8235c3d 100644
--- a/Pushy/Pushy/Program.cs
+++ b/Pushy/Pushy/Program.cs
@@ -1,6 +1,7 @@
 using Elastic.Extensions.Logging;
 using Elastic.Extensions.Logging.Options;
 using Elastic.Transport;
+using Microsoft.AspNetCore.DataProtection;
 using Pushy.Components;
 using StackExchange.Redis;
 using LinkGenerator = Pushy.LinkGenerator;
@@ -12,18 +13,27 @@ builder.UseOrleans(silo =>
     silo.UseLocalhostClustering();
     silo.UseRedisReminderService(conf =>
     {
-        conf.ConfigurationOptions = ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
+        ConfigurationOptions configurationOptions =
+            ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
+        configurationOptions.DefaultDatabase = 0;
+        conf.ConfigurationOptions = configurationOptions;
     });
     
     silo.AddRedisGrainStorageAsDefault(options =>
     {
-        options.ConfigurationOptions =
-            ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
+        ConfigurationOptions configurationOptions = ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
+        configurationOptions.DefaultDatabase = 1;
+        options.ConfigurationOptions = configurationOptions;
     });
 
     silo.AddActivityPropagation();
 });
 
+IConnectionMultiplexer multiplexer = ConnectionMultiplexer.Connect(builder.Configuration.GetConnectionString("Valkey")!);
+builder.Services.AddDataProtection()
+    .PersistKeysToStackExchangeRedis(multiplexer);
+
+
 var transport = new TransportConfiguration(new StaticNodePool([new Uri("https://elastic-node-1.home.local:9200")]))
     .Authentication(new ApiKey(builder.Configuration["Elasticsearch:ApiKey"]!))
     .ServerCertificateValidationCallback((o, certificate, arg3, arg4) => true);
diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj
index 17bba3d..bbdeeca 100644
--- a/Pushy/Pushy/Pushy.csproj
+++ b/Pushy/Pushy/Pushy.csproj
@@ -12,6 +12,7 @@
     <ItemGroup>
         <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.30.0" />
         <PackageReference Include="Elastic.Extensions.Logging" Version="8.12.2" />
+        <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
         <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="8.2.0" />
         <PackageReference Include="Microsoft.Orleans.Reminders.Redis" Version="8.2.0" />