diff --git a/src/Core/AdminConsole/Entities/Policy.cs b/src/Core/AdminConsole/Entities/Policy.cs
index 75d67c1021..daf0699145 100644
--- a/src/Core/AdminConsole/Entities/Policy.cs
+++ b/src/Core/AdminConsole/Entities/Policy.cs
@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.Entities;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.AdminConsole.Entities;
diff --git a/src/Core/AdminConsole/Models/Data/Organizations/Policies/IPolicyDataModel.cs b/src/Core/AdminConsole/Models/Data/Organizations/Policies/IPolicyDataModel.cs
index ef8789d483..9e666f5a10 100644
--- a/src/Core/AdminConsole/Models/Data/Organizations/Policies/IPolicyDataModel.cs
+++ b/src/Core/AdminConsole/Models/Data/Organizations/Policies/IPolicyDataModel.cs
@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Data.Organizations.Policies;
+namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
 public interface IPolicyDataModel
 {
diff --git a/src/Core/AdminConsole/Models/Data/Organizations/Policies/MasterPasswordPolicyData.cs b/src/Core/AdminConsole/Models/Data/Organizations/Policies/MasterPasswordPolicyData.cs
index 1ace6204df..f2f275b708 100644
--- a/src/Core/AdminConsole/Models/Data/Organizations/Policies/MasterPasswordPolicyData.cs
+++ b/src/Core/AdminConsole/Models/Data/Organizations/Policies/MasterPasswordPolicyData.cs
@@ -1,6 +1,4 @@
-using Bit.Core.Models.Data.Organizations.Policies;
-
-namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
 public class MasterPasswordPolicyData : IPolicyDataModel
 {
diff --git a/src/Core/AdminConsole/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs b/src/Core/AdminConsole/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs
index e3a921d87c..62c8473612 100644
--- a/src/Core/AdminConsole/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs
+++ b/src/Core/AdminConsole/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Data.Organizations.Policies;
 
 namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
diff --git a/src/Core/AdminConsole/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs b/src/Core/AdminConsole/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs
index 903d63176d..57a8544b40 100644
--- a/src/Core/AdminConsole/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs
+++ b/src/Core/AdminConsole/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Data.Organizations.Policies;
 
 namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Models/Policy.cs b/src/Infrastructure.EntityFramework/AdminConsole/Models/Policy.cs
index d5213f8827..ac06416a49 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Models/Policy.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Models/Policy.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
 
-namespace Bit.Infrastructure.EntityFramework.Models;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 
 public class Policy : Core.AdminConsole.Entities.Policy
 {
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/PolicyRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/PolicyRepository.cs
index ffcb7bdd19..3eb4ac934b 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/PolicyRepository.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/PolicyRepository.cs
@@ -1,8 +1,8 @@
 using AutoMapper;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
-using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/PolicyReadByUserIdQuery.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/PolicyReadByUserIdQuery.cs
index fc9e067999..d81e38426a 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/PolicyReadByUserIdQuery.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/PolicyReadByUserIdQuery.cs
@@ -1,5 +1,5 @@
 using Bit.Core.Enums;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
diff --git a/src/Infrastructure.EntityFramework/Models/Organization.cs b/src/Infrastructure.EntityFramework/Models/Organization.cs
index d7410cf4a7..b8d13e273e 100644
--- a/src/Infrastructure.EntityFramework/Models/Organization.cs
+++ b/src/Infrastructure.EntityFramework/Models/Organization.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Vault.Models;
 
diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
index f0275d5760..f89f9dd8fb 100644
--- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@@ -1,4 +1,5 @@
 using Bit.Core;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
 using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Converters;
diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs b/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
index b610f51da2..17c013d964 100644
--- a/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
+++ b/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
@@ -4,6 +4,7 @@ using AutoFixture.Kernel;
 using AutoMapper;
 using Bit.Core.Settings;
 using Bit.Infrastructure.EFIntegration.Test.Helpers;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
 using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Models;