From f349b4808cce5e5531d4d2101593aa4c1b554784 Mon Sep 17 00:00:00 2001
From: Andreas Isnes <andreas.isnes@gmail.com>
Date: Fri, 9 Aug 2024 14:36:51 +0200
Subject: [PATCH] update policy factory

---
 .../Enums/PolicyAccountType.cs                |  14 ++
 .../Repositories/Interfaces/IPolicyFactory.cs |  24 ++
 .../Interfaces/IPolicyRepository.cs           | 117 +++++----
 .../Interfaces/IMaskinportenSchemaService.cs  |  18 +-
 .../Interfaces/IPolicyAdministrationPoint.cs  |  12 +-
 .../Interfaces/IPolicyInformationPoint.cs     |   7 +-
 .../Services/MaskinportenSchemaService.cs     |  36 +--
 .../Services/PolicyAdministrationPoint.cs     |  91 +++----
 .../Services/PolicyInformationPoint.cs        |  10 +-
 .../Services/PolicyRetrievalPoint.cs          |  16 +-
 ...ersistenceDependencyInjectionExtensions.cs |  38 +--
 .../Policy/PolicyFactory.cs                   |  26 +-
 .../Policy/PolicyOptions.cs                   |  19 +-
 .../Policy/PolicyRepository.cs                | 104 ++++++++
 .../Policy/PolicyRepositoryV2.cs              | 170 -------------
 .../PolicyRepository.cs                       | 235 ------------------
 .../Configuration/ConsoleTraceService.cs      |  21 +-
 .../Controllers/DelegationsController.cs      |  17 +-
 .../MaskinportenSchemaController.cs           |  33 +--
 .../PolicyInformationPointController.cs       |   5 +-
 .../Controllers/RightsInternalController.cs   |  10 +-
 src/Altinn.AccessManagement/Program.cs        |   7 +-
 .../Altinn.AccessManagement.Tests.csproj      |   4 +
 .../Altinn2RightsControllerTest.cs            |  18 +-
 .../AuthorizedPartiesControllerTest.cs        |   2 +-
 .../Controllers/DelegationsControllerTest.cs  |   2 +-
 .../MaskinportenSchemaControllerTest.cs       |  30 +--
 .../PolicyInformationPointControllerTest.cs   |   8 +-
 ...rceOwnerAuthorizedPartiesControllerTest.cs |   2 +-
 .../RightsInternalControllerTest.cs           |   2 +-
 .../V2MaskinportenSchemaControllerTest.cs     |   2 +-
 .../Fixtures/PostgresFixture.cs               |   6 +-
 .../Fixtures/WebApplicationFixture.cs         |   2 +-
 .../Mocks/PolicyFactoryMock.cs                |  21 ++
 .../Mocks/PolicyRepositoryMock.cs             |  56 ++---
 .../PolicyAdministrationPointTest.cs          |  10 +-
 .../Resolvers/ResolverServiceCollection.cs    |   2 +-
 .../Utils/SetupUtils.cs                       |   2 +-
 38 files changed, 468 insertions(+), 731 deletions(-)
 create mode 100644 src/Altinn.AccessManagement.Core/Enums/PolicyAccountType.cs
 create mode 100644 src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyFactory.cs
 create mode 100644 src/Altinn.AccessManagement.Persistence/Policy/PolicyRepository.cs
 delete mode 100644 src/Altinn.AccessManagement.Persistence/Policy/PolicyRepositoryV2.cs
 delete mode 100644 src/Altinn.AccessManagement.Persistence/PolicyRepository.cs
 create mode 100644 test/Altinn.AccessManagement.Tests/Mocks/PolicyFactoryMock.cs

diff --git a/src/Altinn.AccessManagement.Core/Enums/PolicyAccountType.cs b/src/Altinn.AccessManagement.Core/Enums/PolicyAccountType.cs
new file mode 100644
index 000000000..aea0d673f
--- /dev/null
+++ b/src/Altinn.AccessManagement.Core/Enums/PolicyAccountType.cs
@@ -0,0 +1,14 @@
+namespace Altinn.AccessManagement.Core.Enums
+{
+    /// <summary>
+    /// Storage Account
+    /// </summary>
+    public enum PolicyAccountType
+    {
+        ResourceRegister,
+
+        Delegations,
+
+        Metadata,
+    }
+}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyFactory.cs b/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyFactory.cs
new file mode 100644
index 000000000..067428fcc
--- /dev/null
+++ b/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyFactory.cs
@@ -0,0 +1,24 @@
+using Altinn.AccessManagement.Core.Enums;
+
+namespace Altinn.AccessManagement.Core.Repositories.Interfaces;
+
+/// <summary>
+/// Create clients for interacting with files 
+/// </summary>
+public interface IPolicyFactory
+{
+    /// <summary>
+    /// Creates a client for interacting with storage
+    /// </summary>
+    /// <param name="account">which storage account to write blob</param>
+    /// <param name="filepath">path of the file</param>
+    /// <returns></returns>
+    IPolicyRepository Create(PolicyAccountType account, string filepath);
+
+    /// <summary>
+    /// Creates a client for interacting with storage. assuming storage accoutn based on filename.
+    /// </summary>
+    /// <param name="filepath">path of the file</param>
+    /// <returns></returns>
+    IPolicyRepository Create(string filepath);
+}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyRepository.cs b/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyRepository.cs
index baa6bdeae..adfa6a5a3 100644
--- a/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyRepository.cs
+++ b/src/Altinn.AccessManagement.Core/Repositories/Interfaces/IPolicyRepository.cs
@@ -1,72 +1,71 @@
 using Azure;
 using Azure.Storage.Blobs.Models;
 
-namespace Altinn.AccessManagement.Core.Repositories.Interfaces
+namespace Altinn.AccessManagement.Core.Repositories.Interfaces;
+
+/// <summary>
+/// Interface for operations on policy files.
+/// </summary>
+public interface IPolicyRepository
 {
     /// <summary>
-    /// Interface for operations on policy files.
+    /// Gets file stream for the policy file from blob storage, if it exists at the specified path.
     /// </summary>
-    public interface IPolicyRepository
-    {
-        /// <summary>
-        /// Gets file stream for the policy file from blob storage, if it exists at the specified path.
-        /// </summary>
-        /// <param name="filepath">The file path.</param>
-        /// <returns>File stream of the policy file</returns>
-        Task<Stream> GetPolicyAsync(string filepath);
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns>File stream of the policy file</returns>
+    Task<Stream> GetPolicyAsync(CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets file stream for the specified version of a policy file from blob storage, if it exists at the specified path.
-        /// </summary>
-        /// <param name="filepath">The file path.</param>
-        /// <param name="version">The blob storage version</param>
-        /// <returns>File stream of the policy file</returns>
-        Task<Stream> GetPolicyVersionAsync(string filepath, string version);
+    /// <summary>
+    /// Gets file stream for the specified version of a policy file from blob storage, if it exists at the specified path.
+    /// </summary>
+    /// <param name="version">The blob storage version</param>
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns>File stream of the policy file</returns>
+    Task<Stream> GetPolicyVersionAsync(string version, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Writes a file stream to blobstorage to the specified path.
-        /// </summary>
-        /// <param name="filepath">The file path.</param> 
-        /// <param name="fileStream">File stream of the policy file to be written</param>
-        /// <returns>Azure response BlobContentInfo</returns>
-        Task<Response<BlobContentInfo>> WritePolicyAsync(string filepath, Stream fileStream);
+    /// <summary>
+    /// Writes a file stream to blobstorage to the specified path.
+    /// </summary>
+    /// <param name="fileStream">File stream of the policy file to be written</param>
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns>Azure response BlobContentInfo</returns>
+    Task<Response<BlobContentInfo>> WritePolicyAsync(Stream fileStream = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Writes a file stream to blobstorage to the specified path, including the conditional check that the provided blob lease id is valid.
-        /// </summary>
-        /// <param name="filepath">The file path.</param> 
-        /// <param name="fileStream">File stream of the policy file to be written</param>
-        /// <param name="blobLeaseId">The blob lease id, required to be able to write after a lock</param>
-        /// <returns>Azure response BlobContentInfo</returns>
-        Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(string filepath, Stream fileStream, string blobLeaseId);
+    /// <summary>
+    /// Writes a file stream to blobstorage to the specified path, including the conditional check that the provided blob lease id is valid.
+    /// </summary>
+    /// <param name="fileStream">File stream of the policy file to be written</param>
+    /// <param name="blobLeaseId">The blob lease id, required to be able to write after a lock</param>
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns>Azure response BlobContentInfo</returns>
+    Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(Stream fileStream, string blobLeaseId, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes a specific version of a blob storage file if it exits on the specified path.
-        /// </summary>
-        /// <param name="filepath">The file path.</param>
-        /// <param name="version">The blob storage version</param>
-        /// <returns></returns>
-        Task<Response> DeletePolicyVersionAsync(string filepath, string version);
+    /// <summary>
+    /// Deletes a specific version of a blob storage file if it exits on the specified path.
+    /// </summary>
+    /// <param name="version">The blob storage version</param>
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns></returns>
+    Task<Response> DeletePolicyVersionAsync(string version, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Tries to acquire a blob lease on the base blob for the provided filepath.
-        /// </summary>
-        /// <param name="filepath">The file path of the base blob to aquire a blob lease on</param>
-        /// <returns>The LeaseId if a release was possible, otherwise null</returns>
-        Task<string> TryAcquireBlobLease(string filepath);
+    /// <summary>
+    /// Tries to acquire a blob lease on the base blob for the provided filepath.
+    /// </summary>
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns>The LeaseId if a release was possible, otherwise null</returns>
+    Task<string> TryAcquireBlobLease(CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Releases a blob lease on the base blob for the provided filepath using the provided leaseId.
-        /// </summary>
-        /// <param name="filepath">The file path of the base blob to release</param>
-        /// <param name="leaseId">The lease id from to release</param>
-        void ReleaseBlobLease(string filepath, string leaseId);
+    /// <summary>
+    /// Releases a blob lease on the base blob for the provided filepath using the provided leaseId.
+    /// </summary>
+    /// <param name="leaseId">The lease id from to release</param>
+    /// <param name="cancellationToken">cancellation token</param>
+    void ReleaseBlobLease(string leaseId, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Checks whether there exists a blob at the specified path
-        /// </summary>
-        /// <param name="filepath">The file path to check if a blob exists</param>
-        /// <returns>Bool whether the blob exists or not</returns>
-        Task<bool> PolicyExistsAsync(string filepath);
-    }
-}
+    /// <summary>
+    /// Checks whether there exists a blob at the specified path
+    /// </summary>
+    /// <param name="cancellationToken">cancellation token</param>
+    /// <returns>Bool whether the blob exists or not</returns>
+    Task<bool> PolicyExistsAsync(CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Core/Services/Interfaces/IMaskinportenSchemaService.cs b/src/Altinn.AccessManagement.Core/Services/Interfaces/IMaskinportenSchemaService.cs
index 905fefaa7..2ceed7f77 100644
--- a/src/Altinn.AccessManagement.Core/Services/Interfaces/IMaskinportenSchemaService.cs
+++ b/src/Altinn.AccessManagement.Core/Services/Interfaces/IMaskinportenSchemaService.cs
@@ -13,22 +13,25 @@ public interface IMaskinportenSchemaService
         /// <param name="authenticatedUserId">The user id of the authenticated user performing the delegation</param>
         /// <param name="authenticatedUserAuthlevel">The authentication level of the authenticated user performing the delegation</param>
         /// <param name="request">The model describing the right delegation check to perform</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>The result of the delegation status check</returns>
-        public Task<DelegationCheckResponse> DelegationCheck(int authenticatedUserId, int authenticatedUserAuthlevel, RightsDelegationCheckRequest request);
+        public Task<DelegationCheckResponse> DelegationCheck(int authenticatedUserId, int authenticatedUserAuthlevel, RightsDelegationCheckRequest request, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets all offered maskinporten schema delegations for a reportee
         /// </summary>
         /// <param name="party">reportee that delegated resources</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>list of delgations</returns>
-        public Task<List<Delegation>> GetOfferedMaskinportenSchemaDelegations(AttributeMatch party);
+        public Task<List<Delegation>> GetOfferedMaskinportenSchemaDelegations(AttributeMatch party, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets all received maskinporten schema delegations for a reportee
         /// </summary>
         /// <param name="party">reportee that delegated resources</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>list of delgations</returns>
-        public Task<List<Delegation>> GetReceivedMaskinportenSchemaDelegations(AttributeMatch party);
+        public Task<List<Delegation>> GetReceivedMaskinportenSchemaDelegations(AttributeMatch party, CancellationToken cancellationToken = default);
 
         /// <summary> 
         /// Gets all the delegations for an admin or owner
@@ -36,8 +39,9 @@ public interface IMaskinportenSchemaService
         /// <param name="supplierOrg">the organisation number of the supplier org</param>
         /// <param name="consumerOrg">the organisation number of the consumer of the resource</param>
         /// <param name="scope">the scope of the resource</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>list of delgations</returns>
-        public Task<List<Delegation>> GetMaskinportenDelegations(string supplierOrg, string consumerOrg, string scope);
+        public Task<List<Delegation>> GetMaskinportenDelegations(string supplierOrg, string consumerOrg, string scope, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Performs the delegation on behalf of the from party
@@ -45,15 +49,17 @@ public interface IMaskinportenSchemaService
         /// <param name="authenticatedUserId">The user id of the authenticated user performing the delegation</param>
         /// <param name="authenticatedUserAuthlevel">The authentication level of the authenticated user performing the delegation</param>
         /// <param name="delegation">The delegation</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>The result of the delegation</returns>
-        public Task<DelegationActionResult> DelegateMaskinportenSchema(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation);
+        public Task<DelegationActionResult> DelegateMaskinportenSchema(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Operation to revoke a maskinporten schema delegation
         /// </summary>
         /// <param name="authenticatedUserId">The user id of the authenticated user deleting the delegation</param>
         /// <param name="delegation">The delegation lookup model</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>The result of the deletion</returns>
-        public Task<DelegationActionResult> RevokeMaskinportenSchemaDelegation(int authenticatedUserId, DelegationLookup delegation);
+        public Task<DelegationActionResult> RevokeMaskinportenSchemaDelegation(int authenticatedUserId, DelegationLookup delegation, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyAdministrationPoint.cs b/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyAdministrationPoint.cs
index ed4fa1e12..3fc8010de 100644
--- a/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyAdministrationPoint.cs
+++ b/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyAdministrationPoint.cs
@@ -13,28 +13,32 @@ public interface IPolicyAdministrationPoint
         /// <param name="org">Unique identifier of the organisation responsible for the app.</param>
         /// <param name="app">Application identifier which is unique within an organisation.</param>
         /// <param name="fileStream">A stream containing the content of the policy file</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns></returns>
-        Task<bool> WritePolicyAsync(string org, string app, Stream fileStream);
+        Task<bool> WritePolicyAsync(string org, string app, Stream fileStream, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Trys to sort and store the set of rules as delegation policy files in blob storage.
         /// </summary>
         /// <param name="rules">The set of rules to be delegated</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>The list of rules with created Id and result status</returns>
-        Task<List<Rule>> TryWriteDelegationPolicyRules(List<Rule> rules);
+        Task<List<Rule>> TryWriteDelegationPolicyRules(List<Rule> rules, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Trys to sort and delete the set of rules matching the list of ruleMatches to delete from delegation policy files in blob storage.
         /// </summary>
         /// <param name="rulesToDelete">Entity to define which rules to be deleted</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>The list of rules with created Id and result status</returns>
-        Task<List<Rule>> TryDeleteDelegationPolicyRules(List<RequestToDelete> rulesToDelete);
+        Task<List<Rule>> TryDeleteDelegationPolicyRules(List<RequestToDelete> rulesToDelete, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Deletes a List of policies based on input list of matches to remove
         /// </summary>
         /// <param name="policiesToDelete">entity containing match for all the policies to delete</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>A list containing all the policies that is deleted</returns>
-        Task<List<Rule>> TryDeleteDelegationPolicies(List<RequestToDelete> policiesToDelete);
+        Task<List<Rule>> TryDeleteDelegationPolicies(List<RequestToDelete> policiesToDelete, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyInformationPoint.cs b/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyInformationPoint.cs
index e8ca3b3b4..7851b8bad 100644
--- a/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyInformationPoint.cs
+++ b/src/Altinn.AccessManagement.Core/Services/Interfaces/IPolicyInformationPoint.cs
@@ -14,8 +14,9 @@ public interface IPolicyInformationPoint
         /// <param name="offeredByPartyIds">the list of offeredby party ids</param>
         /// <param name="coveredByPartyIds">the list of coveredby party ids</param>
         /// <param name="coveredByUserIds">the list of coveredby user ids</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>a list of rules that match the lists of org/apps, offeredby ids, and coveredby ids</returns>
-        Task<List<Rule>> GetRulesAsync(List<string> resourceIds, List<int> offeredByPartyIds, List<int> coveredByPartyIds, List<int> coveredByUserIds);
+        Task<List<Rule>> GetRulesAsync(List<string> resourceIds, List<int> offeredByPartyIds, List<int> coveredByPartyIds, List<int> coveredByUserIds, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the all rights a user have for a given reportee and resource
@@ -41,7 +42,7 @@ public interface IPolicyInformationPoint
         /// <param name="partyId">Party id of a user or organization</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/></param>
         /// <returns></returns>
-        Task<IEnumerable<DelegationChange>> GetReceivedDelegationFromRepository(int partyId, CancellationToken cancellationToken);
+        Task<IEnumerable<DelegationChange>> GetReceivedDelegationFromRepository(int partyId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Finds all active offered delegations (not including maskinporten schema) from db, both directly delegated from the party or from it's main unit if the party is a subunit
@@ -49,6 +50,6 @@ public interface IPolicyInformationPoint
         /// <param name="partyId">Party id of a user or organization</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/></param>
         /// <returns></returns>
-        Task<IEnumerable<DelegationChange>> GetOfferedDelegationsFromRepository(int partyId, CancellationToken cancellationToken);
+        Task<IEnumerable<DelegationChange>> GetOfferedDelegationsFromRepository(int partyId, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/Altinn.AccessManagement.Core/Services/MaskinportenSchemaService.cs b/src/Altinn.AccessManagement.Core/Services/MaskinportenSchemaService.cs
index d27b46e0c..b20f1b2bc 100644
--- a/src/Altinn.AccessManagement.Core/Services/MaskinportenSchemaService.cs
+++ b/src/Altinn.AccessManagement.Core/Services/MaskinportenSchemaService.cs
@@ -44,7 +44,7 @@ public MaskinportenSchemaService(ILogger<IMaskinportenSchemaService> logger, IDe
         }
 
         /// <inheritdoc/>
-        public async Task<DelegationCheckResponse> DelegationCheck(int authenticatedUserId, int authenticatedUserAuthlevel, RightsDelegationCheckRequest request)
+        public async Task<DelegationCheckResponse> DelegationCheck(int authenticatedUserId, int authenticatedUserAuthlevel, RightsDelegationCheckRequest request, CancellationToken cancellationToken = default)
         {
             (DelegationCheckResponse result, ServiceResource resource, Party fromParty) = await ValidateDelegationCheckRequest(request);
             if (!result.IsValid)
@@ -56,7 +56,7 @@ public async Task<DelegationCheckResponse> DelegationCheck(int authenticatedUser
 
             // Get all delegable rights
             RightsQuery rightsQuery = RightsHelper.GetRightsQuery(authenticatedUserId, fromParty.PartyId, resourceRegistryId);
-            List<Right> allDelegableRights = await _pip.GetRights(rightsQuery, getDelegableRights: true, returnAllPolicyRights: true);
+            List<Right> allDelegableRights = await _pip.GetRights(rightsQuery, getDelegableRights: true, returnAllPolicyRights: true, cancellationToken: cancellationToken);
             if (allDelegableRights == null || allDelegableRights.Count == 0)
             {
                 result.Errors.Add("right[0].Resource", $"No delegable rights could be found for the resource: {resource}");
@@ -106,7 +106,7 @@ public async Task<DelegationCheckResponse> DelegationCheck(int authenticatedUser
         }
 
         /// <inheritdoc/>
-        public async Task<DelegationActionResult> DelegateMaskinportenSchema(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation)
+        public async Task<DelegationActionResult> DelegateMaskinportenSchema(int authenticatedUserId, int authenticatedUserAuthlevel, DelegationLookup delegation, CancellationToken cancellationToken = default)
         {
             (DelegationActionResult result, string resourceRegistryId, Party fromParty, Party toParty) = await ValidateMaskinportenDelegationModel(DelegationActionType.Delegation, delegation);
             if (!result.IsValid)
@@ -116,14 +116,14 @@ public async Task<DelegationActionResult> DelegateMaskinportenSchema(int authent
 
             // Verify authenticated users delegable rights
             RightsQuery rightsQuery = RightsHelper.GetRightsQuery(authenticatedUserId, fromParty.PartyId, resourceRegistryId);
-            List<Right> usersDelegableRights = await _pip.GetRights(rightsQuery, getDelegableRights: true);
+            List<Right> usersDelegableRights = await _pip.GetRights(rightsQuery, getDelegableRights: true, cancellationToken: cancellationToken);
             if (usersDelegableRights == null || usersDelegableRights.Count == 0)
             {
                 result.Errors.Add("right[0].Resource", $"Authenticated user does not have any delegable rights for the resource: {resourceRegistryId}");
                 return result;
             }
 
-            if (usersDelegableRights.Any(r => r.RightSources.Any(rs => rs.MinimumAuthenticationLevel > authenticatedUserAuthlevel))) 
+            if (usersDelegableRights.Any(r => r.RightSources.Any(rs => rs.MinimumAuthenticationLevel > authenticatedUserAuthlevel)))
             {
                 result.Errors.Add("right[0].Resource", $"Authenticated user does not meet the required security level requirement for resource: {resourceRegistryId}");
                 return result;
@@ -143,7 +143,7 @@ public async Task<DelegationActionResult> DelegateMaskinportenSchema(int authent
                 });
             }
 
-            List<Rule> delegationResult = await _pap.TryWriteDelegationPolicyRules(rulesToDelegate);
+            List<Rule> delegationResult = await _pap.TryWriteDelegationPolicyRules(rulesToDelegate, cancellationToken);
 
             // Map response
             if (delegationResult.All(r => r.CreatedSuccessfully))
@@ -164,7 +164,7 @@ public async Task<DelegationActionResult> DelegateMaskinportenSchema(int authent
         }
 
         /// <inheritdoc/>
-        public async Task<List<Delegation>> GetOfferedMaskinportenSchemaDelegations(AttributeMatch party)
+        public async Task<List<Delegation>> GetOfferedMaskinportenSchemaDelegations(AttributeMatch party, CancellationToken cancellationToken = default)
         {
             if (party.Id == AltinnXacmlConstants.MatchAttributeIdentifiers.SocialSecurityNumberAttribute)
             {
@@ -174,7 +174,7 @@ public async Task<List<Delegation>> GetOfferedMaskinportenSchemaDelegations(Attr
             int offeredByPartyId = 0;
             if (party.Id == AltinnXacmlConstants.MatchAttributeIdentifiers.OrganizationNumberAttribute)
             {
-                Party offeredByParty = await _contextRetrievalService.GetPartyForOrganization(party.Value);
+                Party offeredByParty = await _contextRetrievalService.GetPartyForOrganization(party.Value, cancellationToken);
                 offeredByPartyId = offeredByParty.PartyId;
             }
             else if (party.Id == AltinnXacmlConstants.MatchAttributeIdentifiers.PartyAttribute && (!int.TryParse(party.Value, out offeredByPartyId) || offeredByPartyId == 0))
@@ -186,7 +186,7 @@ public async Task<List<Delegation>> GetOfferedMaskinportenSchemaDelegations(Attr
         }
 
         /// <inheritdoc/>
-        public async Task<List<Delegation>> GetReceivedMaskinportenSchemaDelegations(AttributeMatch party)
+        public async Task<List<Delegation>> GetReceivedMaskinportenSchemaDelegations(AttributeMatch party, CancellationToken cancellationToken = default)
         {
             if (party.Id == AltinnXacmlConstants.MatchAttributeIdentifiers.SocialSecurityNumberAttribute)
             {
@@ -196,7 +196,7 @@ public async Task<List<Delegation>> GetReceivedMaskinportenSchemaDelegations(Att
             int coveredByPartyId = 0;
             if (party.Id == AltinnXacmlConstants.MatchAttributeIdentifiers.OrganizationNumberAttribute)
             {
-                Party coveredByParty = await _contextRetrievalService.GetPartyForOrganization(party.Value);
+                Party coveredByParty = await _contextRetrievalService.GetPartyForOrganization(party.Value, cancellationToken);
                 coveredByPartyId = coveredByParty.PartyId;
             }
             else if (party.Id == AltinnXacmlConstants.MatchAttributeIdentifiers.PartyAttribute && (!int.TryParse(party.Value, out coveredByPartyId) || coveredByPartyId == 0))
@@ -208,12 +208,12 @@ public async Task<List<Delegation>> GetReceivedMaskinportenSchemaDelegations(Att
         }
 
         /// <inheritdoc/>
-        public async Task<List<Delegation>> GetMaskinportenDelegations(string supplierOrg, string consumerOrg, string scope)
+        public async Task<List<Delegation>> GetMaskinportenDelegations(string supplierOrg, string consumerOrg, string scope, CancellationToken cancellationToken = default)
         {
             int consumerPartyId = 0;
             if (!string.IsNullOrEmpty(consumerOrg))
             {
-                Party consumerParty = await _contextRetrievalService.GetPartyForOrganization(consumerOrg);
+                Party consumerParty = await _contextRetrievalService.GetPartyForOrganization(consumerOrg, cancellationToken);
                 if (consumerParty == null)
                 {
                     throw new ArgumentException($"The specified consumerOrg: {consumerOrg}, is not a valid organization number", nameof(consumerOrg));
@@ -225,14 +225,14 @@ public async Task<List<Delegation>> GetMaskinportenDelegations(string supplierOr
             int supplierPartyId = 0;
             if (!string.IsNullOrEmpty(supplierOrg))
             {
-                Party supplierParty = await _contextRetrievalService.GetPartyForOrganization(supplierOrg);
+                Party supplierParty = await _contextRetrievalService.GetPartyForOrganization(supplierOrg, cancellationToken);
                 if (supplierParty == null)
                 {
                     throw new ArgumentException($"The specified supplierOrg: {supplierOrg}, is not a valid organization number", nameof(supplierOrg));
                 }
 
                 supplierPartyId = supplierParty.PartyId;
-            }            
+            }
 
             if (!RegexUtil.IsValidMaskinportenScope(scope))
             {
@@ -243,7 +243,7 @@ public async Task<List<Delegation>> GetMaskinportenDelegations(string supplierOr
         }
 
         /// <inheritdoc/>
-        public async Task<DelegationActionResult> RevokeMaskinportenSchemaDelegation(int authenticatedUserId, DelegationLookup delegation)
+        public async Task<DelegationActionResult> RevokeMaskinportenSchemaDelegation(int authenticatedUserId, DelegationLookup delegation, CancellationToken cancellationToken = default)
         {
             (DelegationActionResult result, string resourceRegistryId, Party fromParty, Party toParty) = await ValidateMaskinportenDelegationModel(DelegationActionType.Revoke, delegation);
             if (!result.IsValid)
@@ -253,7 +253,7 @@ public async Task<DelegationActionResult> RevokeMaskinportenSchemaDelegation(int
 
             List<RequestToDelete> policiesToDelete = DelegationHelper.GetRequestToDeleteResourceRegistryService(authenticatedUserId, resourceRegistryId, fromParty.PartyId, toParty.PartyId);
 
-            await _pap.TryDeleteDelegationPolicies(policiesToDelete);
+            await _pap.TryDeleteDelegationPolicies(policiesToDelete, cancellationToken);
             return result;
         }
 
@@ -368,7 +368,7 @@ private async Task<List<Delegation>> GetReceivedDelegations(int coveredByPartyId
             return await BuildDelegationsResponse(delegationChanges);
         }
 
-        private async Task<List<Delegation>> GetAllMaskinportenSchemaDelegations(int supplierPartyId, int consumerPartyId, string scopes)
+        private async Task<List<Delegation>> GetAllMaskinportenSchemaDelegations(int supplierPartyId, int consumerPartyId, string scopes, CancellationToken cancellationToken = default)
         {
             List<Delegation> delegations = new List<Delegation>();
 
@@ -378,7 +378,7 @@ private async Task<List<Delegation>> GetAllMaskinportenSchemaDelegations(int sup
                 return delegations;
             }
 
-            List<DelegationChange> delegationChanges = await _delegationRepository.GetResourceRegistryDelegationChanges(resources.Select(d => d.Identifier).ToList(), consumerPartyId, supplierPartyId, ResourceType.MaskinportenSchema);
+            List<DelegationChange> delegationChanges = await _delegationRepository.GetResourceRegistryDelegationChanges(resources.Select(d => d.Identifier).ToList(), consumerPartyId, supplierPartyId, ResourceType.MaskinportenSchema, cancellationToken);
             if (delegationChanges.Count == 0)
             {
                 return delegations;
diff --git a/src/Altinn.AccessManagement.Core/Services/PolicyAdministrationPoint.cs b/src/Altinn.AccessManagement.Core/Services/PolicyAdministrationPoint.cs
index 62e9b9147..e6a6f48af 100644
--- a/src/Altinn.AccessManagement.Core/Services/PolicyAdministrationPoint.cs
+++ b/src/Altinn.AccessManagement.Core/Services/PolicyAdministrationPoint.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Text.Json;
-using Altinn.AccessManagement.Core.Clients.Interfaces;
 using Altinn.AccessManagement.Core.Enums;
 using Altinn.AccessManagement.Core.Helpers;
 using Altinn.AccessManagement.Core.Models;
@@ -21,7 +20,7 @@ public class PolicyAdministrationPoint : IPolicyAdministrationPoint
     {
         private readonly ILogger<IPolicyAdministrationPoint> _logger;
         private readonly IPolicyRetrievalPoint _prp;
-        private readonly IPolicyRepository _policyRepository;
+        private readonly IPolicyFactory _policyFactory;
         private readonly IDelegationMetadataRepository _delegationRepository;
         private readonly IDelegationChangeEventQueue _eventQueue;
         private readonly int delegationChangeEventQueueErrorId = 911;
@@ -30,21 +29,21 @@ public class PolicyAdministrationPoint : IPolicyAdministrationPoint
         /// Initializes a new instance of the <see cref="PolicyAdministrationPoint"/> class.
         /// </summary>
         /// <param name="policyRetrievalPoint">The policy retrieval point.</param>
-        /// <param name="policyRepository">The policy repository (blob storage).</param>
+        /// <param name="policyFactory">The policy repository (blob storage).</param>
         /// <param name="delegationRepository">The delegation change repository (postgresql).</param>
         /// <param name="eventQueue">The delegation change event queue service to post events for any delegation change.</param>
         /// <param name="logger">Logger instance.</param>
-        public PolicyAdministrationPoint(IPolicyRetrievalPoint policyRetrievalPoint, IPolicyRepository policyRepository, IDelegationMetadataRepository delegationRepository, IDelegationChangeEventQueue eventQueue, ILogger<IPolicyAdministrationPoint> logger)
+        public PolicyAdministrationPoint(IPolicyRetrievalPoint policyRetrievalPoint, IPolicyFactory policyFactory, IDelegationMetadataRepository delegationRepository, IDelegationChangeEventQueue eventQueue, ILogger<IPolicyAdministrationPoint> logger)
         {
             _prp = policyRetrievalPoint;
-            _policyRepository = policyRepository;
+            _policyFactory = policyFactory;
             _delegationRepository = delegationRepository;
             _eventQueue = eventQueue;
             _logger = logger;
         }
 
         /// <inheritdoc/>
-        public async Task<bool> WritePolicyAsync(string org, string app, Stream fileStream)
+        public async Task<bool> WritePolicyAsync(string org, string app, Stream fileStream, CancellationToken cancellationToken = default)
         {
             if (fileStream == null)
             {
@@ -52,13 +51,13 @@ public async Task<bool> WritePolicyAsync(string org, string app, Stream fileStre
             }
 
             string filePath = PolicyHelper.GetAltinnAppsPolicyPath(org, app);
-            Response<BlobContentInfo> response = await _policyRepository.WritePolicyAsync(filePath, fileStream);
+            Response<BlobContentInfo> response = await _policyFactory.Create(filePath).WritePolicyAsync(fileStream, cancellationToken: cancellationToken);
 
             return response?.GetRawResponse()?.Status == (int)HttpStatusCode.Created;
         }
 
         /// <inheritdoc/>
-        public async Task<List<Rule>> TryWriteDelegationPolicyRules(List<Rule> rules)
+        public async Task<List<Rule>> TryWriteDelegationPolicyRules(List<Rule> rules, CancellationToken cancellationToken = default)
         {
             List<Rule> result = new List<Rule>();
             Dictionary<string, List<Rule>> delegationDict = DelegationHelper.SortRulesByDelegationPolicyPath(rules, out List<Rule> unsortables);
@@ -69,7 +68,7 @@ public async Task<List<Rule>> TryWriteDelegationPolicyRules(List<Rule> rules)
 
                 try
                 {
-                    writePolicySuccess = await WriteDelegationPolicyInternal(delegationPolicypath, delegationDict[delegationPolicypath]);
+                    writePolicySuccess = await WriteDelegationPolicyInternal(delegationPolicypath, delegationDict[delegationPolicypath], cancellationToken);
                 }
                 catch (Exception ex)
                 {
@@ -103,13 +102,13 @@ public async Task<List<Rule>> TryWriteDelegationPolicyRules(List<Rule> rules)
         }
 
         /// <inheritdoc/>
-        public async Task<List<Rule>> TryDeleteDelegationPolicyRules(List<RequestToDelete> rulesToDelete)
+        public async Task<List<Rule>> TryDeleteDelegationPolicyRules(List<RequestToDelete> rulesToDelete, CancellationToken cancellationToken = default)
         {
             List<Rule> result = new List<Rule>();
 
             foreach (RequestToDelete deleteRequest in rulesToDelete)
             {
-                List<Rule> currentRules = await DeleteRulesInPolicy(deleteRequest);
+                List<Rule> currentRules = await DeleteRulesInPolicy(deleteRequest, cancellationToken);
                 if (currentRules != null)
                 {
                     result.AddRange(currentRules);
@@ -120,13 +119,13 @@ public async Task<List<Rule>> TryDeleteDelegationPolicyRules(List<RequestToDelet
         }
 
         /// <inheritdoc/>
-        public async Task<List<Rule>> TryDeleteDelegationPolicies(List<RequestToDelete> policiesToDelete)
+        public async Task<List<Rule>> TryDeleteDelegationPolicies(List<RequestToDelete> policiesToDelete, CancellationToken cancellationToken = default)
         {
             List<Rule> result = new List<Rule>();
 
             foreach (RequestToDelete policyToDelete in policiesToDelete)
             {
-                List<Rule> currentRules = await DeleteAllRulesInPolicy(policyToDelete);
+                List<Rule> currentRules = await DeleteAllRulesInPolicy(policyToDelete, cancellationToken);
                 if (currentRules != null)
                 {
                     result.AddRange(currentRules);
@@ -136,7 +135,7 @@ public async Task<List<Rule>> TryDeleteDelegationPolicies(List<RequestToDelete>
             return result;
         }
 
-        private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<Rule> rules)
+        private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<Rule> rules, CancellationToken cancellationToken = default)
         {
             if (!DelegationHelper.TryGetDelegationParamsFromRule(rules[0], out ResourceAttributeMatchType resourceMatchType, out string resourceId, out string org, out string app, out int offeredByPartyId, out Guid? fromUuid, out UuidType fromUuidType, out Guid? toUuid, out UuidType toUuidType, out int? coveredByPartyId, out int? coveredByUserId, out int? delegatedByUserId, out int? delegatedByPartyId, out DateTime delegatedDateTime)
                 || resourceMatchType == ResourceAttributeMatchType.None)
@@ -147,7 +146,7 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
 
             if (resourceMatchType == ResourceAttributeMatchType.ResourceRegistry)
             {
-                XacmlPolicy resourcePolicy = await _prp.GetPolicyAsync(resourceId);
+                XacmlPolicy resourcePolicy = await _prp.GetPolicyAsync(resourceId, cancellationToken);
                 if (resourcePolicy == null)
                 {
                     _logger.LogWarning("No valid resource policy found for delegation policy path: {policyPath}", policyPath);
@@ -165,7 +164,7 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
             }
             else if (resourceMatchType == ResourceAttributeMatchType.AltinnAppId)
             {
-                XacmlPolicy appPolicy = await _prp.GetPolicyAsync(org, app);
+                XacmlPolicy appPolicy = await _prp.GetPolicyAsync(org, app, cancellationToken);
                 if (appPolicy == null)
                 {
                     _logger.LogWarning("No valid App policy found for delegation policy path: {policyPath}", policyPath);
@@ -182,24 +181,25 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
                 }
             }
 
-            if (!await _policyRepository.PolicyExistsAsync(policyPath))
+            var policyClient = _policyFactory.Create(policyPath);
+            if (!await policyClient.PolicyExistsAsync(cancellationToken))
             {
                 // Create a new empty blob for lease locking
-                await _policyRepository.WritePolicyAsync(policyPath, new MemoryStream());
+                await policyClient.WritePolicyAsync(cancellationToken: cancellationToken);
             }
 
-            string leaseId = await _policyRepository.TryAcquireBlobLease(policyPath);
+            string leaseId = await policyClient.TryAcquireBlobLease(cancellationToken);
             if (leaseId != null)
             {
                 try
                 {
                     // Check for a current delegation change from postgresql
-                    DelegationChange currentChange = await _delegationRepository.GetCurrentDelegationChange(resourceMatchType, resourceId, offeredByPartyId, coveredByPartyId, coveredByUserId, toUuid, toUuidType);
+                    DelegationChange currentChange = await _delegationRepository.GetCurrentDelegationChange(resourceMatchType, resourceId, offeredByPartyId, coveredByPartyId, coveredByUserId, toUuid, toUuidType, cancellationToken);
 
                     XacmlPolicy existingDelegationPolicy = null;
                     if (currentChange != null && currentChange.DelegationChangeType != DelegationChangeType.RevokeLast)
                     {
-                        existingDelegationPolicy = await _prp.GetPolicyVersionAsync(policyPath, currentChange.BlobStorageVersionId);
+                        existingDelegationPolicy = await _prp.GetPolicyVersionAsync(policyPath, currentChange.BlobStorageVersionId, cancellationToken);
                     }
 
                     // Build delegation XacmlPolicy either as a new policy or add rules to existing
@@ -223,7 +223,7 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
 
                     // Write delegation policy to blob storage
                     MemoryStream dataStream = PolicyHelper.GetXmlMemoryStreamFromXacmlPolicy(delegationPolicy);
-                    Response<BlobContentInfo> blobResponse = await _policyRepository.WritePolicyConditionallyAsync(policyPath, dataStream, leaseId);
+                    Response<BlobContentInfo> blobResponse = await policyClient.WritePolicyConditionallyAsync(dataStream, leaseId, cancellationToken);
                     Response httpResponse = blobResponse.GetRawResponse();
                     if (httpResponse.Status != (int)HttpStatusCode.Created)
                     {
@@ -252,10 +252,10 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
                         PerformedByUuidType = performedUuidType,
                         Created = delegatedDateTime,
                         BlobStoragePolicyPath = policyPath,
-                        BlobStorageVersionId = blobResponse.Value.VersionId                        
+                        BlobStorageVersionId = blobResponse.Value.VersionId
                     };
 
-                    change = await _delegationRepository.InsertDelegation(resourceMatchType, change);
+                    change = await _delegationRepository.InsertDelegation(resourceMatchType, change, cancellationToken);
                     if (change == null || (change.DelegationChangeId <= 0 && change.ResourceRegistryDelegationChangeId <= 0))
                     {
                         // Comment:
@@ -281,7 +281,7 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
                 }
                 finally
                 {
-                    _policyRepository.ReleaseBlobLease(policyPath, leaseId);
+                    policyClient.ReleaseBlobLease(leaseId, cancellationToken);
                 }
             }
 
@@ -289,11 +289,12 @@ private async Task<bool> WriteDelegationPolicyInternal(string policyPath, List<R
             return false;
         }
 
-        private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttributeMatchType resourceMatchType, string resourceId, RequestToDelete deleteRequest)
+        private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttributeMatchType resourceMatchType, string resourceId, RequestToDelete deleteRequest, CancellationToken cancellationToken = default)
         {
             List<Rule> currentRules = new List<Rule>();
+            var policyClient = _policyFactory.Create(policyPath);
+            string leaseId = await policyClient.TryAcquireBlobLease(cancellationToken);
 
-            string leaseId = await _policyRepository.TryAcquireBlobLease(policyPath);
             if (leaseId == null)
             {
                 _logger.LogError("Could not acquire blob lease lock on delegation policy at path: {policyPath}", policyPath);
@@ -306,7 +307,7 @@ private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttr
                 string coveredBy = DelegationHelper.GetCoveredByFromMatch(deleteRequest.PolicyMatch.CoveredBy, out int? coveredByUserId, out int? coveredByPartyId, out Guid? coveredByUuid, out UuidType coveredByUuidType);
                 string offeredBy = deleteRequest.PolicyMatch.OfferedByPartyId.ToString();
 
-                DelegationChange currentChange = await _delegationRepository.GetCurrentDelegationChange(resourceMatchType, resourceId, deleteRequest.PolicyMatch.OfferedByPartyId, coveredByPartyId, coveredByUserId, coveredByUuid, coveredByUuidType);
+                DelegationChange currentChange = await _delegationRepository.GetCurrentDelegationChange(resourceMatchType, resourceId, deleteRequest.PolicyMatch.OfferedByPartyId, coveredByPartyId, coveredByUserId, coveredByUuid, coveredByUuidType, cancellationToken);
 
                 XacmlPolicy existingDelegationPolicy = null;
                 if (currentChange.DelegationChangeType == DelegationChangeType.RevokeLast)
@@ -315,7 +316,7 @@ private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttr
                     return null;
                 }
 
-                existingDelegationPolicy = await _prp.GetPolicyVersionAsync(currentChange.BlobStoragePolicyPath, currentChange.BlobStorageVersionId);
+                existingDelegationPolicy = await _prp.GetPolicyVersionAsync(currentChange.BlobStoragePolicyPath, currentChange.BlobStorageVersionId, cancellationToken);
 
                 foreach (string ruleId in deleteRequest.RuleIds)
                 {
@@ -341,7 +342,7 @@ private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttr
                     {
                         // Write delegation policy to blob storage
                         MemoryStream dataStream = PolicyHelper.GetXmlMemoryStreamFromXacmlPolicy(existingDelegationPolicy);
-                        response = await _policyRepository.WritePolicyConditionallyAsync(policyPath, dataStream, leaseId);
+                        response = await policyClient.WritePolicyConditionallyAsync(dataStream, leaseId, cancellationToken);
                     }
                     catch (Exception ex)
                     {
@@ -360,9 +361,9 @@ private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttr
                         PerformedByUserId = deleteRequest.DeletedByUserId,
                         BlobStoragePolicyPath = policyPath,
                         BlobStorageVersionId = response.Value.VersionId
-                    }; 
+                    };
 
-                    change = await _delegationRepository.InsertDelegation(resourceMatchType, change);
+                    change = await _delegationRepository.InsertDelegation(resourceMatchType, change, cancellationToken);
                     if (change == null || (change.DelegationChangeId <= 0 && change.ResourceRegistryDelegationChangeId <= 0))
                     {
                         // Comment:
@@ -392,13 +393,13 @@ private async Task<List<Rule>> ProcessPolicyFile(string policyPath, ResourceAttr
             }
             finally
             {
-                _policyRepository.ReleaseBlobLease(policyPath, leaseId);
+                policyClient.ReleaseBlobLease(leaseId);
             }
 
             return currentRules;
         }
 
-        private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDelete)
+        private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDelete, CancellationToken cancellationToken = default)
         {
             string coveredBy = DelegationHelper.GetCoveredByFromMatch(policyToDelete.PolicyMatch.CoveredBy, out int? coveredByUserId, out int? coveredByPartyId, out Guid? coveredByUuid, out UuidType coveredByUuidType);
 
@@ -419,13 +420,14 @@ private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDe
                 return null;
             }
 
-            if (!await _policyRepository.PolicyExistsAsync(policyPath))
+            var policyClient = _policyFactory.Create(policyPath);
+            if (!await policyClient.PolicyExistsAsync(cancellationToken))
             {
                 _logger.LogWarning("No blob was found for the expected path: {policyPath} this must be removed without upading the database", policyPath);
                 return null;
             }
 
-            string leaseId = await _policyRepository.TryAcquireBlobLease(policyPath);
+            string leaseId = await policyClient.TryAcquireBlobLease(cancellationToken);
             if (leaseId == null)
             {
                 _logger.LogError("Could not acquire blob lease on delegation policy at path: {policyPath}", policyPath);
@@ -442,7 +444,7 @@ private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDe
                     return null;
                 }
 
-                XacmlPolicy existingDelegationPolicy = await _prp.GetPolicyVersionAsync(currentChange.BlobStoragePolicyPath, currentChange.BlobStorageVersionId);
+                XacmlPolicy existingDelegationPolicy = await _prp.GetPolicyVersionAsync(currentChange.BlobStoragePolicyPath, currentChange.BlobStorageVersionId, cancellationToken);
                 List<Rule> currentPolicyRules = new List<Rule>();
                 foreach (XacmlRule xacmlRule in existingDelegationPolicy.Rules)
                 {
@@ -455,7 +457,7 @@ private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDe
                 try
                 {
                     MemoryStream dataStream = PolicyHelper.GetXmlMemoryStreamFromXacmlPolicy(existingDelegationPolicy);
-                    response = await _policyRepository.WritePolicyConditionallyAsync(policyPath, dataStream, leaseId);
+                    response = await policyClient.WritePolicyConditionallyAsync(dataStream, leaseId, cancellationToken);
                 }
                 catch (Exception ex)
                 {
@@ -472,10 +474,10 @@ private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDe
                     CoveredByUserId = coveredByUserId,
                     PerformedByUserId = policyToDelete.DeletedByUserId,
                     BlobStoragePolicyPath = policyPath,
-                    BlobStorageVersionId = response.Value.VersionId                    
+                    BlobStorageVersionId = response.Value.VersionId
                 };
 
-                change = await _delegationRepository.InsertDelegation(resourceMatchType, change);
+                change = await _delegationRepository.InsertDelegation(resourceMatchType, change, cancellationToken);
                 if (change == null || (change.DelegationChangeId <= 0 && change.ResourceRegistryDelegationChangeId <= 0))
                 {
                     // Comment:
@@ -506,11 +508,11 @@ private async Task<List<Rule>> DeleteAllRulesInPolicy(RequestToDelete policyToDe
             }
             finally
             {
-                _policyRepository.ReleaseBlobLease(policyPath, leaseId);
+                policyClient.ReleaseBlobLease(leaseId);
             }
         }
 
-        private async Task<List<Rule>> DeleteRulesInPolicy(RequestToDelete rulesToDelete)
+        private async Task<List<Rule>> DeleteRulesInPolicy(RequestToDelete rulesToDelete, CancellationToken cancellationToken = default)
         {
             string coveredBy = DelegationHelper.GetCoveredByFromMatch(rulesToDelete.PolicyMatch.CoveredBy, out int? coveredByUserId, out int? coveredByPartyId, out Guid? coveredByUuid, out UuidType coveredByUuidType);
 
@@ -532,13 +534,14 @@ private async Task<List<Rule>> DeleteRulesInPolicy(RequestToDelete rulesToDelete
                 return null;
             }
 
-            if (!await _policyRepository.PolicyExistsAsync(policyPath))
+            var policyClient = _policyFactory.Create(policyPath);
+            if (!await policyClient.PolicyExistsAsync(cancellationToken))
             {
                 _logger.LogWarning("No blob was found for the expected path: {policyPath} this must be removed without updating the database", policyPath);
                 return null;
             }
 
-            List<Rule> currentRules = await ProcessPolicyFile(policyPath, resourceMatchType, resourceId, rulesToDelete);
+            List<Rule> currentRules = await ProcessPolicyFile(policyPath, resourceMatchType, resourceId, rulesToDelete, cancellationToken);
 
             return currentRules;
         }
diff --git a/src/Altinn.AccessManagement.Core/Services/PolicyInformationPoint.cs b/src/Altinn.AccessManagement.Core/Services/PolicyInformationPoint.cs
index 4d9fd8eba..7faf69449 100644
--- a/src/Altinn.AccessManagement.Core/Services/PolicyInformationPoint.cs
+++ b/src/Altinn.AccessManagement.Core/Services/PolicyInformationPoint.cs
@@ -47,15 +47,15 @@ public PolicyInformationPoint(ILogger<IPolicyInformationPoint> logger, IPolicyRe
         }
 
         /// <inheritdoc/>
-        public async Task<List<Rule>> GetRulesAsync(List<string> resourceIds, List<int> offeredByPartyIds, List<int> coveredByPartyIds, List<int> coveredByUserIds)
+        public async Task<List<Rule>> GetRulesAsync(List<string> resourceIds, List<int> offeredByPartyIds, List<int> coveredByPartyIds, List<int> coveredByUserIds, CancellationToken cancellationToken = default)
         {
             List<Rule> rules = new List<Rule>();
-            List<DelegationChange> delegationChanges = await _delegationRepository.GetAllCurrentAppDelegationChanges(offeredByPartyIds, resourceIds, coveredByPartyIds, coveredByUserIds);
+            List<DelegationChange> delegationChanges = await _delegationRepository.GetAllCurrentAppDelegationChanges(offeredByPartyIds, resourceIds, coveredByPartyIds, coveredByUserIds, cancellationToken);
             foreach (DelegationChange delegationChange in delegationChanges)
             {
                 if (delegationChange.DelegationChangeType != DelegationChangeType.RevokeLast)
                 {
-                    XacmlPolicy policy = await _prp.GetPolicyVersionAsync(delegationChange.BlobStoragePolicyPath, delegationChange.BlobStorageVersionId);
+                    XacmlPolicy policy = await _prp.GetPolicyVersionAsync(delegationChange.BlobStoragePolicyPath, delegationChange.BlobStorageVersionId, cancellationToken);
                     rules.AddRange(GetRulesFromPolicyAndDelegationChange(policy.Rules, delegationChange));
                 }
             }
@@ -147,7 +147,7 @@ public async Task<List<Right>> GetRights(RightsQuery rightsQuery, bool returnAll
         }
 
         /// <inheritdoc/>
-        public async Task<IEnumerable<DelegationChange>> GetReceivedDelegationFromRepository(int partyId, CancellationToken cancellationToken)
+        public async Task<IEnumerable<DelegationChange>> GetReceivedDelegationFromRepository(int partyId, CancellationToken cancellationToken = default)
         {
             var party = await _contextRetrievalService.GetPartyAsync(partyId, cancellationToken);
 
@@ -224,7 +224,7 @@ public async Task<DelegationChangeList> GetAllDelegations(DelegationChangeInput
             return result;
         }
 
-        private async Task<List<DelegationChange>> FindAllDelegations(int subjectUserId, int subjectPartyId, Guid subjectUuid, UuidType subjectUuidType, int reporteePartyId, string resourceId, ResourceAttributeMatchType resourceMatchType, CancellationToken cancellationToken)
+        private async Task<List<DelegationChange>> FindAllDelegations(int subjectUserId, int subjectPartyId, Guid subjectUuid, UuidType subjectUuidType, int reporteePartyId, string resourceId, ResourceAttributeMatchType resourceMatchType, CancellationToken cancellationToken = default)
         {
             if (resourceMatchType == ResourceAttributeMatchType.None)
             {
diff --git a/src/Altinn.AccessManagement.Core/Services/PolicyRetrievalPoint.cs b/src/Altinn.AccessManagement.Core/Services/PolicyRetrievalPoint.cs
index 6e82c0ea1..094bc6e23 100644
--- a/src/Altinn.AccessManagement.Core/Services/PolicyRetrievalPoint.cs
+++ b/src/Altinn.AccessManagement.Core/Services/PolicyRetrievalPoint.cs
@@ -14,19 +14,19 @@ namespace Altinn.AccessManagement.Core.Services
     /// </summary>
     public class PolicyRetrievalPoint : IPolicyRetrievalPoint
     {
-        private readonly IPolicyRepository _repository;
+        private readonly IPolicyFactory _policyFactory;
         private readonly IMemoryCache _memoryCache;
         private readonly CacheConfig _cacheConfig;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PolicyRetrievalPoint"/> class.
         /// </summary>
-        /// <param name="policyRepository">The policy Repository..</param>
-        /// <param name="memoryCache">The cache handler </param>
+        /// <param name="policyFactory">The policy factory</param>
+        /// <param name="memoryCache">The cache handler</param>
         /// <param name="cacheConfig">The cache config settings</param>
-        public PolicyRetrievalPoint(IPolicyRepository policyRepository, IMemoryCache memoryCache, IOptions<CacheConfig> cacheConfig)
+        public PolicyRetrievalPoint(IPolicyFactory policyFactory, IMemoryCache memoryCache, IOptions<CacheConfig> cacheConfig)
         {
-            _repository = policyRepository;
+            _policyFactory = policyFactory;
             _memoryCache = memoryCache;
             _cacheConfig = cacheConfig.Value;
         }
@@ -63,8 +63,8 @@ private async Task<XacmlPolicy> GetPolicyInternalAsync(string policyPath, string
             if (!_memoryCache.TryGetValue(policyPath + version, out XacmlPolicy policy))
             {
                 Stream policyBlob = string.IsNullOrEmpty(version) ?
-                    await _repository.GetPolicyAsync(policyPath) :
-                    await _repository.GetPolicyVersionAsync(policyPath, version);
+                    await _policyFactory.Create(policyPath).GetPolicyAsync(cancellationToken) :
+                    await _policyFactory.Create(policyPath).GetPolicyVersionAsync(version, cancellationToken);
                 using (policyBlob)
                 {
                     policy = (policyBlob.Length > 0) ? PolicyHelper.ParsePolicy(policyBlob) : null;
@@ -85,4 +85,4 @@ private void PutXacmlPolicyInCache(string policyPath, XacmlPolicy policy)
             _memoryCache.Set(policyPath, policy, cacheEntryOptions);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Persistence/Extensions/PersistenceDependencyInjectionExtensions.cs b/src/Altinn.AccessManagement.Persistence/Extensions/PersistenceDependencyInjectionExtensions.cs
index 5e7fbfde6..e3e9a3389 100644
--- a/src/Altinn.AccessManagement.Persistence/Extensions/PersistenceDependencyInjectionExtensions.cs
+++ b/src/Altinn.AccessManagement.Persistence/Extensions/PersistenceDependencyInjectionExtensions.cs
@@ -1,4 +1,5 @@
-using Altinn.AccessManagement.Core.Models;
+using Altinn.AccessManagement.Core.Enums;
+using Altinn.AccessManagement.Core.Models;
 using Altinn.AccessManagement.Core.Repositories.Interfaces;
 using Altinn.AccessManagement.Enums;
 using Altinn.AccessManagement.Persistence.Configuration;
@@ -42,7 +43,7 @@ public static IServiceCollection AddAccessManagementPersistence(
             services.AddSingleton<IResourceMetadataRepository, ResourceMetadataRepository>();
         }
 
-        services.AdDelegationPolicyRepository();
+        services.AddDelegationPolicyRepository(config);
 
         return services;
     }
@@ -51,27 +52,8 @@ public static IServiceCollection AddAccessManagementPersistence(
     /// Registers a <see cref="IPolicyRepository"/> with the dependency injection container.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-    /// <returns><paramref name="services"/> for further chaining.</returns>
-    public static IServiceCollection AdDelegationPolicyRepository(
-        this IServiceCollection services)
-    {
-        services.AddOptions<AzureStorageConfiguration>()
-            .Validate(s => !string.IsNullOrEmpty(s.DelegationsAccountKey), "account key cannot be null or empty")
-            .Validate(s => !string.IsNullOrEmpty(s.DelegationsAccountName), "account name cannot be null or empty")
-            .Validate(s => !string.IsNullOrEmpty(s.DelegationsContainer), "container cannot be null or empty")
-            .Validate(s => !string.IsNullOrEmpty(s.DelegationsBlobEndpoint), "blob endpoint cannot be null or empty");
-
-        services.TryAddSingleton<IPolicyRepository, PolicyRepository>();
-
-        return services;
-    }
-
-    /// <summary>
-    /// Registers a <see cref="IPolicyFactory"/> with the dependency injection container.
-    /// </summary>
-    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
     /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-    public static IServiceCollection AddDelegationPolicyRepositoryV2(this IServiceCollection services, IConfiguration configuration)
+    public static IServiceCollection AddDelegationPolicyRepository(this IServiceCollection services, IConfiguration configuration)
     {
         var config = new AzureStorageConfiguration();
 
@@ -79,12 +61,12 @@ public static IServiceCollection AddDelegationPolicyRepositoryV2(this IServiceCo
             .GetRequiredSection(nameof(AzureStorageConfiguration))
             .Bind(config);
 
-        services.AddDelegationPolicyRepositoryV2(options =>
+        services.AddDelegationPolicyRepository(options =>
         {
             options.AddRange([
-                new(AccountType.Delegations, config.DelegationsAccountName, config.DelegationsContainer, config.DelegationsBlobEndpoint, config.DelegationsAccountKey, config.BlobLeaseTimeout),
-                new(AccountType.Metadata, config.MetadataAccountName, config.MetadataContainer, config.MetadataBlobEndpoint, config.MetadataAccountKey, config.BlobLeaseTimeout),
-                new(AccountType.ResourceRegister, config.ResourceRegistryAccountName, config.ResourceRegistryContainer, config.ResourceRegistryBlobEndpoint, config.ResourceRegistryAccountKey, config.BlobLeaseTimeout),
+                new(PolicyAccountType.Delegations, config.DelegationsAccountName, config.DelegationsContainer, config.DelegationsBlobEndpoint, config.DelegationsAccountKey, config.BlobLeaseTimeout),
+                new(PolicyAccountType.Metadata, config.MetadataAccountName, config.MetadataContainer, config.MetadataBlobEndpoint, config.MetadataAccountKey, config.BlobLeaseTimeout),
+                new(PolicyAccountType.ResourceRegister, config.ResourceRegistryAccountName, config.ResourceRegistryContainer, config.ResourceRegistryBlobEndpoint, config.ResourceRegistryAccountKey, config.BlobLeaseTimeout),
             ]);
         });
 
@@ -92,12 +74,12 @@ public static IServiceCollection AddDelegationPolicyRepositoryV2(this IServiceCo
     }
 
     /// <summary>
-    /// Registers a <see cref="IPolicyFactory"/> with the dependency injection container.
+    /// Registers a <see cref="IPolicyRepository"/> with the dependency injection container.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
     /// <param name="configureOptions">options for configuring blob service</param>
     /// <returns><paramref name="services"/> for further chaining.</returns>
-    public static IServiceCollection AddDelegationPolicyRepositoryV2(this IServiceCollection services, Action<List<PolicyOptions>> configureOptions)
+    public static IServiceCollection AddDelegationPolicyRepository(this IServiceCollection services, Action<List<PolicyOptions>> configureOptions)
     {
         var options = new List<PolicyOptions>();
         configureOptions(options);
diff --git a/src/Altinn.AccessManagement.Persistence/Policy/PolicyFactory.cs b/src/Altinn.AccessManagement.Persistence/Policy/PolicyFactory.cs
index c6784a3a8..7dfc109fb 100644
--- a/src/Altinn.AccessManagement.Persistence/Policy/PolicyFactory.cs
+++ b/src/Altinn.AccessManagement.Persistence/Policy/PolicyFactory.cs
@@ -1,3 +1,5 @@
+using Altinn.AccessManagement.Core.Enums;
+using Altinn.AccessManagement.Core.Repositories.Interfaces;
 using Azure.Storage.Blobs;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.Options;
@@ -19,7 +21,7 @@ public class PolicyFactory(IAzureClientFactory<BlobServiceClient> factory, IOpti
     public IOptionsFactory<PolicyOptions> Options { get; } = options;
 
     /// <inheritdoc/>
-    public IPolicyRepositoryV2 Create(AccountType account, string filepath)
+    public IPolicyRepository Create(PolicyAccountType account, string filepath)
     {
         var options = Options.Create(account.ToString());
         var client = Factory
@@ -27,20 +29,14 @@ public IPolicyRepositoryV2 Create(AccountType account, string filepath)
             .CreateBlobContainer(options.Container).Value
             .GetBlobClient(filepath);
 
-        return new PolicyRepositoryV2(client, options);
+        return new PolicyRepository(client, options);
     }
-}
 
-/// <summary>
-/// Create clients for interacting with files 
-/// </summary>
-public interface IPolicyFactory
-{
-    /// <summary>
-    /// Creates a client for interacting with storage
-    /// </summary>
-    /// <param name="account">which storage account to write blob</param>
-    /// <param name="filepath">path of the file</param>
-    /// <returns></returns>
-    IPolicyRepositoryV2 Create(AccountType account, string filepath);
+    /// <inheritdoc/>
+    public IPolicyRepository Create(string filepath) => filepath switch
+    {
+        var blob when blob.EndsWith("delegationpolicy.xml") => Create(PolicyAccountType.Delegations, filepath),
+        var blob when blob.EndsWith("resourcepolicy.xml") => Create(PolicyAccountType.ResourceRegister, filepath),
+        _ => Create(PolicyAccountType.Metadata, filepath),
+    };
 }
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Persistence/Policy/PolicyOptions.cs b/src/Altinn.AccessManagement.Persistence/Policy/PolicyOptions.cs
index e0e37258a..5814d5da9 100644
--- a/src/Altinn.AccessManagement.Persistence/Policy/PolicyOptions.cs
+++ b/src/Altinn.AccessManagement.Persistence/Policy/PolicyOptions.cs
@@ -1,17 +1,18 @@
 using System.ComponentModel.DataAnnotations;
+using Altinn.AccessManagement.Core.Enums;
 
 namespace Altinn.AccessManagement.Persistence.Policy;
 
 /// <summary>
 /// Options for configuring storage account
 /// </summary>
-public class PolicyOptions(AccountType account, string accountName, string container, string uri, string key, int leaseAcquireTimeoutInSec = 3)
+public class PolicyOptions(PolicyAccountType account, string accountName, string container, string uri, string key, int leaseAcquireTimeoutInSec = 3)
 {
     /// <summary>
     /// Specifies Storage Account. Mostly used as a symbol for consumer for making it simpler to targeting storage account
     /// </summary>
     [Required]
-    public AccountType Account { get; set; } = account;
+    public PolicyAccountType Account { get; set; } = account;
 
     /// <summary>
     /// AzureRM account name
@@ -41,16 +42,4 @@ public class PolicyOptions(AccountType account, string accountName, string conta
     /// Timeout for some specific operations. Defaults to 3 seconds
     /// </summary>
     public TimeSpan LeaseAcquireTimeout { get; set; } = TimeSpan.FromSeconds(leaseAcquireTimeoutInSec);
-}
-
-/// <summary>
-/// Storage Account
-/// </summary>
-public enum AccountType
-{
-    ResourceRegister,
-
-    Delegations,
-
-    Metadata,
-}
+}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Persistence/Policy/PolicyRepository.cs b/src/Altinn.AccessManagement.Persistence/Policy/PolicyRepository.cs
new file mode 100644
index 000000000..93d6c0e31
--- /dev/null
+++ b/src/Altinn.AccessManagement.Persistence/Policy/PolicyRepository.cs
@@ -0,0 +1,104 @@
+using System.Diagnostics;
+using Altinn.AccessManagement.Core.Repositories.Interfaces;
+using Altinn.AccessManagement.Persistence.Configuration;
+using Altinn.AccessManagement.Persistence.Extensions;
+using Azure;
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+using Azure.Storage.Blobs.Specialized;
+
+namespace Altinn.AccessManagement.Persistence.Policy;
+
+/// <inheritdoc/>
+public class PolicyRepository(BlobClient client, PolicyOptions options) : IPolicyRepository
+{
+    /// <summary>
+    /// Azure Blob Storage client
+    /// </summary>
+    public BlobClient Client { get; } = client;
+
+    /// <summary>
+    /// Policy Options
+    /// </summary>
+    public PolicyOptions Options { get; } = options;
+
+    private static async Task<T> RoundTripper<T>(Func<Task<T>> func)
+    {
+        using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
+        try
+        {
+            return await func();
+        }
+        catch (RequestFailedException ex)
+        {
+            activity.StopWithError(ex);
+            throw;
+        }
+        catch (Exception ex)
+        {
+            activity.StopWithError(ex);
+            throw;
+        }
+    }
+
+    /// <inheritdoc/>
+    public async Task<Response> DeletePolicyVersionAsync(string version, CancellationToken cancellationToken = default)
+    {
+        var result = await RoundTripper(async () => await Client.WithVersion(version).DeleteAsync(cancellationToken: cancellationToken));
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<Stream> GetPolicyAsync(CancellationToken cancellationToken = default)
+    {
+        var result = await RoundTripper(async () => await Client.DownloadStreamingAsync(cancellationToken: cancellationToken));
+        return result.Value.Content;
+    }
+
+    /// <inheritdoc/>
+    public async Task<Stream> GetPolicyVersionAsync(string version, CancellationToken cancellationToken = default)
+    {
+        var result = await RoundTripper(async () => await Client.WithVersion(version).DownloadStreamingAsync(cancellationToken: cancellationToken));
+        return result.Value.Content;
+    }
+
+    /// <inheritdoc/>
+    public async Task<bool> PolicyExistsAsync(CancellationToken cancellationToken = default)
+    {
+        return await RoundTripper(async () => await Client.ExistsAsync(cancellationToken: cancellationToken));
+    }
+
+    /// <inheritdoc/>
+    public async void ReleaseBlobLease(string leaseId, CancellationToken cancellationToken = default)
+    {
+        await RoundTripper(async () => await Client.GetBlobLeaseClient(leaseId).ReleaseAsync(cancellationToken: cancellationToken));
+    }
+
+    /// <inheritdoc/>
+    public async Task<string> TryAcquireBlobLease(CancellationToken cancellationToken = default)
+    {
+        var result = await RoundTripper(async () => await Client.GetBlobLeaseClient().AcquireAsync(Options.LeaseAcquireTimeout, cancellationToken: cancellationToken));
+        return result.Value.LeaseId;
+    }
+
+    /// <inheritdoc/>
+    public async Task<Response<BlobContentInfo>> WritePolicyAsync(Stream fileStream = null, CancellationToken cancellationToken = default)
+    {
+        return await RoundTripper(async () => await Client.UploadAsync(fileStream ?? new MemoryStream(), true, cancellationToken));
+    }
+
+    /// <inheritdoc/>
+    public async Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(Stream fileStream, string blobLeaseId, CancellationToken cancellationToken = default)
+    {
+        return await RoundTripper(async () => await Client.UploadAsync(
+            fileStream,
+            new BlobUploadOptions()
+            {
+                Conditions = new()
+                {
+                    LeaseId = blobLeaseId,
+                }
+            },
+            cancellationToken));
+    }
+}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Persistence/Policy/PolicyRepositoryV2.cs b/src/Altinn.AccessManagement.Persistence/Policy/PolicyRepositoryV2.cs
deleted file mode 100644
index 8692f2888..000000000
--- a/src/Altinn.AccessManagement.Persistence/Policy/PolicyRepositoryV2.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using System.Diagnostics;
-using Altinn.AccessManagement.Persistence.Configuration;
-using Altinn.AccessManagement.Persistence.Extensions;
-using Azure;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Blobs.Specialized;
-
-namespace Altinn.AccessManagement.Persistence.Policy;
-
-/// <inheritdoc/>
-public class PolicyRepositoryV2(BlobClient client, PolicyOptions options) : IPolicyRepositoryV2
-{
-    /// <summary>
-    /// Azure Blob Storage client
-    /// </summary>
-    public BlobClient Client { get; } = client;
-
-    /// <summary>
-    /// Policy Options
-    /// </summary>
-    public PolicyOptions Options { get; } = options;
-
-    private static async Task<T> RoundTripper<T>(Func<Task<T>> func)
-    {
-        using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-        try
-        {
-            return await func();
-        }
-        catch (RequestFailedException ex)
-        {
-            activity.StopWithError(ex);
-            throw;
-        }
-        catch (Exception ex)
-        {
-            activity.StopWithError(ex);
-            throw;
-        }
-    }
-
-    /// <inheritdoc/>
-    public async Task<Response> DeletePolicyVersionAsync(string version, CancellationToken cancellationToken = default)
-    {
-        var result = await RoundTripper(async () => await Client.WithVersion(version).DeleteAsync(cancellationToken: cancellationToken));
-        return result;
-    }
-
-    /// <inheritdoc/>
-    public async Task<Stream> GetPolicyAsync(CancellationToken cancellationToken = default)
-    {
-        var result = await RoundTripper(async () => await Client.DownloadStreamingAsync(cancellationToken: cancellationToken));
-        return result.Value.Content;
-    }
-
-    /// <inheritdoc/>
-    public async Task<Stream> GetPolicyVersionAsync(string version, CancellationToken cancellationToken = default)
-    {
-        var result = await RoundTripper(async () => await Client.WithVersion(version).DownloadStreamingAsync(cancellationToken: cancellationToken));
-        return result.Value.Content;
-    }
-
-    /// <inheritdoc/>
-    public async Task<bool> PolicyExistsAsync(CancellationToken cancellationToken = default)
-    {
-        return await RoundTripper(async () => await Client.ExistsAsync(cancellationToken: cancellationToken));
-    }
-
-    /// <inheritdoc/>
-    public async void ReleaseBlobLease(string leaseId, CancellationToken cancellationToken = default)
-    {
-        await RoundTripper(async () => await Client.GetBlobLeaseClient(leaseId).ReleaseAsync(cancellationToken: cancellationToken));
-    }
-
-    /// <inheritdoc/>
-    public async Task<string> TryAcquireBlobLease(CancellationToken cancellationToken = default)
-    {
-        var result = await RoundTripper(async () => await Client.GetBlobLeaseClient().AcquireAsync(Options.LeaseAcquireTimeout, cancellationToken: cancellationToken));
-        return result.Value.LeaseId;
-    }
-
-    /// <inheritdoc/>
-    public async Task<Response<BlobContentInfo>> WritePolicyAsync(Stream fileStream, CancellationToken cancellationToken = default)
-    {
-        return await RoundTripper(async () => await Client.UploadAsync(fileStream, true, cancellationToken));
-    }
-
-    /// <inheritdoc/>
-    public async Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(Stream fileStream, string blobLeaseId, CancellationToken cancellationToken = default)
-    {
-        return await RoundTripper(async () => await Client.UploadAsync(
-            fileStream,
-            new BlobUploadOptions()
-            {
-                Conditions = new()
-                {
-                    LeaseId = blobLeaseId,
-                }
-            },
-            cancellationToken));
-    }
-}
-
-/// <summary>
-/// Interface for operations on policy files.
-/// </summary>
-public interface IPolicyRepositoryV2
-{
-    /// <summary>
-    /// Gets file stream for the policy file from blob storage, if it exists at the specified path.
-    /// </summary>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns>File stream of the policy file</returns>
-    Task<Stream> GetPolicyAsync(CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Gets file stream for the specified version of a policy file from blob storage, if it exists at the specified path.
-    /// </summary>
-    /// <param name="version">The blob storage version</param>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns>File stream of the policy file</returns>
-    Task<Stream> GetPolicyVersionAsync(string version, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Writes a file stream to blobstorage to the specified path.
-    /// </summary>
-    /// <param name="fileStream">File stream of the policy file to be written</param>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns>Azure response BlobContentInfo</returns>
-    Task<Response<BlobContentInfo>> WritePolicyAsync(Stream fileStream, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Writes a file stream to blobstorage to the specified path, including the conditional check that the provided blob lease id is valid.
-    /// </summary>
-    /// <param name="fileStream">File stream of the policy file to be written</param>
-    /// <param name="blobLeaseId">The blob lease id, required to be able to write after a lock</param>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns>Azure response BlobContentInfo</returns>
-    Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(Stream fileStream, string blobLeaseId, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Deletes a specific version of a blob storage file if it exits on the specified path.
-    /// </summary>
-    /// <param name="version">The blob storage version</param>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns></returns>
-    Task<Response> DeletePolicyVersionAsync(string version, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Tries to acquire a blob lease on the base blob for the provided filepath.
-    /// </summary>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns>The LeaseId if a release was possible, otherwise null</returns>
-    Task<string> TryAcquireBlobLease(CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Releases a blob lease on the base blob for the provided filepath using the provided leaseId.
-    /// </summary>
-    /// <param name="leaseId">The lease id from to release</param>
-    /// <param name="cancellationToken">cancellation token</param>
-    void ReleaseBlobLease(string leaseId, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Checks whether there exists a blob at the specified path
-    /// </summary>
-    /// <param name="cancellationToken">cancellation token</param>
-    /// <returns>Bool whether the blob exists or not</returns>
-    Task<bool> PolicyExistsAsync(CancellationToken cancellationToken = default);
-}
\ No newline at end of file
diff --git a/src/Altinn.AccessManagement.Persistence/PolicyRepository.cs b/src/Altinn.AccessManagement.Persistence/PolicyRepository.cs
deleted file mode 100644
index 9067ea8f3..000000000
--- a/src/Altinn.AccessManagement.Persistence/PolicyRepository.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Net;
-using Altinn.AccessManagement.Core.Repositories.Interfaces;
-using Altinn.AccessManagement.Persistence.Configuration;
-using Altinn.AccessManagement.Persistence.Extensions;
-using Azure;
-using Azure.Storage;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Blobs.Specialized;
-using Microsoft.Extensions.Options;
-using OpenTelemetry.Trace;
-
-namespace Altinn.AccessManagement.Persistence
-{
-    /// <summary>
-    /// Repository for handling policy files
-    /// </summary>
-    [ExcludeFromCodeCoverage]
-    public class PolicyRepository : IPolicyRepository
-    {
-        private readonly AzureStorageConfiguration _storageConfig;
-        private readonly BlobContainerClient _metadataContainerClient;
-        private readonly BlobContainerClient _delegationsContainerClient;
-        private readonly BlobContainerClient _resourceRegisterContainerClient;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PolicyRepository"/> class
-        /// </summary>
-        /// <param name="storageConfig">The storage configuration for Azure Blob Storage.</param>
-        public PolicyRepository(IOptions<AzureStorageConfiguration> storageConfig)
-        {
-            _storageConfig = storageConfig.Value;
-
-            StorageSharedKeyCredential metadataCredentials = new StorageSharedKeyCredential(_storageConfig.MetadataAccountName, _storageConfig.MetadataAccountKey);
-            BlobServiceClient metadataServiceClient = new BlobServiceClient(new Uri(_storageConfig.MetadataBlobEndpoint), metadataCredentials);
-            _metadataContainerClient = metadataServiceClient.GetBlobContainerClient(_storageConfig.MetadataContainer);
-
-            StorageSharedKeyCredential delegationsCredentials = new StorageSharedKeyCredential(_storageConfig.DelegationsAccountName, _storageConfig.DelegationsAccountKey);
-            BlobServiceClient delegationsServiceClient = new BlobServiceClient(new Uri(_storageConfig.DelegationsBlobEndpoint), delegationsCredentials);
-            _delegationsContainerClient = delegationsServiceClient.GetBlobContainerClient(_storageConfig.DelegationsContainer);
-
-            StorageSharedKeyCredential resourceRegisterCredentials = new StorageSharedKeyCredential(_storageConfig.ResourceRegistryAccountName, _storageConfig.ResourceRegistryAccountKey);
-            BlobServiceClient resourceRegisterServiceClient = new BlobServiceClient(new Uri(_storageConfig.ResourceRegistryBlobEndpoint), resourceRegisterCredentials);
-            _resourceRegisterContainerClient = resourceRegisterServiceClient.GetBlobContainerClient(_storageConfig.ResourceRegistryContainer);
-        }
-
-        /// <inheritdoc/>
-        public async Task<Stream> GetPolicyAsync(string filepath)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            BlobClient blobClient = CreateBlobClient(filepath);
-
-            return await GetBlobStreamInternal(blobClient);
-        }
-
-        /// <inheritdoc/>
-        public async Task<Stream> GetPolicyVersionAsync(string filepath, string version)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            BlobClient blobClient = CreateBlobClient(filepath).WithVersion(version);
-
-            return await GetBlobStreamInternal(blobClient);
-        }
-
-        /// <inheritdoc/>
-        public async Task<Response<BlobContentInfo>> WritePolicyAsync(string filepath, Stream fileStream)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            BlobClient blobClient = CreateBlobClient(filepath);
-
-            return await WriteBlobStreamInternal(blobClient, fileStream);
-        }
-
-        /// <inheritdoc/>
-        public async Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(string filepath, Stream fileStream, string blobLeaseId)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            BlobClient blobClient = CreateBlobClient(filepath);
-
-            BlobUploadOptions blobUploadOptions = new BlobUploadOptions()
-            {
-                Conditions = new BlobRequestConditions()
-                {
-                    LeaseId = blobLeaseId
-                }
-            };
-
-            return await WriteBlobStreamInternal(blobClient, fileStream, blobUploadOptions);
-        }
-
-        /// <inheritdoc/>
-        public async Task<string> TryAcquireBlobLease(string filepath)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            BlobClient blobClient = CreateBlobClient(filepath);
-            BlobLeaseClient blobLeaseClient = blobClient.GetBlobLeaseClient();
-
-            try
-            {
-                BlobLease blobLease = await blobLeaseClient.AcquireAsync(TimeSpan.FromSeconds(_storageConfig.BlobLeaseTimeout));
-                return blobLease.LeaseId;
-            }
-            catch (RequestFailedException ex)
-            {
-                activity?.StopWithError(ex, $"Failed to acquire blob lease for policy file at {filepath}. RequestFailedException");
-            }
-            catch (Exception ex)
-            {
-                activity?.StopWithError(ex, $"Failed to acquire blob lease for policy file at {filepath}. Unexpected error");
-            }
-
-            return null;
-        }
-
-        /// <inheritdoc/>
-        public async void ReleaseBlobLease(string filepath, string leaseId)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            BlobClient blobClient = CreateBlobClient(filepath);
-            BlobLeaseClient blobLeaseClient = blobClient.GetBlobLeaseClient(leaseId);
-            await blobLeaseClient.ReleaseAsync();
-        }
-
-        /// <inheritdoc/>
-        public async Task<bool> PolicyExistsAsync(string filepath)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            try
-            {
-                BlobClient blobClient = CreateBlobClient(filepath);
-                return await blobClient.ExistsAsync();
-            }
-            catch (RequestFailedException ex)
-            {
-                activity?.StopWithError(ex, $"Failed to check if blob exists for policy file at {filepath}. RequestFailedException");
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public async Task<Response> DeletePolicyVersionAsync(string filepath, string version)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            try
-            {
-                BlobClient blockBlob = CreateBlobClient(filepath);
-
-                return await blockBlob.WithVersion(version).DeleteAsync();
-            }
-            catch (RequestFailedException ex)
-            {
-                var errorMsg = ex.Status == (int)HttpStatusCode.Forbidden && ex.ErrorCode == "OperationNotAllowedOnRootBlob" ?
-                $"Failed to delete version {version} of policy file at {filepath}. Not allowed to delete current version." :
-                $"Failed to delete version {version} of policy file at {filepath}. RequestFailedException";
-                activity?.StopWithError(ex, errorMsg);
-                throw;
-            }
-            catch (Exception ex)
-            {
-                activity?.StopWithError(ex, $"Failed to delete version {version} of policy file at {filepath}. Unexpected error");
-                throw;
-            }
-        }
-
-        private BlobClient CreateBlobClient(string blobName)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            if (blobName.Contains("delegationpolicy.xml"))
-            {
-                activity?.AddEvent(new ActivityEvent("_delegationsContainerClient.GetBlobClient"));
-                return _delegationsContainerClient.GetBlobClient(blobName);
-            }
-
-            if (blobName.Contains("resourcepolicy.xml"))
-            {
-                activity?.AddEvent(new ActivityEvent("_resourceRegisterContainerClient.GetBlobClient"));
-                return _resourceRegisterContainerClient.GetBlobClient(blobName);
-            }
-
-            activity?.AddEvent(new ActivityEvent("_metadataContainerClient.GetBlobClient"));
-            return _metadataContainerClient.GetBlobClient(blobName);
-        }
-
-        private async Task<Stream> GetBlobStreamInternal(BlobClient blobClient)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            try
-            {
-                Stream memoryStream = new MemoryStream();
-
-                if (await blobClient.ExistsAsync())
-                {
-                    await blobClient.DownloadToAsync(memoryStream);
-                    memoryStream.Position = 0;
-
-                    return memoryStream;
-                }
-
-                return memoryStream;
-            }
-            catch (Exception ex)
-            {
-                activity?.StopWithError(ex, $"Failed to read policy file at {blobClient.Name}");
-                throw;
-            }
-        }
-
-        private async Task<Response<BlobContentInfo>> WriteBlobStreamInternal(BlobClient blobClient, Stream fileStream, BlobUploadOptions blobUploadOptions = null)
-        {
-            using var activity = TelemetryConfig.ActivitySource.StartActivity(ActivityKind.Client);
-            try
-            {
-                if (blobUploadOptions != null)
-                {
-                    return await blobClient.UploadAsync(fileStream, blobUploadOptions);
-                }
-
-                return await blobClient.UploadAsync(fileStream, true);
-            }
-            catch (RequestFailedException ex)
-            {
-                activity?.StopWithError(ex, $"Failed to save policy file {blobClient.Name}. {(HttpStatusCode)ex.Status}");
-                throw;
-            }
-            catch (Exception ex)
-            {
-                activity?.StopWithError(ex, $"Failed to save policy file {blobClient.Name}. Unexpected exception");
-                throw;
-            }
-        }
-    }
-}
diff --git a/src/Altinn.AccessManagement/Configuration/ConsoleTraceService.cs b/src/Altinn.AccessManagement/Configuration/ConsoleTraceService.cs
index b2ea7ea9d..22d90146e 100644
--- a/src/Altinn.AccessManagement/Configuration/ConsoleTraceService.cs
+++ b/src/Altinn.AccessManagement/Configuration/ConsoleTraceService.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Altinn.AccessManagement.Core.Models;
 using Yuniql.Extensibility;
 
 namespace Altinn.AccessManagement.Configuration
@@ -7,7 +8,7 @@ namespace Altinn.AccessManagement.Configuration
     /// Copied from sample project.
     /// </summary>
     [ExcludeFromCodeCoverage]
-    public class ConsoleTraceService : ITraceService
+    public class ConsoleTraceService(ILogger logger) : ITraceService
     {
         /// <inheritdoc/>
         public bool IsDebugEnabled { get; set; } = false;
@@ -27,39 +28,31 @@ public class ConsoleTraceService : ITraceService
         /// <inheritdoc/>
         public void Info(string message, object payload = null)
         {
-            var traceMessage = $"INF   {DateTime.UtcNow.ToString("o")}   {message}{Environment.NewLine}";
-            Console.Write(traceMessage);
+            logger.LogInformation(message, payload);
         }
 
         /// <inheritdoc/>
         public void Error(string message, object payload = null)
         {
-            var traceMessage = $"ERR   {DateTime.UtcNow.ToString("o")}   {message}{Environment.NewLine}";
-            Console.Write(traceMessage);
+            logger.LogError(message, payload);
         }
 
         /// <inheritdoc/>
         public void Debug(string message, object payload = null)
         {
-            if (IsDebugEnabled)
-            {
-                var traceMessage = $"DBG   {DateTime.UtcNow.ToString("o")}   {message}{Environment.NewLine}";
-                Console.Write(traceMessage);
-            }
+            logger.LogDebug(message, payload);
         }
 
         /// <inheritdoc/>
         public void Success(string message, object payload = null)
         {
-            var traceMessage = $"INF   {DateTime.UtcNow.ToString("u")}   {message}{Environment.NewLine}";
-            Console.Write(traceMessage);
+            logger.LogInformation(message, payload);
         }
 
         /// <inheritdoc/>
         public void Warn(string message, object payload = null)
         {
-            var traceMessage = $"WRN   {DateTime.UtcNow.ToString("o")}   {message}{Environment.NewLine}";
-            Console.Write(traceMessage);
+            logger.LogInformation(message, payload);
         }
     }
 }
diff --git a/src/Altinn.AccessManagement/Controllers/DelegationsController.cs b/src/Altinn.AccessManagement/Controllers/DelegationsController.cs
index 66d9f5be6..4f512e5ff 100644
--- a/src/Altinn.AccessManagement/Controllers/DelegationsController.cs
+++ b/src/Altinn.AccessManagement/Controllers/DelegationsController.cs
@@ -39,6 +39,7 @@ public DelegationsController(
         /// Endpoint for adding one or more rules for the given app/offeredby/coveredby. This updates or creates a new delegated policy of type "DirectlyDelegated". DelegatedByUserId is included to store history information in 3.0.
         /// </summary>
         /// <param name="rules">All rules to be delegated</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <response code="201" cref="List{PolicyRule}">Created</response>
         /// <response code="206" cref="List{PolicyRule}">Partial Content</response>
         /// <response code="400">Bad Request</response>
@@ -46,7 +47,7 @@ public DelegationsController(
         [HttpPost]
         [Authorize(Policy = AuthzConstants.ALTINNII_AUTHORIZATION)]
         [Route("accessmanagement/api/v1/delegations/addrules")]
-        public async Task<ActionResult> Post([FromBody] List<Rule> rules)
+        public async Task<ActionResult> Post([FromBody] List<Rule> rules, CancellationToken cancellationToken)
         {
             if (rules == null || rules.Count < 1)
             {
@@ -58,7 +59,7 @@ public async Task<ActionResult> Post([FromBody] List<Rule> rules)
                 return BadRequest("Invalid model");
             }
 
-            List<Rule> delegationResults = await _pap.TryWriteDelegationPolicyRules(rules);
+            List<Rule> delegationResults = await _pap.TryWriteDelegationPolicyRules(rules, cancellationToken);
 
             if (delegationResults.All(r => r.CreatedSuccessfully))
             {
@@ -83,7 +84,7 @@ public async Task<ActionResult> Post([FromBody] List<Rule> rules)
         [HttpPost]
         [Authorize(Policy = AuthzConstants.ALTINNII_AUTHORIZATION)]
         [Route("accessmanagement/api/v1/delegations/getrules")]
-        public async Task<ActionResult<List<Rule>>> GetRules([FromBody] RuleQuery ruleQuery, [FromQuery] bool onlyDirectDelegations = false)
+        public async Task<ActionResult<List<Rule>>> GetRules([FromBody] RuleQuery ruleQuery, CancellationToken cancellationToken, [FromQuery] bool onlyDirectDelegations = false)
         {
             List<int> coveredByPartyIds = new List<int>();
             List<int> coveredByUserIds = new List<int>();
@@ -132,7 +133,7 @@ public async Task<ActionResult<List<Rule>>> GetRules([FromBody] RuleQuery ruleQu
                 return StatusCode(400, $"Unable to get the rules: Missing offeredby and coveredby values.");
             }
 
-            List<Rule> rulesList = await _pip.GetRulesAsync(resourceIds, offeredByPartyIds, coveredByPartyIds, coveredByUserIds);
+            List<Rule> rulesList = await _pip.GetRulesAsync(resourceIds, offeredByPartyIds, coveredByPartyIds, coveredByUserIds, cancellationToken);
             DelegationHelper.SetRuleType(rulesList, ruleQuery.OfferedByPartyId, ruleQuery.KeyRolePartyIds, ruleQuery.CoveredBy, ruleQuery.ParentPartyId);
             return Ok(rulesList);
         }
@@ -147,14 +148,14 @@ public async Task<ActionResult<List<Rule>>> GetRules([FromBody] RuleQuery ruleQu
         [HttpPost]
         [Authorize(Policy = AuthzConstants.ALTINNII_AUTHORIZATION)]
         [Route("accessmanagement/api/v1/delegations/deleterules")]
-        public async Task<ActionResult> DeleteRule([FromBody] RequestToDeleteRuleList rulesToDelete)
+        public async Task<ActionResult> DeleteRule([FromBody] RequestToDeleteRuleList rulesToDelete, CancellationToken cancellationToken)
         {
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
             }
 
-            List<Rule> deletionResults = await _pap.TryDeleteDelegationPolicyRules(rulesToDelete);
+            List<Rule> deletionResults = await _pap.TryDeleteDelegationPolicyRules(rulesToDelete, cancellationToken);
             int ruleCountToDelete = DelegationHelper.GetRulesCountToDeleteFromRequestToDelete(rulesToDelete);
             int deletionResultsCount = deletionResults.Count;
 
@@ -185,14 +186,14 @@ public async Task<ActionResult> DeleteRule([FromBody] RequestToDeleteRuleList ru
         [HttpPost]
         [Authorize(Policy = AuthzConstants.ALTINNII_AUTHORIZATION)]
         [Route("accessmanagement/api/v1/delegations/deletepolicy")]
-        public async Task<ActionResult> DeletePolicy([FromBody] RequestToDeletePolicyList policiesToDelete)
+        public async Task<ActionResult> DeletePolicy([FromBody] RequestToDeletePolicyList policiesToDelete, CancellationToken cancellationToken)
         {
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
             }
 
-            List<Rule> deletionResults = await _pap.TryDeleteDelegationPolicies(policiesToDelete);
+            List<Rule> deletionResults = await _pap.TryDeleteDelegationPolicies(policiesToDelete, cancellationToken);
             int countPolicies = DelegationHelper.GetPolicyCount(deletionResults);
             int policiesToDeleteCount = policiesToDelete.Count;
 
diff --git a/src/Altinn.AccessManagement/Controllers/MaskinportenSchemaController.cs b/src/Altinn.AccessManagement/Controllers/MaskinportenSchemaController.cs
index 3a5311187..cb721eb64 100644
--- a/src/Altinn.AccessManagement/Controllers/MaskinportenSchemaController.cs
+++ b/src/Altinn.AccessManagement/Controllers/MaskinportenSchemaController.cs
@@ -56,7 +56,7 @@ public MaskinportenSchemaController(
         [ProducesResponseType(400)]
         [ProducesResponseType(403)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult<List<MPDelegationExternal>>> GetMaskinportenDelegations([FromQuery] string? supplierOrg, [FromQuery] string? consumerOrg, [FromQuery] string scope)
+        public async Task<ActionResult<List<MPDelegationExternal>>> GetMaskinportenDelegations([FromQuery] string? supplierOrg, [FromQuery] string? consumerOrg, [FromQuery] string scope, CancellationToken cancellationToken)
         {
             if (!MaskinportenSchemaAuthorizer.IsAuthorizedDelegationLookupAccess(scope, HttpContext.User))
             {
@@ -78,7 +78,7 @@ public async Task<ActionResult<List<MPDelegationExternal>>> GetMaskinportenDeleg
 
             try
             {
-                List<Delegation> delegations = await _delegation.GetMaskinportenDelegations(supplierOrg, consumerOrg, scope);
+                List<Delegation> delegations = await _delegation.GetMaskinportenDelegations(supplierOrg, consumerOrg, scope, cancellationToken);
                 List<MPDelegationExternal> delegationsExternal = _mapper.Map<List<MPDelegationExternal>>(delegations);
 
                 return delegationsExternal;
@@ -100,6 +100,7 @@ public async Task<ActionResult<List<MPDelegationExternal>>> GetMaskinportenDeleg
         /// </summary>
         /// <param name="party">The reportee party</param>
         /// <param name="rightsDelegationCheckRequest">Request model for user rights delegation check</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <response code="200" cref="List{RightDelegationStatusExternal}">Ok</response>
         /// <response code="400">Bad Request</response>
         /// <response code="401">Unauthorized</response>
@@ -114,7 +115,7 @@ public async Task<ActionResult<List<MPDelegationExternal>>> GetMaskinportenDeleg
         [ProducesResponseType(401)]
         [ProducesResponseType(403)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult<List<RightDelegationCheckResultExternal>>> DelegationCheck([FromRoute] string party, [FromBody] RightsDelegationCheckRequestExternal rightsDelegationCheckRequest)
+        public async Task<ActionResult<List<RightDelegationCheckResultExternal>>> DelegationCheck([FromRoute] string party, [FromBody] RightsDelegationCheckRequestExternal rightsDelegationCheckRequest, CancellationToken cancellationToken)
         {
             int authenticatedUserId = AuthenticationHelper.GetUserId(HttpContext);
             int authenticationLevel = AuthenticationHelper.GetUserAuthenticationLevel(HttpContext);
@@ -126,7 +127,7 @@ public async Task<ActionResult<List<RightDelegationCheckResultExternal>>> Delega
                 RightsDelegationCheckRequest rightDelegationStatusRequestInternal = _mapper.Map<RightsDelegationCheckRequest>(rightsDelegationCheckRequest);
                 rightDelegationStatusRequestInternal.From = reportee.SingleToList();
 
-                DelegationCheckResponse delegationCheckResultInternal = await _delegation.DelegationCheck(authenticatedUserId, authenticationLevel, rightDelegationStatusRequestInternal);
+                DelegationCheckResponse delegationCheckResultInternal = await _delegation.DelegationCheck(authenticatedUserId, authenticationLevel, rightDelegationStatusRequestInternal, cancellationToken);
                 if (!delegationCheckResultInternal.IsValid)
                 {
                     foreach (var error in delegationCheckResultInternal.Errors)
@@ -165,17 +166,17 @@ public async Task<ActionResult<List<RightDelegationCheckResultExternal>>> Delega
         [ProducesResponseType(201)]
         [ProducesResponseType(400)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult<RightsDelegationResponseExternal>> MaskinportenScopeDelegation([FromRoute] string party, [FromBody] RightsDelegationRequestExternal delegation)
+        public async Task<ActionResult<RightsDelegationResponseExternal>> MaskinportenScopeDelegation([FromRoute] string party, [FromBody] RightsDelegationRequestExternal delegation, CancellationToken cancellationToken)
         {
             int authenticatedUserId = AuthenticationHelper.GetUserId(HttpContext);
             int authenticationLevel = AuthenticationHelper.GetUserAuthenticationLevel(HttpContext);
-            
+
             try
             {
                 AttributeMatch reportee = IdentifierUtil.GetIdentifierAsAttributeMatch(party, HttpContext);
                 DelegationLookup internalDelegation = _mapper.Map<DelegationLookup>(delegation);
                 internalDelegation.From = reportee.SingleToList();
-                DelegationActionResult response = await _delegation.DelegateMaskinportenSchema(authenticatedUserId, authenticationLevel, internalDelegation);
+                DelegationActionResult response = await _delegation.DelegateMaskinportenSchema(authenticatedUserId, authenticationLevel, internalDelegation, cancellationToken);
 
                 if (!response.IsValid)
                 {
@@ -188,7 +189,7 @@ public async Task<ActionResult<RightsDelegationResponseExternal>> MaskinportenSc
                 }
 
                 RightsDelegationResponseExternal delegationResponse = _mapper.Map<RightsDelegationResponseExternal>(response);
-                
+
                 return StatusCode(201, delegationResponse);
             }
             catch (Exception ex)
@@ -217,12 +218,12 @@ public async Task<ActionResult<RightsDelegationResponseExternal>> MaskinportenSc
         [ProducesResponseType(200)]
         [ProducesResponseType(400)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult<List<MaskinportenSchemaDelegationExternal>>> GetOfferedMaskinportenSchemaDelegations([FromRoute] string party)
+        public async Task<ActionResult<List<MaskinportenSchemaDelegationExternal>>> GetOfferedMaskinportenSchemaDelegations([FromRoute] string party, CancellationToken cancellationToken)
         {
             try
             {
                 AttributeMatch partyMatch = IdentifierUtil.GetIdentifierAsAttributeMatch(party, HttpContext);
-                List<Delegation> delegations = await _delegation.GetOfferedMaskinportenSchemaDelegations(partyMatch);
+                List<Delegation> delegations = await _delegation.GetOfferedMaskinportenSchemaDelegations(partyMatch, cancellationToken);
                 return _mapper.Map<List<MaskinportenSchemaDelegationExternal>>(delegations);
             }
             catch (ArgumentException argEx)
@@ -252,7 +253,7 @@ public async Task<ActionResult<List<MaskinportenSchemaDelegationExternal>>> GetO
         [ProducesResponseType(204)]
         [ProducesResponseType(400)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult> RevokeOfferedMaskinportenScopeDelegation([FromRoute] string party, [FromBody] RevokeOfferedDelegationExternal delegation)
+        public async Task<ActionResult> RevokeOfferedMaskinportenScopeDelegation([FromRoute] string party, [FromBody] RevokeOfferedDelegationExternal delegation, CancellationToken cancellationToken)
         {
             int authenticatedUserId = AuthenticationHelper.GetUserId(HttpContext);
 
@@ -261,7 +262,7 @@ public async Task<ActionResult> RevokeOfferedMaskinportenScopeDelegation([FromRo
                 AttributeMatch reportee = IdentifierUtil.GetIdentifierAsAttributeMatch(party, HttpContext);
                 DelegationLookup internalDelegation = _mapper.Map<DelegationLookup>(delegation);
                 internalDelegation.From = reportee.SingleToList();
-                DelegationActionResult response = await _delegation.RevokeMaskinportenSchemaDelegation(authenticatedUserId, internalDelegation);
+                DelegationActionResult response = await _delegation.RevokeMaskinportenSchemaDelegation(authenticatedUserId, internalDelegation, cancellationToken);
 
                 if (!response.IsValid)
                 {
@@ -301,12 +302,12 @@ public async Task<ActionResult> RevokeOfferedMaskinportenScopeDelegation([FromRo
         [ProducesResponseType(200)]
         [ProducesResponseType(400)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult<List<MaskinportenSchemaDelegationExternal>>> GetReceivedMaskinportenSchemaDelegations([FromRoute] string party)
+        public async Task<ActionResult<List<MaskinportenSchemaDelegationExternal>>> GetReceivedMaskinportenSchemaDelegations([FromRoute] string party, CancellationToken cancellationToken)
         {
             try
             {
                 AttributeMatch partyMatch = IdentifierUtil.GetIdentifierAsAttributeMatch(party, HttpContext);
-                List<Delegation> delegations = await _delegation.GetReceivedMaskinportenSchemaDelegations(partyMatch);
+                List<Delegation> delegations = await _delegation.GetReceivedMaskinportenSchemaDelegations(partyMatch, cancellationToken);
                 return _mapper.Map<List<MaskinportenSchemaDelegationExternal>>(delegations);
             }
             catch (ArgumentException argEx)
@@ -336,7 +337,7 @@ public async Task<ActionResult<List<MaskinportenSchemaDelegationExternal>>> GetR
         [ProducesResponseType(204)]
         [ProducesResponseType(400)]
         [ProducesResponseType(500)]
-        public async Task<ActionResult> RevokeReceivedMaskinportenScopeDelegation([FromRoute] string party, [FromBody] RevokeReceivedDelegationExternal delegation)
+        public async Task<ActionResult> RevokeReceivedMaskinportenScopeDelegation([FromRoute] string party, [FromBody] RevokeReceivedDelegationExternal delegation, CancellationToken cancellationToken)
         {
             int authenticatedUserId = AuthenticationHelper.GetUserId(HttpContext);
 
@@ -345,7 +346,7 @@ public async Task<ActionResult> RevokeReceivedMaskinportenScopeDelegation([FromR
                 AttributeMatch reportee = IdentifierUtil.GetIdentifierAsAttributeMatch(party, HttpContext);
                 DelegationLookup internalDelegation = _mapper.Map<DelegationLookup>(delegation);
                 internalDelegation.To = reportee.SingleToList();
-                DelegationActionResult response = await _delegation.RevokeMaskinportenSchemaDelegation(authenticatedUserId, internalDelegation);
+                DelegationActionResult response = await _delegation.RevokeMaskinportenSchemaDelegation(authenticatedUserId, internalDelegation, cancellationToken);
 
                 if (!response.IsValid)
                 {
diff --git a/src/Altinn.AccessManagement/Controllers/PolicyInformationPointController.cs b/src/Altinn.AccessManagement/Controllers/PolicyInformationPointController.cs
index ea5dd58a2..0a794522d 100644
--- a/src/Altinn.AccessManagement/Controllers/PolicyInformationPointController.cs
+++ b/src/Altinn.AccessManagement/Controllers/PolicyInformationPointController.cs
@@ -31,13 +31,14 @@ public PolicyInformationPointController(IPolicyInformationPoint pip, IMapper map
         /// Endpoint to find all delegation changes for a given user, reportee and app/resource context
         /// </summary>
         /// <param name="request">The input model that contains id info about user, reportee, resource and resourceMatchType </param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <returns>A list of delegation changes that's stored in the database </returns>
         [ApiExplorerSettings(IgnoreApi = true)]
         [HttpPost]
         [Route("getdelegationchanges")]
-        public async Task<ActionResult<List<DelegationChangeExternal>>> GetAllDelegationChanges([FromBody] DelegationChangeInput request)
+        public async Task<ActionResult<List<DelegationChangeExternal>>> GetAllDelegationChanges([FromBody] DelegationChangeInput request, CancellationToken cancellationToken)
         {
-            DelegationChangeList response = await _pip.GetAllDelegations(request);
+            DelegationChangeList response = await _pip.GetAllDelegations(request, cancellationToken);
 
             if (!response.IsValid)
             {
diff --git a/src/Altinn.AccessManagement/Controllers/RightsInternalController.cs b/src/Altinn.AccessManagement/Controllers/RightsInternalController.cs
index 7fedee4d7..673e9dfb3 100644
--- a/src/Altinn.AccessManagement/Controllers/RightsInternalController.cs
+++ b/src/Altinn.AccessManagement/Controllers/RightsInternalController.cs
@@ -51,6 +51,7 @@ public RightsInternalController(ILogger<RightsInternalController> logger, IMappe
         /// Endpoint for performing a query of rights between two parties for a specific resource
         /// </summary>
         /// <param name="rightsQuery">Query model for rights lookup</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <param name="returnAllPolicyRights">Whether the response should return all possible rights for the resource, not just the rights the user have access to</param>
         /// <response code="200" cref="List{RightExternal}">Ok</response>
         /// <response code="400">Bad Request</response>
@@ -59,12 +60,12 @@ public RightsInternalController(ILogger<RightsInternalController> logger, IMappe
         [Authorize(Policy = AuthzConstants.ALTINNII_AUTHORIZATION)]
         [Route("internal/query/rights/")]
         [ApiExplorerSettings(IgnoreApi = true)]
-        public async Task<ActionResult<List<RightExternal>>> RightsQuery([FromBody] RightsQueryExternal rightsQuery, [FromQuery] bool returnAllPolicyRights = false)
+        public async Task<ActionResult<List<RightExternal>>> RightsQuery([FromBody] RightsQueryExternal rightsQuery, CancellationToken cancellationToken, [FromQuery] bool returnAllPolicyRights = false)
         {
             try
             {
                 RightsQuery rightsQueryInternal = _mapper.Map<RightsQuery>(rightsQuery);
-                List<Right> rightsInternal = await _pip.GetRights(rightsQueryInternal, returnAllPolicyRights);
+                List<Right> rightsInternal = await _pip.GetRights(rightsQueryInternal, returnAllPolicyRights, cancellationToken: cancellationToken);
                 return _mapper.Map<List<RightExternal>>(rightsInternal);
             }
             catch (ValidationException valEx)
@@ -84,6 +85,7 @@ public async Task<ActionResult<List<RightExternal>>> RightsQuery([FromBody] Righ
         /// IMPORTANT: The delegable rights lookup does itself not check that the user has access to the necessary RolesAdministration/MainAdmin or MaskinportenSchema delegation system resources needed to be allowed to perform delegation.
         /// </summary>
         /// <param name="rightsQuery">Query model for rights lookup</param>
+        /// <param name="cancellationToken">CancellationToken</param>
         /// <param name="returnAllPolicyRights">Whether the response should return all possible rights for the resource, not just the rights the user is allowed to delegate</param>
         /// <response code="200" cref="List{DelegationRightExternal}">Ok</response>
         /// <response code="400">Bad Request</response>
@@ -92,12 +94,12 @@ public async Task<ActionResult<List<RightExternal>>> RightsQuery([FromBody] Righ
         [Authorize(Policy = AuthzConstants.ALTINNII_AUTHORIZATION)]
         [Route("internal/query/delegablerights")]
         [ApiExplorerSettings(IgnoreApi = true)]
-        public async Task<ActionResult<List<RightExternal>>> DelegableRightsQuery([FromBody] RightsQueryExternal rightsQuery, [FromQuery] bool returnAllPolicyRights = false)
+        public async Task<ActionResult<List<RightExternal>>> DelegableRightsQuery([FromBody] RightsQueryExternal rightsQuery, CancellationToken cancellationToken, [FromQuery] bool returnAllPolicyRights = false)
         {
             try
             {
                 RightsQuery rightsQueryInternal = _mapper.Map<RightsQuery>(rightsQuery);
-                List<Right> rightsInternal = await _pip.GetRights(rightsQueryInternal, returnAllPolicyRights, getDelegableRights: true);
+                List<Right> rightsInternal = await _pip.GetRights(rightsQueryInternal, returnAllPolicyRights, getDelegableRights: true, cancellationToken);
                 return _mapper.Map<List<RightExternal>>(rightsInternal);
             }
             catch (ValidationException valEx)
diff --git a/src/Altinn.AccessManagement/Program.cs b/src/Altinn.AccessManagement/Program.cs
index b3bec8d21..617a10429 100644
--- a/src/Altinn.AccessManagement/Program.cs
+++ b/src/Altinn.AccessManagement/Program.cs
@@ -80,8 +80,8 @@ void ConfigureSetupLogging()
         builder
             .AddFilter("Microsoft", LogLevel.Warning)
             .AddFilter("System", LogLevel.Warning)
-            .AddFilter("Altinn.AccessManagement.Program", LogLevel.Debug)
-            .AddConsole();
+            .AddFilter("Altinn.AccessManagement.Program", LogLevel.Debug);
+        // .AddConsole();
     });
 
     logger = logFactory.CreateLogger<Program>();
@@ -234,7 +234,6 @@ void ConfigureServices(IServiceCollection services, IConfiguration config)
     services.AddSingleton<IPolicyInformationPoint, PolicyInformationPoint>();
     services.AddSingleton<IPolicyAdministrationPoint, PolicyAdministrationPoint>();
     services.AddSingleton<IResourceAdministrationPoint, ResourceAdministrationPoint>();
-    services.AddSingleton<IPolicyRepository, PolicyRepository>();
     services.AddSingleton<IResourceRegistryClient, ResourceRegistryClient>();
     services.AddSingleton<IDelegationChangeEventQueue, DelegationChangeEventQueue>();
     services.AddSingleton<IEventMapperService, EventMapperService>();
@@ -384,7 +383,7 @@ void ConfigurePostgreSql()
 {
     if (builder.Configuration.GetValue<bool>("PostgreSQLSettings:EnableDBConnection"))
     {
-        ConsoleTraceService traceService = new ConsoleTraceService { IsDebugEnabled = false };
+        ConsoleTraceService traceService = new ConsoleTraceService(logger);
 
         string connectionString = string.Format(
             builder.Configuration.GetValue<string>("PostgreSQLSettings:AdminConnectionString"),
diff --git a/test/Altinn.AccessManagement.Tests/Altinn.AccessManagement.Tests.csproj b/test/Altinn.AccessManagement.Tests/Altinn.AccessManagement.Tests.csproj
index 2f93a2d4a..354de2f72 100644
--- a/test/Altinn.AccessManagement.Tests/Altinn.AccessManagement.Tests.csproj
+++ b/test/Altinn.AccessManagement.Tests/Altinn.AccessManagement.Tests.csproj
@@ -27,6 +27,10 @@
     <ProjectReference Include="..\..\src\Altinn.AccessManagement\Altinn.AccessManagement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Data\**" CopyToOutputDirectory="PreserveNewest" LinkBase="Migration\" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/Altinn2RightsControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/Altinn2RightsControllerTest.cs
index d046feba5..a3f4184d9 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/Altinn2RightsControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/Altinn2RightsControllerTest.cs
@@ -144,20 +144,20 @@ public async Task ClearAccessCache_ReturnOk(string authnUserToken, int party, Ba
     public static TheoryData<string, int, BaseAttributeExternal, Action<HttpResponseMessage>> ClearAccessCache_ReturnOk_input() => new()
     {
         {
-            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper Børstad
+            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper B�rstad
             50002598, // From Kasper
-            new BaseAttributeExternal { Type = Urn.Altinn.Person.Uuid, Value = "00000000-0000-0000-0005-000000003899" }, // To Ørjan Ravnås
+            new BaseAttributeExternal { Type = Urn.Altinn.Person.Uuid, Value = "00000000-0000-0000-0005-000000003899" }, // To �rjan Ravn�s
             AssertStatusCode(HttpStatusCode.OK)
         },
         {
-            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper Børstad
+            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper B�rstad
             50002598, // From Kasper
             new BaseAttributeExternal { Type = Urn.Altinn.Organization.Uuid, Value = "00000000-0000-0000-0005-000000004222" }, // To KARLSTAD OG ULOYBUKT
             AssertStatusCode(HttpStatusCode.OK)
         },
         {
-            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper Børstad
-            50005545, // From Ørsta
+            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper B�rstad
+            50005545, // From �rsta
             new BaseAttributeExternal { Type = Urn.Altinn.EnterpriseUser.Uuid, Value = "00000000-0000-0000-0002-000000010727" }, // To OrstaECUser
             AssertStatusCode(HttpStatusCode.OK)
         }
@@ -187,14 +187,14 @@ public async Task ClearAccessCache_ReturnBadRequest(string authnUserToken, int p
     public static TheoryData<string, int, BaseAttributeExternal, Action<HttpResponseMessage>> ClearAccessCache_ReturnBadRequest_input() => new()
     {
         {
-            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper Børstad
+            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper B�rstad
             50002598, // From Kasper
             new BaseAttributeExternal { Type = Urn.Altinn.Person.Uuid, Value = "asdf" }, // To not a well-formated uuid
             AssertStatusCode(HttpStatusCode.BadRequest)
         },
         {
-            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper Børstad
-            50005545, // From Ørsta
+            PrincipalUtil.GetToken(20000490, 50002598, 3), // Kasper B�rstad
+            50005545, // From �rsta
             new BaseAttributeExternal { Type = Urn.Altinn.Organization.Uuid, Value = "123" }, // To not a well-formated uuid
             AssertStatusCode(HttpStatusCode.BadRequest)
         }
@@ -284,7 +284,7 @@ private static void WithServiceMoq(IServiceCollection services)
     {
         services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
         services.AddSingleton<IDelegationMetadataRepository, DelegationMetadataRepositoryMock>();
-        services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+        services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
         services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
         services.AddSingleton<IPublicSigningKeyProvider, SigningKeyResolverMock>();
         services.AddSingleton<IPartiesClient, PartiesClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/AuthorizedPartiesControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/AuthorizedPartiesControllerTest.cs
index 9e8db1579..a39f2fd19 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/AuthorizedPartiesControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/AuthorizedPartiesControllerTest.cs
@@ -215,7 +215,7 @@ private HttpClient GetTestClient(string token, params Action<IServiceCollection>
             {
                 services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
                 services.AddSingleton<IDelegationMetadataRepository, DelegationMetadataRepositoryMock>();
-                services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+                services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
                 services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
                 services.AddSingleton<IPublicSigningKeyProvider, SigningKeyResolverMock>();
                 services.AddSingleton<IPartiesClient, PartiesClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/DelegationsControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/DelegationsControllerTest.cs
index fcb320458..3e353baec 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/DelegationsControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/DelegationsControllerTest.cs
@@ -1615,7 +1615,7 @@ private HttpClient GetTestClient(IPDP pdpMock = null, IHttpContextAccessor httpC
                 {
                     services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
                     services.AddSingleton(delegationMetadataRepositoryMock);
-                    services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+                    services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
                     services.AddSingleton<IDelegationChangeEventQueue, DelegationChangeEventQueueMock>();
                     services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
                     services.AddSingleton<IPartiesClient, PartiesClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/MaskinportenSchemaControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/MaskinportenSchemaControllerTest.cs
index af62f11e6..b2685a79c 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/MaskinportenSchemaControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/MaskinportenSchemaControllerTest.cs
@@ -111,10 +111,10 @@ public async Task GetOfferedMaskinportenSchemaDelegations_Valid_OfferedByOrg()
         /// </summary>
         [Fact]
         public async Task GetOfferedMaskinportenSchemaDelegations_Notfound_MissingOfferedBy()
-        {            
+        {
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1//maskinportenschema/offered");
-            
+
             // Assert
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
         }
@@ -130,7 +130,7 @@ public async Task GetOfferedMaskinportenSchemaDelegations_Forbidden_InvalidOffer
             _client = GetTestClient(new PepWithPDPAuthorizationMock());
             var token = PrincipalUtil.GetToken(1234, 12345678, 2);
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            
+
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/123/maskinportenschema/offered");
 
@@ -225,10 +225,10 @@ public async Task GetReceivedMaskinportenSchemaDelegations_Valid_CoveredBy()
         {
             // Arrange
             List<MaskinportenSchemaDelegationExternal> expectedDelegations = TestDataUtil.GetReceivedMaskinportenSchemaDelegations(50004219);
-            
+
             var token = PrincipalUtil.GetToken(1234, 12345678, 2);
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            
+
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/50004219/maskinportenschema/received");
             string responseContent = await response.Content.ReadAsStringAsync();
@@ -249,7 +249,7 @@ public async Task GetReceivedMaskinportenSchemaDelegations_Valid_CoveredByOrg()
         {
             // Arrange
             List<MaskinportenSchemaDelegationExternal> expectedDelegations = TestDataUtil.GetReceivedMaskinportenSchemaDelegations(50004219);
-            
+
             var httpContextAccessorMock = GetHttpContextAccessorMock("party", "50004219");
             _client = GetTestClient(new PepWithPDPAuthorizationMock(), httpContextAccessorMock);
             var token = PrincipalUtil.GetToken(1234, 12345678, 2);
@@ -292,7 +292,7 @@ public async Task GetReceivedMaskinportenSchemaDelegations_Invalid_CoveredBy()
             _client = GetTestClient(new PepWithPDPAuthorizationMock());
             var token = PrincipalUtil.GetToken(1234, 12345678, 2);
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            
+
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/1234/maskinportenschema/received");
 
@@ -330,10 +330,10 @@ public async Task GetReceivedMaskinportenSchemaDelegations_ResourceMetadataNotFo
         {
             // Arrange
             List<MaskinportenSchemaDelegationExternal> expectedDelegations = TestDataUtil.GetReceivedMaskinportenSchemaDelegations(50004216);
-            
+
             var token = PrincipalUtil.GetToken(1234, 12345678, 2);
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            
+
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/50004216/maskinportenschema/received");
             string responseContent = await response.Content.ReadAsStringAsync();
@@ -668,7 +668,7 @@ public async Task GetOfferedMaskinportenSchemaDelegations_UserComplyingToPolicy(
 
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/organization/maskinportenschema/offered");
-            
+
             // Assert
             Assert.Equal(expectedStatusCode, response.StatusCode);
         }
@@ -691,7 +691,7 @@ public async Task GetOfferedMaskinportenSchemaDelegations_UserNotComplyingToPoli
 
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/organization/maskinportenschema/offered");
-            
+
             // Assert
             Assert.Equal(expectedStatusCode, response.StatusCode);
         }
@@ -713,7 +713,7 @@ public async Task GetReceivedMaskinportenSchemaDelegations_UserComplyingToPolicy
 
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/organization/maskinportenschema/received");
-            
+
             // Assert
             Assert.Equal(expectedStatusCode, response.StatusCode);
         }
@@ -736,7 +736,7 @@ public async Task GetReceivedMaskinportenSchemaDelegations_UserNotComplyingToPol
 
             // Act
             HttpResponseMessage response = await _client.GetAsync($"accessmanagement/api/v1/organization/maskinportenschema/received");
-            
+
             // Assert
             Assert.Equal(expectedStatusCode, response.StatusCode);
         }
@@ -1766,11 +1766,11 @@ private HttpClient GetTestClient(IPDP pdpMock = null, IHttpContextAccessor httpC
                 {
                     services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
                     services.AddSingleton(delegationMetadataRepositoryMock);
-                    services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+                    services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
                     services.AddSingleton<IDelegationChangeEventQueue, DelegationChangeEventQueueMock>();
                     services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
                     services.AddSingleton<IPartiesClient, PartiesClientMock>();
-                    services.AddSingleton<IResourceRegistryClient, ResourceRegistryClientMock>(); 
+                    services.AddSingleton<IResourceRegistryClient, ResourceRegistryClientMock>();
                     services.AddSingleton(pdpMock);
                     services.AddSingleton(httpContextAccessor);
                     services.AddSingleton<IAltinnRolesClient, AltinnRolesClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/PolicyInformationPointControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/PolicyInformationPointControllerTest.cs
index 498c14ee2..725515317 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/PolicyInformationPointControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/PolicyInformationPointControllerTest.cs
@@ -21,7 +21,7 @@ namespace Altinn.AccessManagement.Tests.Controllers;
 /// <summary>
 /// Test class for <see cref="PolicyInformationPointController"></see>
 /// </summary>
-public class PolicyInformationPointControllerTest: IClassFixture<CustomWebApplicationFactory<PolicyInformationPointController>> 
+public class PolicyInformationPointControllerTest : IClassFixture<CustomWebApplicationFactory<PolicyInformationPointController>>
 {
     private HttpClient _client;
     private readonly CustomWebApplicationFactory<PolicyInformationPointController> _factory;
@@ -29,7 +29,7 @@ public class PolicyInformationPointControllerTest: IClassFixture<CustomWebApplic
     {
         PropertyNameCaseInsensitive = true,
     };
-    
+
     /// <summary>
     /// Initializes a new instance of the <see cref="PolicyInformationPointControllerTest"/> class.
     /// </summary>
@@ -39,7 +39,7 @@ public PolicyInformationPointControllerTest(CustomWebApplicationFactory<PolicyIn
         _factory = factory;
         _client = GetTestClient();
     }
-    
+
     private HttpClient GetTestClient(IDelegationMetadataRepository delegationMetadataRepositoryMock = null)
     {
         delegationMetadataRepositoryMock ??= new DelegationMetadataRepositoryMock();
@@ -57,7 +57,7 @@ private HttpClient GetTestClient(IDelegationMetadataRepository delegationMetadat
     }
 
     /// <summary>
-    /// Sets up test scenarios for <see cref="PolicyInformationPointController.GetAllDelegationChanges(Core.Models.DelegationChangeInput)"></see>
+    /// Sets up test scenarios for <see cref="PolicyInformationPointController.GetAllDelegationChanges(Core.Models.DelegationChangeInput, System.Threading.CancellationToken)"></see>
     /// </summary>
     public static TheoryData<string> Scenarios() => new()
     {
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/ResourceOwnerAPI/ResourceOwnerAuthorizedPartiesControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/ResourceOwnerAPI/ResourceOwnerAuthorizedPartiesControllerTest.cs
index 8d990c90c..40202185d 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/ResourceOwnerAPI/ResourceOwnerAuthorizedPartiesControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/ResourceOwnerAPI/ResourceOwnerAuthorizedPartiesControllerTest.cs
@@ -130,7 +130,7 @@ private HttpClient GetTestClient(string token, params Action<IServiceCollection>
             {
                 services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
                 services.AddSingleton<IDelegationMetadataRepository, DelegationMetadataRepositoryMock>();
-                services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+                services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
                 services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
                 services.AddSingleton<IPublicSigningKeyProvider, SigningKeyResolverMock>();
                 services.AddSingleton<IPartiesClient, PartiesClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/RightsInternalControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/RightsInternalControllerTest.cs
index 52a2170d7..997fdb683 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/RightsInternalControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/RightsInternalControllerTest.cs
@@ -1546,7 +1546,7 @@ private HttpClient GetTestClient(string token, params Action<IServiceCollection>
                 {
                     services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
                     services.AddSingleton<IDelegationMetadataRepository, DelegationMetadataRepositoryMock>();
-                    services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+                    services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
                     services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
                     services.AddSingleton<IPublicSigningKeyProvider, SigningKeyResolverMock>();
                     services.AddSingleton<IPartiesClient, PartiesClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Controllers/V2MaskinportenSchemaControllerTest.cs b/test/Altinn.AccessManagement.Tests/Controllers/V2MaskinportenSchemaControllerTest.cs
index 390d950d5..f2ac3f0b0 100644
--- a/test/Altinn.AccessManagement.Tests/Controllers/V2MaskinportenSchemaControllerTest.cs
+++ b/test/Altinn.AccessManagement.Tests/Controllers/V2MaskinportenSchemaControllerTest.cs
@@ -87,7 +87,7 @@ GIVEN that organization Voss consulting has delegated a MaskinportenSchema resou
     }
 
     /// <summary>
-    /// <see cref="MaskinportenSchemaController.GetOfferedMaskinportenSchemaDelegations(string)"/>
+    /// <see cref="MaskinportenSchemaController.GetOfferedMaskinportenSchemaDelegations(string, System.Threading.CancellationToken)"/>
     /// </summary>
     /// <param name="acceptanceCriteria">acceptance criteria</param>
     [Theory]
diff --git a/test/Altinn.AccessManagement.Tests/Fixtures/PostgresFixture.cs b/test/Altinn.AccessManagement.Tests/Fixtures/PostgresFixture.cs
index b1ff83905..e319ca9f6 100644
--- a/test/Altinn.AccessManagement.Tests/Fixtures/PostgresFixture.cs
+++ b/test/Altinn.AccessManagement.Tests/Fixtures/PostgresFixture.cs
@@ -11,6 +11,7 @@
 using Altinn.AccessManagement.Persistence;
 using Altinn.AccessManagement.Persistence.Configuration;
 using Altinn.AccessManagement.Tests.Seeds;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Npgsql;
 using Testcontainers.PostgreSql;
@@ -26,7 +27,10 @@ namespace Altinn.AccessManagement.Tests.Fixtures;
 /// </summary>
 public class PostgresFixture : IAsyncLifetime
 {
-    private ConsoleTraceService Tracer { get; } = new ConsoleTraceService { IsDebugEnabled = true };
+    private ConsoleTraceService Tracer { get; } = new ConsoleTraceService(LoggerFactory.Create(options =>
+    {
+        options.AddDebug();
+    }).CreateLogger<PostgresFixture>());
 
     /// <summary>
     /// Creates a new database and runs the migrations
diff --git a/test/Altinn.AccessManagement.Tests/Fixtures/WebApplicationFixture.cs b/test/Altinn.AccessManagement.Tests/Fixtures/WebApplicationFixture.cs
index ad78b4796..1880435a2 100644
--- a/test/Altinn.AccessManagement.Tests/Fixtures/WebApplicationFixture.cs
+++ b/test/Altinn.AccessManagement.Tests/Fixtures/WebApplicationFixture.cs
@@ -105,7 +105,7 @@ private static void AddMockClients(IServiceCollection services)
         services.AddSingleton<IResourceRegistryClient, ResourceRegistryMock>();
 
         services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
-        services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+        services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
         services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
         services.AddSingleton<IPublicSigningKeyProvider, SigningKeyResolverMock>();
 
diff --git a/test/Altinn.AccessManagement.Tests/Mocks/PolicyFactoryMock.cs b/test/Altinn.AccessManagement.Tests/Mocks/PolicyFactoryMock.cs
new file mode 100644
index 000000000..af20c0d2a
--- /dev/null
+++ b/test/Altinn.AccessManagement.Tests/Mocks/PolicyFactoryMock.cs
@@ -0,0 +1,21 @@
+using Altinn.AccessManagement.Core.Enums;
+using Altinn.AccessManagement.Core.Repositories.Interfaces;
+using Microsoft.Extensions.Logging;
+
+namespace Altinn.AccessManagement.Tests.Mocks;
+
+/// <inheritdoc/>
+public class PolicyFactoryMock(ILogger<PolicyRepositoryMock> logger) : IPolicyFactory
+{
+    /// <inheritdoc/>
+    public IPolicyRepository Create(PolicyAccountType account, string filepath)
+    {
+        return new PolicyRepositoryMock(filepath, logger);
+    }
+
+    /// <inheritdoc/>
+    public IPolicyRepository Create(string filepath)
+    {
+        return new PolicyRepositoryMock(filepath, logger);
+    }
+}
\ No newline at end of file
diff --git a/test/Altinn.AccessManagement.Tests/Mocks/PolicyRepositoryMock.cs b/test/Altinn.AccessManagement.Tests/Mocks/PolicyRepositoryMock.cs
index a0f2b62e3..322d75049 100644
--- a/test/Altinn.AccessManagement.Tests/Mocks/PolicyRepositoryMock.cs
+++ b/test/Altinn.AccessManagement.Tests/Mocks/PolicyRepositoryMock.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using Altinn.AccessManagement.Core.Repositories.Interfaces;
 using Azure;
@@ -13,95 +15,87 @@ namespace Altinn.AccessManagement.Tests.Mocks
     /// <summary>
     /// Mock class for <see cref="IPolicyRepository"></see> interface
     /// </summary>
-    public class PolicyRepositoryMock : IPolicyRepository
+    public class PolicyRepositoryMock(string filepath, ILogger<PolicyRepositoryMock> logger) : IPolicyRepository
     {
-        private readonly ILogger<PolicyRepositoryMock> _logger;
+        private string Filepath { get; } = filepath;
 
-        /// <summary>
-        /// Constructor 
-        /// </summary>
-        /// <param name="logger">logger</param>
-        public PolicyRepositoryMock(ILogger<PolicyRepositoryMock> logger)
-        {
-            _logger = logger;
-        }
+        private ILogger<PolicyRepositoryMock> Logger { get; } = logger;
 
         /// <inheritdoc/>
-        public Task<Stream> GetPolicyAsync(string filepath)
+        public Task<Stream> GetPolicyAsync(CancellationToken cancellationToken = default)
         {
-            return Task.FromResult(GetTestDataStream(filepath));
+            return Task.FromResult(GetTestDataStream(Filepath));
         }
 
         /// <inheritdoc/>
-        public Task<Stream> GetPolicyVersionAsync(string filepath, string version)
+        public Task<Stream> GetPolicyVersionAsync(string version, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult(GetTestDataStream(filepath));
+            return Task.FromResult(GetTestDataStream(Filepath));
         }
 
         /// <inheritdoc/>
-        public Task<Response<BlobContentInfo>> WritePolicyAsync(string filepath, Stream fileStream)
+        public Task<Response<BlobContentInfo>> WritePolicyAsync(Stream fileStream, CancellationToken cancellationToken = default)
         {
-            return WriteStreamToTestDataFolder(filepath, fileStream);            
+            return WriteStreamToTestDataFolder(Filepath, fileStream);
         }
 
         /// <inheritdoc/>
-        public Task<Response> DeletePolicyVersionAsync(string filepath, string version)
+        public Task<Response> DeletePolicyVersionAsync(string version, CancellationToken cancellationToken = default)
         {
             throw new NotImplementedException();
         }
 
         /// <inheritdoc/>
-        public async Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(string filepath, Stream fileStream, string blobLeaseId)
+        public async Task<Response<BlobContentInfo>> WritePolicyConditionallyAsync(Stream fileStream, string blobLeaseId, CancellationToken cancellationToken = default)
         {
-            if (blobLeaseId == "CorrectLeaseId" && !filepath.Contains("error/blobstorageleaselockwritefail"))
+            if (blobLeaseId == "CorrectLeaseId" && !Filepath.Contains("error/blobstorageleaselockwritefail"))
             {
-                return await WriteStreamToTestDataFolder(filepath, fileStream);
+                return await WriteStreamToTestDataFolder(Filepath, fileStream);
             }
 
             throw new RequestFailedException((int)HttpStatusCode.PreconditionFailed, "The condition specified using HTTP conditional header(s) is not met.");
         }
 
         /// <inheritdoc/>
-        public Task<string> TryAcquireBlobLease(string filepath)
+        public Task<string> TryAcquireBlobLease(CancellationToken cancellationToken = default)
         {
-            if (filepath.Contains("error/blobstoragegetleaselockfail"))
+            if (Filepath.Contains("error/blobstoragegetleaselockfail"))
             {
                 return Task.FromResult((string)null);
-            }   
+            }
 
             return Task.FromResult("CorrectLeaseId");
         }
 
         /// <inheritdoc/>
-        public void ReleaseBlobLease(string filepath, string leaseId)
+        public void ReleaseBlobLease(string leaseId, CancellationToken cancellationToken = default)
         {
         }
 
         /// <inheritdoc/>
-        public Task<bool> PolicyExistsAsync(string filepath)
+        public Task<bool> PolicyExistsAsync(CancellationToken cancellationToken = default)
         {
-            string fullpath = Path.Combine(GetDataInputBlobPath(), filepath);
+            string fullpath = Path.Combine(GetDataInputBlobPath(), Filepath);
 
             if (File.Exists(fullpath))
             {
                 return Task.FromResult(true);
             }
 
-            _logger.LogWarning("Policy not found for full path" + fullpath);
+            Logger.LogWarning("Policy not found for full path" + fullpath);
 
             return Task.FromResult(false);
         }
 
         private static string GetDataOutputBlobPath()
         {
-            string unitTestFolder = Path.GetDirectoryName(new Uri(typeof(PolicyRepositoryMock).Assembly.Location).LocalPath);
-            return Path.Combine(unitTestFolder, "..", "..", "..", "Data", "blobs", "output");
+            return Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Data", "blobs", "output");
+
         }
 
         private static string GetDataInputBlobPath()
         {
-            string unitTestFolder = Path.GetDirectoryName(new Uri(typeof(PolicyRepositoryMock).Assembly.Location).LocalPath);
-            return Path.Combine(unitTestFolder, "..", "..", "..", "Data", "blobs", "input");
+            return Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Data", "blobs", "input");
         }
 
         private static Stream GetTestDataStream(string filepath)
diff --git a/test/Altinn.AccessManagement.Tests/PolicyAdministrationPointTest.cs b/test/Altinn.AccessManagement.Tests/PolicyAdministrationPointTest.cs
index 7688129d5..0678d5121 100644
--- a/test/Altinn.AccessManagement.Tests/PolicyAdministrationPointTest.cs
+++ b/test/Altinn.AccessManagement.Tests/PolicyAdministrationPointTest.cs
@@ -27,7 +27,7 @@ namespace Altinn.AccessManagement.Tests
     public class PolicyAdministrationPointTest
     {
         private readonly IPolicyAdministrationPoint _pap;
-        private readonly IPolicyRepository _prp;
+        private readonly IPolicyFactory _prp;
         private readonly IDelegationChangeEventQueue _eventQueue;
         private readonly Mock<ILogger<IPolicyAdministrationPoint>> _logger;
         private DelegationMetadataRepositoryMock _delegationMetadataRepositoryMock;
@@ -45,7 +45,7 @@ public PolicyAdministrationPointTest()
 
             _logger = new Mock<ILogger<IPolicyAdministrationPoint>>();
             _delegationMetadataRepositoryMock = new DelegationMetadataRepositoryMock();
-            _prp = new PolicyRepositoryMock(new Mock<ILogger<PolicyRepositoryMock>>().Object);
+            _prp = new PolicyFactoryMock(new Mock<ILogger<PolicyRepositoryMock>>().Object);
             _eventQueue = new DelegationChangeEventQueueMock();
             _pap = new PolicyAdministrationPoint(
                 new PolicyRetrievalPoint(_prp, memoryCache, Options.Create(new CacheConfig { PolicyCacheTimeout = 1 })),
@@ -141,7 +141,7 @@ public async Task TryDeleteDelegationPolicyRules_Valid()
             {
                 TestDataUtil.GetRequestToDeleteModel(performedByUserId, offeredByPartyId, "org1", "app3", new List<string> { "0d0c8570-64fb-49f9-9f7d-45c057fddf94", "6f11dd0b-5e5d-4bd1-85f0-9796300dfded" }, coveredByUserId: coveredBy),
                 TestDataUtil.GetRequestToDeleteModel(performedByUserId, offeredByPartyId, "org2", "app3", new List<string> { "244278c1-7c6b-4f6b-b6e9-2bd41f84812f" }, coveredByUserId: coveredBy),
-                TestDataUtil.GetRequestToDeleteModel(performedByUserId, offeredByPartyId, "org1", "app4", new List<string> { "adfa64fa-5859-46e5-8d0d-62762082f3b9" }, coveredByUserId: coveredBy)                
+                TestDataUtil.GetRequestToDeleteModel(performedByUserId, offeredByPartyId, "org1", "app4", new List<string> { "adfa64fa-5859-46e5-8d0d-62762082f3b9" }, coveredByUserId: coveredBy)
             };
 
             List<Rule> expected = new List<Rule>
@@ -524,7 +524,7 @@ public async Task TryDeleteDelegationPolicyRules_PolicyPathInvalid()
                 TestDataUtil.GetRequestToDeleteModel(performedByUserId, offeredByPartyId, "org2", "app3", new List<string> { "244278c1-7c6b-4f6b-b6e9-2bd41f84812f" }, coveredByUserId: coveredBy),
                 TestDataUtil.GetRequestToDeleteModel(performedByUserId, offeredByPartyId, "org1", "app4", new List<string> { "ade3b138-7fa4-4c83-9306-8ec4a72c2daa" }, coveredByUserId: 0)
             };
-            
+
             List<Rule> expected = new List<Rule>
             {
                 TestDataUtil.GetRuleModel(performedByUserId, offeredByPartyId, coveredBy.ToString(), coveredByType, "read", "org1", "app3", createdSuccessfully: true),
@@ -1244,7 +1244,7 @@ public async Task TryWriteDelegationPolicyRules_UnknownResource_PartialSuccess()
 
             List<Rule> unsortedRules = new List<Rule>
             {
-                TestDataUtil.GetRuleModel(delegatedByUserId, offeredByPartyId, coveredBy, coveredByType, "read", "org1", "app1"), 
+                TestDataUtil.GetRuleModel(delegatedByUserId, offeredByPartyId, coveredBy, coveredByType, "read", "org1", "app1"),
                 TestDataUtil.GetRuleModel(delegatedByUserId, offeredByPartyId, coveredBy, coveredByType, "read", "org2", "app1"),
                 TestDataUtil.GetRuleModel(delegatedByUserId, offeredByPartyId, coveredBy, coveredByType, "sign", "org1", "app1", "task1"),
                 TestDataUtil.GetRuleModel(delegatedByUserId, offeredByPartyId, coveredBy, coveredByType, "read", "org1", "app1", task: null, "event1") // This should fail all rules for org1, app1 as there is no event1 resource in the App Policy for this app
diff --git a/test/Altinn.AccessManagement.Tests/Resolvers/ResolverServiceCollection.cs b/test/Altinn.AccessManagement.Tests/Resolvers/ResolverServiceCollection.cs
index 6600965a1..15f57a8a7 100644
--- a/test/Altinn.AccessManagement.Tests/Resolvers/ResolverServiceCollection.cs
+++ b/test/Altinn.AccessManagement.Tests/Resolvers/ResolverServiceCollection.cs
@@ -46,7 +46,7 @@ public static void DefaultServiceCollection(IServiceCollection services)
         services.AddSingleton<IContextRetrievalService, ContextRetrievalService>();
         services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
         services.AddSingleton<IDelegationMetadataRepository, DelegationMetadataRepositoryMock>();
-        services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+        services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
         services.AddSingleton<IPublicSigningKeyProvider, SigningKeyResolverMock>();
         services.AddSingleton<IPartiesClient, PartiesClientMock>();
         services.AddSingleton<IProfileClient, ProfileClientMock>();
diff --git a/test/Altinn.AccessManagement.Tests/Utils/SetupUtils.cs b/test/Altinn.AccessManagement.Tests/Utils/SetupUtils.cs
index aad4f2c32..1107cedc0 100644
--- a/test/Altinn.AccessManagement.Tests/Utils/SetupUtils.cs
+++ b/test/Altinn.AccessManagement.Tests/Utils/SetupUtils.cs
@@ -33,7 +33,7 @@ public static HttpClient GetTestClient(CustomWebApplicationFactory<DelegationReq
                 {
                     services.AddSingleton<IPolicyRetrievalPoint, PolicyRetrievalPointMock>();
                     services.AddSingleton<IDelegationMetadataRepository, DelegationMetadataRepositoryMock>();
-                    services.AddSingleton<IPolicyRepository, PolicyRepositoryMock>();
+                    services.AddSingleton<IPolicyFactory, PolicyFactoryMock>();
                     services.AddSingleton<IDelegationChangeEventQueue, DelegationChangeEventQueueMock>();
                     services.AddSingleton<IPostConfigureOptions<JwtCookieOptions>, JwtCookiePostConfigureOptionsStub>();
                     services.AddSingleton<IPartiesClient, PartiesClientMock>();