diff --git a/src/Api/Auth/Controllers/AccountsController.cs b/src/Api/Auth/Controllers/AccountsController.cs
index e9adc2fa6c..4d09629296 100644
--- a/src/Api/Auth/Controllers/AccountsController.cs
+++ b/src/Api/Auth/Controllers/AccountsController.cs
@@ -4,7 +4,7 @@ using Bit.Api.Auth.Models.Request;
 using Bit.Api.Auth.Models.Request.Accounts;
 using Bit.Api.Auth.Models.Request.WebAuthn;
 using Bit.Api.KeyManagement.Models.Response;
-using Bit.Api.KeyManagement.Queries;
+using Bit.Api.KeyManagement.Queries.Interfaces;
 using Bit.Api.KeyManagement.Validators;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
diff --git a/src/Api/Billing/Controllers/AccountsController.cs b/src/Api/Billing/Controllers/AccountsController.cs
index d3f0564588..c3f23b3b23 100644
--- a/src/Api/Billing/Controllers/AccountsController.cs
+++ b/src/Api/Billing/Controllers/AccountsController.cs
@@ -1,7 +1,7 @@
 #nullable enable
 
 using Bit.Api.KeyManagement.Models.Response;
-using Bit.Api.KeyManagement.Queries;
+using Bit.Api.KeyManagement.Queries.Interfaces;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
diff --git a/src/Api/KeyManagement/Controllers/UsersController.cs b/src/Api/KeyManagement/Controllers/UsersController.cs
index 9e4079f78a..8532521d69 100644
--- a/src/Api/KeyManagement/Controllers/UsersController.cs
+++ b/src/Api/KeyManagement/Controllers/UsersController.cs
@@ -1,5 +1,5 @@
 using Bit.Api.KeyManagement.Models.Response;
-using Bit.Api.KeyManagement.Queries;
+using Bit.Api.KeyManagement.Queries.Interfaces;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Api/KeyManagement/Registrations.cs b/src/Api/KeyManagement/Registrations.cs
index 358959e409..76bdad4584 100644
--- a/src/Api/KeyManagement/Registrations.cs
+++ b/src/Api/KeyManagement/Registrations.cs
@@ -1,4 +1,5 @@
-using Bit.Api.KeyManagement.Queries;
+using Bit.Api.KeyManagement.Queries.Interfaces;
+using Bit.Core.KeyManagement.Queries;
 
 namespace Bit.Api.KeyManagement;
 
diff --git a/src/Api/Vault/Controllers/SyncController.cs b/src/Api/Vault/Controllers/SyncController.cs
index 876fc0871c..33b600d703 100644
--- a/src/Api/Vault/Controllers/SyncController.cs
+++ b/src/Api/Vault/Controllers/SyncController.cs
@@ -1,5 +1,5 @@
 using Bit.Api.KeyManagement.Models.Response;
-using Bit.Api.KeyManagement.Queries;
+using Bit.Api.KeyManagement.Queries.Interfaces;
 using Bit.Api.Vault.Models.Response;
 using Bit.Core;
 using Bit.Core.AdminConsole.Entities;
diff --git a/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs b/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs
new file mode 100644
index 0000000000..d58154e6e6
--- /dev/null
+++ b/src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs
@@ -0,0 +1,11 @@
+#nullable enable
+
+using Bit.Core.Entities;
+using Bit.Core.KeyManagement.Models.Data;
+
+namespace Bit.Api.KeyManagement.Queries.Interfaces;
+
+public interface IUserAccountKeysQuery
+{
+    Task<UserAccountKeysData> Run(User user);
+}
diff --git a/src/Api/KeyManagement/Queries/UserAccountKeysQuery.cs b/src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
similarity index 82%
rename from src/Api/KeyManagement/Queries/UserAccountKeysQuery.cs
rename to src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
index 44ccdcdcf2..8c8eeed0d6 100644
--- a/src/Api/KeyManagement/Queries/UserAccountKeysQuery.cs
+++ b/src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
@@ -1,15 +1,12 @@
 #nullable enable
 
+using Bit.Api.KeyManagement.Queries.Interfaces;
 using Bit.Core.Entities;
 using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.KeyManagement.Repositories;
 
-namespace Bit.Api.KeyManagement.Queries;
+namespace Bit.Core.KeyManagement.Queries;
 
-public interface IUserAccountKeysQuery
-{
-    Task<UserAccountKeysData> Run(User user);
-}
 
 public class UserAccountKeysQuery(IUserSignatureKeyPairRepository signatureKeyPairRepository) : IUserAccountKeysQuery
 {