diff --git a/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
index b31101c334..4c4fdd5415 100644
--- a/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/CompanyDataBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -472,7 +471,7 @@ public async Task ApproveCredential(Guid credentialId, CancellationToken cancell
             throw new ConflictException("The VerifiedCredentialExternalTypeUseCaseDetail must be set");
         }
 
-        var typeValue = data.Type.GetEnumValue() ?? throw new UnexpectedConditionException($"VerifiedCredentialType {data.Type.ToString()} does not exists");
+        var typeValue = data.Type.GetEnumValue() ?? throw new UnexpectedConditionException($"VerifiedCredentialType {data.Type} does not exists");
         var content = JsonSerializer.Serialize(new { Type = data.Type, CredentialId = credentialId }, Options);
         _portalRepositories.GetInstance<INotificationRepository>().CreateNotification(data.RequesterData.RequesterId, NotificationTypeId.CREDENTIAL_APPROVAL, false, n =>
             {
@@ -540,7 +539,7 @@ public async Task RejectCredential(Guid credentialId)
             throw new ConflictException($"Credential {credentialId} must be {CompanySsiDetailStatusId.PENDING}");
         }
 
-        var typeValue = type.GetEnumValue() ?? throw new UnexpectedConditionException($"VerifiedCredentialType {type.ToString()} does not exists");
+        var typeValue = type.GetEnumValue() ?? throw new UnexpectedConditionException($"VerifiedCredentialType {type} does not exists");
         var content = JsonSerializer.Serialize(new { Type = type, CredentialId = credentialId }, Options);
         _portalRepositories.GetInstance<INotificationRepository>().CreateNotification(requesterId, NotificationTypeId.CREDENTIAL_REJECTED, false, n =>
             {
diff --git a/src/administration/Administration.Service/BusinessLogic/ConnectorsBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/ConnectorsBusinessLogic.cs
index 236d7a3e6e..0e4c64fa16 100644
--- a/src/administration/Administration.Service/BusinessLogic/ConnectorsBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/ConnectorsBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/administration/Administration.Service/BusinessLogic/IIdentityProviderBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IIdentityProviderBusinessLogic.cs
index 8fbf210953..fe00780d27 100644
--- a/src/administration/Administration.Service/BusinessLogic/IIdentityProviderBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/IIdentityProviderBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -36,7 +35,6 @@ public interface IIdentityProviderBusinessLogic
     IAsyncEnumerable<UserIdentityProviderData> GetOwnCompanyUsersIdentityProviderDataAsync(IEnumerable<Guid> identityProviderIds, bool unlinkedUsersOnly);
     (Stream FileStream, string ContentType, string FileName, Encoding Encoding) GetOwnCompanyUsersIdentityProviderLinkDataStream(IEnumerable<Guid> identityProviderIds, bool unlinkedUsersOnly);
     ValueTask<IdentityProviderUpdateStats> UploadOwnCompanyUsersIdentityProviderLinkDataAsync(IFormFile document, CancellationToken cancellationToken);
-    ValueTask<UserIdentityProviderLinkData> CreateOwnCompanyUserIdentityProviderLinkDataAsync(Guid companyUserId, UserIdentityProviderLinkData identityProviderLinkData);
     ValueTask<UserIdentityProviderLinkData> CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync(Guid companyUserId, Guid identityProviderId, UserLinkData userLinkData);
     ValueTask<UserIdentityProviderLinkData> GetOwnCompanyUserIdentityProviderLinkDataAsync(Guid companyUserId, Guid identityProviderId);
     ValueTask DeleteOwnCompanyUserIdentityProviderDataAsync(Guid companyUserId, Guid identityProviderId);
diff --git a/src/administration/Administration.Service/BusinessLogic/IPartnerNetworkBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IPartnerNetworkBusinessLogic.cs
index 17ef29b9fa..f05681b97b 100644
--- a/src/administration/Administration.Service/BusinessLogic/IPartnerNetworkBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/IPartnerNetworkBusinessLogic.cs
@@ -26,6 +26,6 @@ public interface IPartnerNetworkBusinessLogic
         /// Get all member activecompanies bpn
         /// </summary>
         /// <param name="bpnIds">Ids of BPN</param>
-        IAsyncEnumerable<string?> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds);
+        IAsyncEnumerable<string> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds);
     }
 }
diff --git a/src/administration/Administration.Service/BusinessLogic/IUserBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IUserBusinessLogic.cs
index 17b8904bb9..635323ff3e 100644
--- a/src/administration/Administration.Service/BusinessLogic/IUserBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/IUserBusinessLogic.cs
@@ -31,8 +31,6 @@ public interface IUserBusinessLogic
     IAsyncEnumerable<string> CreateOwnCompanyUsersAsync(IEnumerable<UserCreationInfo> userList);
     Task<Guid> CreateOwnCompanyIdpUserAsync(Guid identityProviderId, UserCreationInfoIdp userCreationInfo);
     Task<Pagination.Response<CompanyUserData>> GetOwnCompanyUserDatasAsync(int page, int size, GetOwnCompanyUsersFilter filter);
-    [Obsolete("to be replaced by UserRolesBusinessLogic.GetAppRolesAsync. Remove as soon frontend is adjusted")]
-    IAsyncEnumerable<ClientRoles> GetClientRolesAsync(Guid appId, string? languageShortName = null);
     Task<CompanyUserDetailData> GetOwnCompanyUserDetailsAsync(Guid userId);
     Task<int> AddOwnCompanyUsersBusinessPartnerNumbersAsync(Guid userId, IEnumerable<string> businessPartnerNumbers);
     Task<int> AddOwnCompanyUsersBusinessPartnerNumberAsync(Guid userId, string businessPartnerNumber);
diff --git a/src/administration/Administration.Service/BusinessLogic/IUserRolesBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IUserRolesBusinessLogic.cs
index 76f6022206..b541e243f1 100644
--- a/src/administration/Administration.Service/BusinessLogic/IUserRolesBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/IUserRolesBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -45,13 +44,4 @@ public interface IUserRolesBusinessLogic
     /// <param name="roles"></param>
     /// <returns>messages</returns>
     Task<IEnumerable<UserRoleWithId>> ModifyAppUserRolesAsync(Guid appId, Guid companyUserId, IEnumerable<string> roles);
-
-    /// <summary>
-    /// Update Role to User
-    /// </summary>
-    /// <param name="appId">app Id</param>
-    /// <param name="userRoleInfo">User and Role Information like CompanyUser Id and Role Name</param>
-    /// <returns>messages</returns>
-    [Obsolete("to be replaced by endpoint UserRolesBusinessLogic.ModifyAppUserRolesAsync. Remove as soon frontend is adjusted")]
-    Task<IEnumerable<UserRoleWithId>> ModifyUserRoleAsync(Guid appId, UserRoleInfo userRoleInfo);
 }
diff --git a/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs
index 9794ba5fd2..87a4109617 100644
--- a/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs
@@ -150,7 +150,7 @@ private async ValueTask<IdentityProviderDetails> CreateOwnCompanyIdentityProvide
         {
             IamIdentityProviderProtocol.OIDC => await GetIdentityProviderDetailsOidc(identityProviderId, alias, IdentityProviderCategoryId.KEYCLOAK_OIDC, typeId, null).ConfigureAwait(false),
             IamIdentityProviderProtocol.SAML => await GetIdentityProviderDetailsSaml(identityProviderId, alias, typeId).ConfigureAwait(false),
-            _ => throw new UnexpectedConditionException($"unexpected value of protocol: '{protocol.ToString()}'")
+            _ => throw new UnexpectedConditionException($"unexpected value of protocol: '{protocol}'")
         };
     }
 
@@ -268,7 +268,7 @@ public async ValueTask<IdentityProviderDetails> UpdateOwnCompanyIdentityProvider
                 await UpdateIdentityProviderSaml(alias, details).ConfigureAwait(false);
                 return await GetIdentityProviderDetailsSaml(identityProviderId, alias, typeId).ConfigureAwait(false);
             default:
-                throw new ControllerArgumentException($"unexpected value for category '{category.ToString()}' of identityProvider '{identityProviderId}'");
+                throw new ControllerArgumentException($"unexpected value for category '{category}' of identityProvider '{identityProviderId}'");
         }
     }
 
@@ -587,32 +587,6 @@ private async ValueTask<IdentityProviderDetails> GetIdentityProviderDetailsSaml(
         };
     }
 
-    public async ValueTask<UserIdentityProviderLinkData> CreateOwnCompanyUserIdentityProviderLinkDataAsync(Guid companyUserId, UserIdentityProviderLinkData identityProviderLinkData)
-    {
-        var companyId = _identityData.CompanyId;
-        var (iamUserId, alias) = await GetUserAliasDataAsync(companyUserId, identityProviderLinkData.identityProviderId, companyId).ConfigureAwait(false);
-
-        try
-        {
-            await _provisioningManager.AddProviderUserLinkToCentralUserAsync(
-                iamUserId,
-                new IdentityProviderLink(
-                    alias,
-                    identityProviderLinkData.userId,
-                    identityProviderLinkData.userName))
-                .ConfigureAwait(false);
-        }
-        catch (KeycloakEntityConflictException ce)
-        {
-            throw new ConflictException($"identityProviderLink for identityProvider {identityProviderLinkData.identityProviderId} already exists for user {companyUserId}", ce);
-        }
-
-        return new UserIdentityProviderLinkData(
-            identityProviderLinkData.identityProviderId,
-            identityProviderLinkData.userId,
-            identityProviderLinkData.userName);
-    }
-
     public async ValueTask<UserIdentityProviderLinkData> CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync(Guid companyUserId, Guid identityProviderId, UserLinkData userLinkData)
     {
         var companyId = _identityData.CompanyId;
diff --git a/src/administration/Administration.Service/BusinessLogic/NetworkBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/NetworkBusinessLogic.cs
index 0d8b899652..a32dfb555a 100644
--- a/src/administration/Administration.Service/BusinessLogic/NetworkBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/NetworkBusinessLogic.cs
@@ -275,7 +275,7 @@ await data.ValidateDatabaseData(
                         },
                         out var idpAliasDataTask)
                 ? await idpAliasDataTask!.ConfigureAwait(false)
-                : (IDictionary<Guid, string>?)null;
+                : default(IDictionary<Guid, string>?);
 
         var idpIds = idpAliase?.Keys ?? Enumerable.Empty<Guid>();
         var allIdpIds = singleIdpAlias == null
diff --git a/src/administration/Administration.Service/BusinessLogic/PartnerNetworkBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/PartnerNetworkBusinessLogic.cs
index 819436a29f..362fb69d50 100644
--- a/src/administration/Administration.Service/BusinessLogic/PartnerNetworkBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/PartnerNetworkBusinessLogic.cs
@@ -37,6 +37,6 @@ public PartnerNetworkBusinessLogic(IPortalRepositories portalRepositories)
     }
 
     /// <inheritdoc/>
-    public IAsyncEnumerable<string?> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds) =>
-        _portalRepositories.GetInstance<ICompanyRepository>().GetAllMemberCompaniesBPNAsync(bpnIds);
+    public IAsyncEnumerable<string> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds) =>
+        _portalRepositories.GetInstance<ICompanyRepository>().GetAllMemberCompaniesBPNAsync(bpnIds?.Select(x => x.ToUpper()));
 }
diff --git a/src/administration/Administration.Service/BusinessLogic/RegistrationStatusBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/RegistrationStatusBusinessLogic.cs
index b2ab0d625f..e4329c10fa 100644
--- a/src/administration/Administration.Service/BusinessLogic/RegistrationStatusBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/RegistrationStatusBusinessLogic.cs
@@ -20,14 +20,13 @@
 
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Encryption;
 using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 
@@ -60,40 +59,33 @@ public async Task SetCallbackAddress(OnboardingServiceProviderCallbackRequestDat
             throw new ForbiddenException($"Only {CompanyRoleId.ONBOARDING_SERVICE_PROVIDER} are allowed to set the callback url");
         }
 
-        using var aes = Aes.Create();
-        aes.Key = Encoding.UTF8.GetBytes(_settings.EncryptionKey);
-        aes.Mode = CipherMode.ECB;
-        aes.Padding = PaddingMode.PKCS7;
-        var encryptor = aes.CreateEncryptor(aes.Key, aes.IV);
-        using (var memoryStream = new MemoryStream())
+        var cryptoConfig = _settings.EncryptionConfigs.SingleOrDefault(x => x.Index == _settings.EncrptionConfigIndex) ?? throw new ConfigurationException($"EncryptionModeIndex {_settings.EncrptionConfigIndex} is not configured");
+        var (secret, initializationVector) = CryptoHelper.Encrypt(requestData.ClientSecret, Convert.FromHexString(cryptoConfig.EncryptionKey), cryptoConfig.CipherMode, cryptoConfig.PaddingMode);
+
+        if (ospDetails != null)
+        {
+            companyRepository.AttachAndModifyOnboardingServiceProvider(companyId, osp =>
+                {
+                    osp.CallbackUrl = ospDetails.CallbackUrl;
+                    osp.AuthUrl = ospDetails.AuthUrl;
+                    osp.ClientId = ospDetails.ClientId;
+                    osp.ClientSecret = ospDetails.ClientSecret;
+                    osp.EncryptionMode = ospDetails.EncryptionMode;
+                    osp.InitializationVector = ospDetails.InitializationVector;
+                },
+                osp =>
+                {
+                    osp.CallbackUrl = requestData.CallbackUrl;
+                    osp.AuthUrl = requestData.AuthUrl;
+                    osp.ClientId = requestData.ClientId;
+                    osp.ClientSecret = secret;
+                    osp.EncryptionMode = cryptoConfig.Index;
+                    osp.InitializationVector = initializationVector;
+                });
+        }
+        else
         {
-            using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
-            {
-                using var sw = new StreamWriter(cryptoStream, Encoding.UTF8);
-                sw.Write(requestData.ClientSecret);
-            }
-            var secret = memoryStream.ToArray();
-            if (ospDetails != null)
-            {
-                companyRepository.AttachAndModifyOnboardingServiceProvider(companyId, osp =>
-                    {
-                        osp.CallbackUrl = ospDetails.CallbackUrl;
-                        osp.AuthUrl = ospDetails.AuthUrl;
-                        osp.ClientId = ospDetails.ClientId;
-                        osp.ClientSecret = secret;
-                    },
-                    osp =>
-                    {
-                        osp.CallbackUrl = requestData.CallbackUrl;
-                        osp.AuthUrl = requestData.AuthUrl;
-                        osp.ClientId = requestData.ClientId;
-                        osp.ClientSecret = secret;
-                    });
-            }
-            else
-            {
-                companyRepository.CreateOnboardingServiceProviderDetails(companyId, requestData.CallbackUrl, requestData.AuthUrl, requestData.ClientId, secret);
-            }
+            companyRepository.CreateOnboardingServiceProviderDetails(companyId, requestData.CallbackUrl, requestData.AuthUrl, requestData.ClientId, secret, initializationVector, cryptoConfig.Index);
         }
         await _portalRepositories.SaveAsync().ConfigureAwait(false);
     }
diff --git a/src/administration/Administration.Service/BusinessLogic/UserBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/UserBusinessLogic.cs
index f35bdf0b02..33166440ed 100644
--- a/src/administration/Administration.Service/BusinessLogic/UserBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/UserBusinessLogic.cs
@@ -123,13 +123,13 @@ private async IAsyncEnumerable<string> CreateOwnCompanyUsersInternalAsync(IEnume
 
         var companyDisplayName = await _userProvisioningService.GetIdentityProviderDisplayName(companyNameIdpAliasData.IdpAlias).ConfigureAwait(false);
 
-        await foreach (var (_, userName, password, error) in _userProvisioningService.CreateOwnCompanyIdpUsersAsync(companyNameIdpAliasData, userCreationInfoIdps).ConfigureAwait(false))
+        await foreach (var (companyUserId, userName, password, error) in _userProvisioningService.CreateOwnCompanyIdpUsersAsync(companyNameIdpAliasData, userCreationInfoIdps).ConfigureAwait(false))
         {
             var email = emailData[userName];
 
             if (error != null)
             {
-                _logger.LogError(error, "Error while creating user {UserName} ({Email})", userName, email);
+                _logger.LogError(error, "Error while creating user {companyUserId}", companyUserId);
                 continue;
             }
 
@@ -148,7 +148,7 @@ private async IAsyncEnumerable<string> CreateOwnCompanyUsersInternalAsync(IEnume
             }
             catch (Exception e)
             {
-                _logger.LogError(e, "Error sending email to {Email} after creating user {UserName}", email, userName);
+                _logger.LogError(e, "Error sending email after creating user {companyUserId}", companyUserId);
             }
 
             yield return email;
@@ -220,7 +220,7 @@ public async Task<Guid> CreateOwnCompanyIdpUserAsync(Guid identityProviderId, Us
         }
         catch (Exception e)
         {
-            _logger.LogError(e, "Error sending email to {Email} after creating user {UserName}", userCreationInfo.Email, userCreationInfo.UserName);
+            _logger.LogError(e, "Error sending email after creating user {CompanyUserId}", result.CompanyUserId);
         }
 
         return result.CompanyUserId;
@@ -272,26 +272,6 @@ public async Task<Guid> CreateOwnCompanyIdpUserAsync(Guid identityProviderId, Us
 
     private async Task<string> GetDisplayName(string alias) => await _provisioningManager.GetIdentityProviderDisplayName(alias).ConfigureAwait(false) ?? throw new ConflictException($"Display Name should not be null for alias: {alias}");
 
-    [Obsolete("to be replaced by UserRolesBusinessLogic.GetAppRolesAsync. Remove as soon frontend is adjusted")]
-    public async IAsyncEnumerable<ClientRoles> GetClientRolesAsync(Guid appId, string? languageShortName = null)
-    {
-        var appRepository = _portalRepositories.GetInstance<IOfferRepository>();
-        if (!await appRepository.CheckAppExistsById(appId).ConfigureAwait(false))
-        {
-            throw new NotFoundException($"app {appId} does not found");
-        }
-
-        if (languageShortName != null && !await _portalRepositories.GetInstance<ILanguageRepository>().IsValidLanguageCode(languageShortName))
-        {
-            throw new ArgumentException($"language {languageShortName} does not exist");
-        }
-
-        await foreach (var roles in appRepository.GetClientRolesAsync(appId, languageShortName ?? Constants.DefaultLanguage).ConfigureAwait(false))
-        {
-            yield return new ClientRoles(roles.RoleId, roles.Role, roles.Description);
-        }
-    }
-
     public async Task<CompanyUserDetailData> GetOwnCompanyUserDetailsAsync(Guid userId)
     {
         var companyId = _identityData.CompanyId;
diff --git a/src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs
index 67e9721271..68f008dbe2 100644
--- a/src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs
@@ -116,15 +116,6 @@ public Task<IEnumerable<UserRoleWithId>> ModifyAppUserRolesAsync(Guid appId, Gui
                 }, _options), NotificationTypeId.ROLE_UPDATE_APP_OFFER);
             });
 
-    [Obsolete("to be replaced by endpoint UserRolesBusinessLogic.ModifyAppUserRolesAsync. Remove as soon frontend is adjusted")]
-    public Task<IEnumerable<UserRoleWithId>> ModifyUserRoleAsync(Guid appId, UserRoleInfo userRoleInfo) =>
-        ModifyUserRolesInternal(
-            () => _portalRepositories.GetInstance<IUserRepository>()
-                .GetAppAssignedIamClientUserDataUntrackedAsync(appId, userRoleInfo.CompanyUserId, _identityData.CompanyId),
-            (Guid companyUserId, IEnumerable<string> roles, Guid offerId) => _portalRepositories.GetInstance<IUserRolesRepository>()
-                .GetAssignedAndMatchingAppRoles(companyUserId, roles, offerId).Select(x => new UserRoleModificationData(x.UserRoleText, x.RoleId, x.IsAssigned, true)),
-            appId, userRoleInfo.CompanyUserId, userRoleInfo.Roles, _identityData.CompanyId, null);
-
     private async Task<IEnumerable<UserRoleWithId>> ModifyUserRolesInternal(
         Func<Task<OfferIamUserData?>> getIamUserData,
         Func<Guid, IEnumerable<string>, Guid, IAsyncEnumerable<UserRoleModificationData>> getUserRoleModificationData,
@@ -211,13 +202,14 @@ await _provisioningManager.AssignClientRolesToCentralUserAsync(iamUserId, client
             // Assign the roles in keycloak, check if all roles were added foreach client, if not throw an exception with the client and the roles that were not assigned. 
             .Select(assigned => (
                 Client: assigned.Client,
-                UnassingedRoles: rolesToAdd.ExceptBy(assigned.Roles, toAdd => toAdd.CompanyUserRoleText)))
+                UnassingedRoles: rolesToAdd.ExceptBy(assigned.Roles, toAdd => toAdd.CompanyUserRoleText),
+                Error: assigned.Error))
             .Where(x => x.UnassingedRoles.Any())
             .IfAny(async unassigned =>
                 throw new ServiceException($"The following roles could not be added to the clients: \n {string.Join(
                         "\n",
                         await unassigned
-                            .Select(item => $"Client: {item.Client}, Roles: {string.Join(", ", item.UnassingedRoles.Select(r => r.CompanyUserRoleText))}")
+                            .Select(item => $"Client: {item.Client}, Roles: {string.Join(", ", item.UnassingedRoles.Select(r => r.CompanyUserRoleText))}, Error: {item.Error?.Message}")
                             .ToListAsync()
                             .ConfigureAwait(false))}"))
             .ConfigureAwait(false);
diff --git a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs
index 99e3e8b5cc..52bfbc1929 100644
--- a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs
+++ b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -299,43 +298,6 @@ public IActionResult GetOwnCompanyUsersIdentityProviderFileAsync([FromQuery] IEn
     public ValueTask<IdentityProviderUpdateStats> UploadOwnCompanyUsersIdentityProviderFileAsync([FromForm(Name = "document")] IFormFile document, CancellationToken cancellationToken) =>
         _businessLogic.UploadOwnCompanyUsersIdentityProviderLinkDataAsync(document, cancellationToken);
 
-    /// <summary>
-    /// Adds the user to the given identity provider
-    /// </summary>
-    /// <param name="companyUserId">Id of the company user</param>
-    /// <param name="identityProviderLinkData">The link data for the identity provider</param>
-    /// <returns>Returns the link data</returns>
-    /// <remarks>
-    /// Example: POST: api/administration/identityprovider/owncompany/users/A744E2AA-55AA-4511-9F42-80371220BE26/identityprovider
-    /// </remarks>
-    /// <response code="200">Returns the link data.</response>
-    /// <response code="400">user is not associated with a company.</response>
-    /// <response code="403">user does not belong to company of companyUserId.</response>
-    /// <response code="404">companyUserId does not exist.</response>
-    /// <response code="409">identityProviderLink for identityProvider already exists for user.</response>
-    /// <response code="500">companyUserId is not linked to keycloak</response>
-    /// <response code="502">Bad Gateway Service Error.</response>
-    [Obsolete("use CreateOrUpdateOwnCompanyUserIdentityProviderDataAsync (PUT api/administration/identityprovider/owncompany/users/{companyUserId/identityprovider/{identityProviderId}) instead")]
-    [HttpPost]
-    [Authorize(Roles = "modify_user_account")]
-    [Authorize(Policy = PolicyTypes.ValidCompany)]
-    [Route("owncompany/users/{companyUserId}/identityprovider")]
-    [ProducesResponseType(typeof(UserIdentityProviderLinkData), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status403Forbidden)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status404NotFound)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status409Conflict)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status502BadGateway)]
-    public async ValueTask<ActionResult<UserIdentityProviderLinkData>> AddOwnCompanyUserIdentityProviderDataAsync([FromRoute] Guid companyUserId, [FromBody] UserIdentityProviderLinkData identityProviderLinkData)
-    {
-        var linkData = await _businessLogic.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, identityProviderLinkData).ConfigureAwait(false);
-        return (ActionResult<UserIdentityProviderLinkData>)CreatedAtRoute(
-            nameof(GetOwnCompanyUserIdentityProviderDataAsync),
-            new { companyUserId = companyUserId, identityProviderId = linkData.identityProviderId },
-            linkData);
-    }
-
     /// <summary>
     /// Updates the given user for the given identity provider
     /// </summary>
@@ -421,6 +383,6 @@ public ValueTask<UserIdentityProviderLinkData> GetOwnCompanyUserIdentityProvider
     public async ValueTask<ActionResult> DeleteOwnCompanyUserIdentityProviderDataAsync([FromRoute] Guid companyUserId, [FromRoute] Guid identityProviderId)
     {
         await _businessLogic.DeleteOwnCompanyUserIdentityProviderDataAsync(companyUserId, identityProviderId).ConfigureAwait(false);
-        return (ActionResult)NoContent();
+        return NoContent();
     }
 }
diff --git a/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs b/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs
index c13bdb39a3..32738526d8 100644
--- a/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs
+++ b/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs
@@ -58,6 +58,6 @@ public PartnerNetworkController(IPartnerNetworkBusinessLogic logic)
     [Route("memberCompanies")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [PublicUrl(CompanyRoleId.ACTIVE_PARTICIPANT, CompanyRoleId.SERVICE_PROVIDER, CompanyRoleId.APP_PROVIDER)]
-    public IAsyncEnumerable<string?> GetAllMemberCompaniesBPNAsync([FromQuery] IEnumerable<string>? bpnIds = null) =>
+    public IAsyncEnumerable<string> GetAllMemberCompaniesBPNAsync([FromQuery] IEnumerable<string>? bpnIds = null) =>
         _logic.GetAllMemberCompaniesBPNAsync(bpnIds);
 }
diff --git a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs
index 90aa534b11..824449b1a8 100644
--- a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs
+++ b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -125,7 +124,7 @@ public Task<ServiceAccountConnectorOfferData> GetServiceAccountDetails([FromRout
     /// <response code="404">Record was not found. Service account is either not existing or not connected to the respective company.</response>
     /// <response code="409">Undefined client for service account.</response>
     [HttpPut]
-    [Authorize(Roles = "add_tech_user_management")] // TODO check whether we also want an edit role
+    [Authorize(Roles = "add_tech_user_management")]
     [Authorize(Policy = PolicyTypes.ValidCompany)]
     [Route("owncompany/serviceaccounts/{serviceAccountId}")]
     [ProducesResponseType(typeof(ServiceAccountDetails), StatusCodes.Status200OK)]
diff --git a/src/administration/Administration.Service/Controllers/UserController.cs b/src/administration/Administration.Service/Controllers/UserController.cs
index e5335d751a..ebf267b711 100644
--- a/src/administration/Administration.Service/Controllers/UserController.cs
+++ b/src/administration/Administration.Service/Controllers/UserController.cs
@@ -367,26 +367,6 @@ public IAsyncEnumerable<OfferRoleInfos> GetCoreOfferRoles([FromQuery] string? la
     public IAsyncEnumerable<OfferRoleInfo> GetAppRolesAsync([FromRoute] Guid appId, [FromQuery] string? languageShortName = null) =>
         _rolesLogic.GetAppRolesAsync(appId, languageShortName);
 
-    /// <summary>
-    /// Gets the client roles for the given app.
-    /// </summary>
-    /// <param name="appId" example="D3B1ECA2-6148-4008-9E6C-C1C2AEA5C645">Id of the app which roles should be returned.</param>
-    /// <param name="languageShortName">OPTIONAL: The language short name.</param>
-    /// <returns>Returns the client roles for the given app.</returns>
-    /// <remarks>Example: GET: api/administration/user/app/D3B1ECA2-6148-4008-9E6C-C1C2AEA5C645/roles</remarks>
-    /// <response code="200">Returns the client roles.</response>
-    /// <response code="400">The language does not exist.</response>
-    /// <response code="404">The app was not found.</response>
-    [Obsolete("to be replaced by endpoint /user/owncompany/roles/apps/{appid}. Remove as soon frontend is adjusted")]
-    [HttpGet]
-    [Authorize(Roles = "view_client_roles")]
-    [Route("app/{appId}/roles")]
-    [ProducesResponseType(typeof(IAsyncEnumerable<ClientRoles>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status404NotFound)]
-    public IAsyncEnumerable<ClientRoles> GetClientRolesAsync([FromRoute] Guid appId, string? languageShortName = null) =>
-        _logic.GetClientRolesAsync(appId, languageShortName);
-
     /// <summary>
     /// Gets the user details for the current user.
     /// </summary>
@@ -481,27 +461,6 @@ public Task<int> DeleteOwnUser([FromRoute] Guid companyUserId) =>
                 roleName,
                 hasRole));
 
-    /// <summary>
-    /// Updates the roles for the user
-    /// </summary>
-    /// <param name="appId" example="D3B1ECA2-6148-4008-9E6C-C1C2AEA5C645">Id of the application</param>
-    /// <param name="userRoleInfo"></param>
-    /// <returns></returns>
-    /// <remarks>Example: PUT: api/administration/user/app/D3B1ECA2-6148-4008-9E6C-C1C2AEA5C645/roles</remarks>
-    /// <response code="200">Roles got successfully updated user account.</response>
-    /// <response code="400">Invalid User roles for client</response>
-    /// <response code="404">User not found</response>
-    [Obsolete("to be replaced by endpoint /user/owncompany/users/{companyUserId}/apps/{appId}/roles. remove as soon frontend has been adjusted")]
-    [HttpPut]
-    [Authorize(Roles = "modify_user_account")]
-    [Authorize(Policy = PolicyTypes.ValidCompany)]
-    [Route("app/{appId}/roles")]
-    [ProducesResponseType(typeof(IEnumerable<UserRoleWithId>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status404NotFound)]
-    public Task<IEnumerable<UserRoleWithId>> ModifyUserRolesAsync([FromRoute] Guid appId, [FromBody] UserRoleInfo userRoleInfo) =>
-        _rolesLogic.ModifyUserRoleAsync(appId, userRoleInfo);
-
     /// <summary>
     /// Delete BPN assigned to user from DB and Keycloack.
     /// </summary>
diff --git a/src/administration/Administration.Service/Models/UserIdentityProviderData.cs b/src/administration/Administration.Service/Models/UserIdentityProviderData.cs
index 37796090b7..516e7b0739 100644
--- a/src/administration/Administration.Service/Models/UserIdentityProviderData.cs
+++ b/src/administration/Administration.Service/Models/UserIdentityProviderData.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/administration/Administration.Service/appsettings.json b/src/administration/Administration.Service/appsettings.json
index 9c23bd3e37..450bcd75ab 100644
--- a/src/administration/Administration.Service/appsettings.json
+++ b/src/administration/Administration.Service/appsettings.json
@@ -423,6 +423,14 @@
     "BasePortalAddress": ""
   },
   "OnboardingServiceProvider": {
-    "EncryptionKey": ""
+    "EncrptionConfigIndex": 0,
+    "EncryptionConfigs": [
+      {
+        "Index": 0,
+        "EncryptionKey": "",
+        "CipherMode": "",
+        "PaddingMode": ""
+      }
+    ]
   }
 }
diff --git a/src/externalsystems/Bpdm.Library/BpdmService.cs b/src/externalsystems/Bpdm.Library/BpdmService.cs
index 960e8ac9c8..0b7d48cae7 100644
--- a/src/externalsystems/Bpdm.Library/BpdmService.cs
+++ b/src/externalsystems/Bpdm.Library/BpdmService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 Microsoft and BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -52,7 +51,7 @@ public BpdmService(ITokenService tokenService, IOptions<BpdmServiceSettings> opt
     /// <inheritdoc />
     public async Task<bool> PutInputLegalEntity(BpdmTransferData data, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var requestData = new BpdmLegalEntityData[]
         {
@@ -119,7 +118,7 @@ await httpClient.PutAsJsonAsync("/companies/test-company/api/catena/input/busine
 
     public async Task<bool> SetSharingStateToReady(string externalId, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var content = new { externalIds = Enumerable.Repeat(externalId, 1) };
         await httpClient.PostAsJsonAsync("/companies/test-company/api/catena/sharing-state/ready", content, Options, cancellationToken)
@@ -129,7 +128,7 @@ await httpClient.PostAsJsonAsync("/companies/test-company/api/catena/sharing-sta
 
     public async Task<BpdmLegalEntityOutputData> FetchInputLegalEntity(string externalId, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var data = Enumerable.Repeat(externalId, 1);
         var result = await httpClient.PostAsJsonAsync("/companies/test-company/api/catena/output/business-partners/search", data, Options, cancellationToken)
@@ -154,7 +153,7 @@ public async Task<BpdmLegalEntityOutputData> FetchInputLegalEntity(string extern
 
     public async Task<BpdmSharingState> GetSharingState(Guid applicationId, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<BpdmService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var url = $"/companies/test-company/api/catena/sharing-state?externalIds={applicationId}";
         var result = await httpClient.GetAsync(url, cancellationToken)
diff --git a/src/externalsystems/Bpdm.Library/BusinessLogic/BpdmBusinessLogic.cs b/src/externalsystems/Bpdm.Library/BusinessLogic/BpdmBusinessLogic.cs
index a0759a69ea..d40e2f4c2e 100644
--- a/src/externalsystems/Bpdm.Library/BusinessLogic/BpdmBusinessLogic.cs
+++ b/src/externalsystems/Bpdm.Library/BusinessLogic/BpdmBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 Microsoft and BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -138,9 +137,6 @@ await HandlePullLegalEntityInternal(context, result.CompanyId, result.BpdmData,
             return new IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult(ProcessStepStatusId.TODO, null, null, null, false, null);
         }
 
-        // TODO: clarify whether it should be an error if businessPartnerNumber has been set locally while bpdm-answer was outstanding
-        // TODO: clarify whether it should be an error if address- or identifier-data returned by bpdm does not match what is stored in portal-db or modify in portal-db based on bpdm-response
-
         _portalRepositories.GetInstance<ICompanyRepository>().AttachAndModifyCompany(
             companyId,
             company =>
diff --git a/src/externalsystems/Clearinghouse.Library/ClearinghouseService.cs b/src/externalsystems/Clearinghouse.Library/ClearinghouseService.cs
index 830de1e220..2919dd8f8a 100644
--- a/src/externalsystems/Clearinghouse.Library/ClearinghouseService.cs
+++ b/src/externalsystems/Clearinghouse.Library/ClearinghouseService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 Microsoft and BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -40,7 +39,7 @@ public ClearinghouseService(ITokenService tokenService, IOptions<ClearinghouseSe
     /// <inheritdoc />
     public async Task TriggerCompanyDataPost(ClearinghouseTransferData data, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<ClearinghouseService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<ClearinghouseService>(_settings, cancellationToken).ConfigureAwait(false);
 
         async ValueTask<(bool, string?)> CreateErrorMessage(HttpResponseMessage errorResponse) =>
             (false, (await errorResponse.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false)));
diff --git a/src/externalsystems/Custodian.Library/CustodianService.cs b/src/externalsystems/Custodian.Library/CustodianService.cs
index 08a96fa66c..67b8e11601 100644
--- a/src/externalsystems/Custodian.Library/CustodianService.cs
+++ b/src/externalsystems/Custodian.Library/CustodianService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -50,7 +49,7 @@ public CustodianService(ITokenService tokenService, IDateTimeProvider dateTimePr
     /// <inhertidoc />
     public async Task<WalletData> GetWalletByBpnAsync(string bpn, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var result = await httpClient.GetAsync("/api/wallets".AppendToPathEncoded(bpn), cancellationToken)
             .CatchingIntoServiceExceptionFor("custodian-get", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
@@ -76,7 +75,7 @@ public async Task<WalletData> GetWalletByBpnAsync(string bpn, CancellationToken
     public async Task<string> CreateWalletAsync(string bpn, string name, CancellationToken cancellationToken)
     {
         const string walletUrl = "/api/wallets";
-        var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
         var requestBody = new { name = name, bpn = bpn };
         async ValueTask<(bool, string?)> CreateErrorMessage(HttpResponseMessage errorResponse) =>
             (false, (await errorResponse.Content.ReadFromJsonAsync<WalletErrorResponse>(Options, cancellationToken).ConfigureAwait(false))?.Message);
@@ -103,7 +102,7 @@ public async Task<string> CreateWalletAsync(string bpn, string name, Cancellatio
     /// <inhertidoc />
     public async Task<string> SetMembership(string bpn, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
         var requestBody = new { bpn = bpn };
 
         async ValueTask<(bool, string?)> CustomErrorHandling(HttpResponseMessage errorResponse) => (
@@ -121,7 +120,7 @@ public async Task<string> SetMembership(string bpn, CancellationToken cancellati
     /// <inheritdoc />
     public async Task TriggerFrameworkAsync(string bpn, UseCaseDetailData useCaseDetailData, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var requestBody = new CustodianFrameworkRequest
         (
@@ -138,7 +137,7 @@ await httpClient.PostAsJsonAsync("/api/credentials/issuer/framework", requestBod
     /// <inheritdoc />
     public async Task TriggerDismantlerAsync(string bpn, VerifiedCredentialTypeId credentialTypeId, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
+        using var httpClient = await _tokenService.GetAuthorizedClient<CustodianService>(_settings, cancellationToken).ConfigureAwait(false);
 
         var requestBody = new CustodianDismantlerRequest
         (
diff --git a/src/externalsystems/OfferProvider.Library/OfferProviderService.cs b/src/externalsystems/OfferProvider.Library/OfferProviderService.cs
index 951df01732..1890e32840 100644
--- a/src/externalsystems/OfferProvider.Library/OfferProviderService.cs
+++ b/src/externalsystems/OfferProvider.Library/OfferProviderService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -46,7 +45,7 @@ public OfferProviderService(ITokenService tokenService, IOptions<OfferProviderSe
     /// <inheritdoc />
     public async Task<bool> TriggerOfferProvider(OfferThirdPartyAutoSetupData autoSetupData, string autoSetupUrl, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<OfferProviderService>(_settings, cancellationToken)
+        using var httpClient = await _tokenService.GetAuthorizedClient<OfferProviderService>(_settings, cancellationToken)
             .ConfigureAwait(false);
         await httpClient.PostAsJsonAsync(autoSetupUrl, autoSetupData, cancellationToken)
             .CatchingIntoServiceExceptionFor("trigger-offer-provider")
@@ -58,7 +57,7 @@ await httpClient.PostAsJsonAsync(autoSetupUrl, autoSetupData, cancellationToken)
     /// <inheritdoc />
     public async Task<bool> TriggerOfferProviderCallback(OfferProviderCallbackData callbackData, string callbackUrl, CancellationToken cancellationToken)
     {
-        var httpClient = await _tokenService.GetAuthorizedClient<OfferProviderService>(_settings, cancellationToken)
+        using var httpClient = await _tokenService.GetAuthorizedClient<OfferProviderService>(_settings, cancellationToken)
             .ConfigureAwait(false);
         await httpClient.PostAsJsonAsync(callbackUrl, callbackData, cancellationToken)
             .CatchingIntoServiceExceptionFor("trigger-offer-provider-callback")
diff --git a/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderSettings.cs b/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderSettings.cs
index 57fb96aff6..5338d5b85f 100644
--- a/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderSettings.cs
+++ b/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderSettings.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -18,15 +17,16 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
 using System.ComponentModel.DataAnnotations;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.DependencyInjection;
 
 public class OnboardingServiceProviderSettings
 {
-    /// <summary>
-    /// The key used to encrypt the callback data
-    /// </summary>
-    [Required(AllowEmptyStrings = false)]
-    public string EncryptionKey { get; set; } = null!;
+    [Required]
+    public IEnumerable<EncryptionModeConfig> EncryptionConfigs { get; set; } = null!;
+
+    [Required]
+    public int EncrptionConfigIndex { get; set; }
 }
diff --git a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderBusinessLogic.cs b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderBusinessLogic.cs
index c8dd39585e..8a2ac39f65 100644
--- a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderBusinessLogic.cs
+++ b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderBusinessLogic.cs
@@ -20,13 +20,12 @@
 
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Encryption;
 using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library;
 
@@ -82,22 +81,14 @@ public OnboardingServiceProviderBusinessLogic(IOnboardingServiceProviderService
                 throw new ArgumentException($"{processStepTypeId} is not supported");
         }
 
-        using var aes = Aes.Create();
-        aes.Key = Encoding.UTF8.GetBytes(_settings.EncryptionKey);
-        aes.Mode = CipherMode.ECB;
-        aes.Padding = PaddingMode.PKCS7;
-        var decryptor = aes.CreateDecryptor(aes.Key, aes.IV);
-        using (var msDecrypt = new MemoryStream(data.OspDetails.ClientSecret))
-        {
-            using var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read);
-            using var srDecrypt = new StreamReader(csDecrypt, Encoding.UTF8);
-            var secret = srDecrypt.ReadToEnd();
-            await _onboardingServiceProviderService.TriggerProviderCallback(
-                    new OspTriggerDetails(data.OspDetails.CallbackUrl, data.OspDetails.AuthUrl, data.OspDetails.ClientId, secret),
-                    new OnboardingServiceProviderCallbackData(data.ExternalId, data.ApplicationId, data.Bpn, applicationStatusId, comment),
-                    cancellationToken)
-                .ConfigureAwait(false);
-        }
+        var cryptoConfig = _settings.EncryptionConfigs.SingleOrDefault(x => x.Index == data.OspDetails.EncryptionMode) ?? throw new ConfigurationException($"EncryptionModeIndex {data.OspDetails.EncryptionMode} is not configured");
+        var secret = CryptoHelper.Decrypt(data.OspDetails.ClientSecret, data.OspDetails.InitializationVector, Convert.FromHexString(cryptoConfig.EncryptionKey), cryptoConfig.CipherMode, cryptoConfig.PaddingMode);
+
+        await _onboardingServiceProviderService.TriggerProviderCallback(
+                new OspTriggerDetails(data.OspDetails.CallbackUrl, data.OspDetails.AuthUrl, data.OspDetails.ClientId, secret),
+                new OnboardingServiceProviderCallbackData(data.ExternalId, data.ApplicationId, data.Bpn, applicationStatusId, comment),
+                cancellationToken)
+            .ConfigureAwait(false);
 
         return (Enumerable.Empty<ProcessStepTypeId>(), ProcessStepStatusId.DONE, false, null);
     }
diff --git a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs
index cb2735ffe6..ada840688a 100644
--- a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs
+++ b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -46,7 +45,7 @@ public async Task<bool> TriggerProviderCallback(OspTriggerDetails ospDetails, On
             ClientId = ospDetails.ClientId,
             ClientSecret = ospDetails.ClientSecret
         };
-        var httpClient = await _tokenService.GetAuthorizedClient<OnboardingServiceProviderService>(settings, cancellationToken)
+        using var httpClient = await _tokenService.GetAuthorizedClient<OnboardingServiceProviderService>(settings, cancellationToken)
             .ConfigureAwait(false);
         await httpClient.PostAsJsonAsync(ospDetails.CallbackUrl, callbackData, cancellationToken)
             .CatchingIntoServiceExceptionFor("trigger-onboarding-provider")
diff --git a/src/externalsystems/SdFactory.Library/SdFactoryService.cs b/src/externalsystems/SdFactory.Library/SdFactoryService.cs
index ed276ec515..f61c2b6822 100644
--- a/src/externalsystems/SdFactory.Library/SdFactoryService.cs
+++ b/src/externalsystems/SdFactory.Library/SdFactoryService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -54,7 +53,6 @@ public async Task RegisterConnectorAsync(Guid connectorId, string selfDescriptio
     {
         var httpClient = await _tokenService.GetAuthorizedClient<SdFactoryService>(_settings, cancellationToken)
             .ConfigureAwait(false);
-        // TODO The hardcoded values (headquarterCountry, legalCountry, sdType, issuer) will be fetched from the user input or db in future
         var requestModel = new ConnectorSdFactoryRequestModel(
             connectorId.ToString(),
             SdFactoryRequestModelSdType.ServiceOffering,
@@ -65,7 +63,7 @@ public async Task RegisterConnectorAsync(Guid connectorId, string selfDescriptio
             _settings.SdFactoryIssuerBpn,
             businessPartnerNumber);
 
-        await httpClient.PostAsJsonAsync((string?)null, requestModel, cancellationToken)
+        await httpClient.PostAsJsonAsync(default(string?), requestModel, cancellationToken)
             .CatchingIntoServiceExceptionFor("sd-factory-connector-post", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
     }
 
@@ -84,7 +82,7 @@ public async Task RegisterSelfDescriptionAsync(Guid applicationId, IEnumerable<(
             businessPartnerNumber,
             _settings.SdFactoryIssuerBpn);
 
-        await httpClient.PostAsJsonAsync((string?)null, requestModel, cancellationToken)
+        await httpClient.PostAsJsonAsync(default(string?), requestModel, cancellationToken)
             .CatchingIntoServiceExceptionFor("sd-factory-selfdescription-post", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
     }
 }
diff --git a/src/framework/Framework.Async/AsyncGroupByExtensions.cs b/src/framework/Framework.Async/AsyncGroupByExtensions.cs
index 72592f78d3..9516102fc1 100644
--- a/src/framework/Framework.Async/AsyncGroupByExtensions.cs
+++ b/src/framework/Framework.Async/AsyncGroupByExtensions.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/framework/Framework.Async/Directory.Build.props b/src/framework/Framework.Async/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Async/Directory.Build.props
+++ b/src/framework/Framework.Async/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Cors/Directory.Build.props b/src/framework/Framework.Cors/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Cors/Directory.Build.props
+++ b/src/framework/Framework.Cors/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.DBAccess/Directory.Build.props b/src/framework/Framework.DBAccess/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.DBAccess/Directory.Build.props
+++ b/src/framework/Framework.DBAccess/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.DateTimeProvider/Directory.Build.props b/src/framework/Framework.DateTimeProvider/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.DateTimeProvider/Directory.Build.props
+++ b/src/framework/Framework.DateTimeProvider/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.DependencyInjection/Directory.Build.props b/src/framework/Framework.DependencyInjection/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.DependencyInjection/Directory.Build.props
+++ b/src/framework/Framework.DependencyInjection/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.ErrorHandling.Controller/Directory.Build.props b/src/framework/Framework.ErrorHandling.Controller/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.ErrorHandling.Controller/Directory.Build.props
+++ b/src/framework/Framework.ErrorHandling.Controller/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.ErrorHandling.Web/Directory.Build.props b/src/framework/Framework.ErrorHandling.Web/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.ErrorHandling.Web/Directory.Build.props
+++ b/src/framework/Framework.ErrorHandling.Web/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs b/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs
index e4bb639686..6b5ff4e958 100644
--- a/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs
+++ b/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs
@@ -35,17 +35,42 @@ public class GeneralHttpErrorHandler
     private readonly IErrorMessageService? _errorMessageService;
     private readonly ILogger _logger;
 
-    private static readonly IReadOnlyDictionary<HttpStatusCode, MetaData> Metadata = new Dictionary<HttpStatusCode, MetaData>
+    private static readonly IReadOnlyDictionary<HttpStatusCode, MetaData> Metadata = ImmutableDictionary.CreateRange(new[]
     {
-        { HttpStatusCode.BadRequest, new MetaData("https://tools.ietf.org/html/rfc7231#section-6.5.1", "One or more validation errors occurred.") },
-        { HttpStatusCode.Conflict, new MetaData("https://tools.ietf.org/html/rfc7231#section-6.5.8", "The resorce is in conflict with the current request.") },
-        { HttpStatusCode.NotFound, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.4", "Cannot find representation of target resource.") },
-        { HttpStatusCode.Forbidden, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.3", "Access to requested resource is not permitted.") },
-        { HttpStatusCode.UnsupportedMediaType, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.13", "The server cannot process this type of content") },
-        { HttpStatusCode.BadGateway, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.3", "Error accessing external resource.") },
-        { HttpStatusCode.ServiceUnavailable, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.4", "Service is currently unavailable.") },
-        { HttpStatusCode.InternalServerError, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.1", "The server encountered an unexpected condition.") }
-    }.ToImmutableDictionary();
+        KeyValuePair.Create(HttpStatusCode.BadRequest, new MetaData("https://tools.ietf.org/html/rfc7231#section-6.5.1", "One or more validation errors occurred.")),
+        KeyValuePair.Create(HttpStatusCode.Conflict, new MetaData("https://tools.ietf.org/html/rfc7231#section-6.5.8", "The resorce is in conflict with the current request.")),
+        KeyValuePair.Create(HttpStatusCode.NotFound, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.4", "Cannot find representation of target resource.")),
+        KeyValuePair.Create(HttpStatusCode.Forbidden, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.3", "Access to requested resource is not permitted.")),
+        KeyValuePair.Create(HttpStatusCode.UnsupportedMediaType, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.13", "The server cannot process this type of content")),
+        KeyValuePair.Create(HttpStatusCode.BadGateway, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.3", "Error accessing external resource.")),
+        KeyValuePair.Create(HttpStatusCode.ServiceUnavailable, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.4", "Service is currently unavailable.")),
+        KeyValuePair.Create(HttpStatusCode.InternalServerError, new MetaData("https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.1", "The server encountered an unexpected condition.")),
+    });
+
+    private static KeyValuePair<Type, (HttpStatusCode HttpStatusCode, Func<Exception, (string?, IEnumerable<string>)>? MessageFunc, LogLevel LogLevel)> CreateErrorEntry<T>(
+            HttpStatusCode httpStatusCode,
+            Func<T, (string?, IEnumerable<string>)>? messageFunc = null,
+            LogLevel logLevel = LogLevel.Information
+        ) where T : class =>
+            KeyValuePair.Create<Type, (HttpStatusCode, Func<Exception, (string?, IEnumerable<string>)>?, LogLevel)>(
+                typeof(T),
+                (httpStatusCode,
+                messageFunc == null
+                    ? null
+                    : (Exception e) => messageFunc.Invoke(e as T ?? throw new UnexpectedConditionException($"Exception type {e.GetType()} should always be of type {typeof(T)} here")),
+                logLevel));
+
+    private static readonly IReadOnlyDictionary<Type, (HttpStatusCode StatusCode, Func<Exception, (string?, IEnumerable<string>)>? MessageFunc, LogLevel LogLevel)> ErrorTypes = ImmutableDictionary.CreateRange(new[]
+    {
+        CreateErrorEntry<ArgumentException>(HttpStatusCode.BadRequest, argumentException => (argumentException.ParamName, Enumerable.Repeat(argumentException.Message, 1))),
+        CreateErrorEntry<ControllerArgumentException>(HttpStatusCode.BadRequest, caException => (caException.ParamName, Enumerable.Repeat(caException.Message, 1))),
+        CreateErrorEntry<NotFoundException>(HttpStatusCode.NotFound),
+        CreateErrorEntry<ConflictException>(HttpStatusCode.Conflict),
+        CreateErrorEntry<ForbiddenException>(HttpStatusCode.Forbidden),
+        CreateErrorEntry<ServiceException>(HttpStatusCode.BadGateway, serviceException => (serviceException.Source, new[] { serviceException.StatusCode == null ? "remote service call failed" : $"remote service returned status code: {(int) serviceException.StatusCode} {serviceException.StatusCode}", serviceException.Message })),
+        CreateErrorEntry<UnsupportedMediaTypeException>(HttpStatusCode.UnsupportedMediaType),
+        CreateErrorEntry<ConfigurationException>(HttpStatusCode.InternalServerError, configurationException => (configurationException.Source, new[] { $"Invalid service configuration: {configurationException.Message}" }))
+    });
 
     public GeneralHttpErrorHandler(RequestDelegate next, ILogger<GeneralHttpErrorHandler> logger, IErrorMessageService? errorMessageService = null) //TODO make errorMessageService mandatory as soon all dependant services are adjusted accordingly
     {
@@ -74,64 +99,10 @@ public async Task Invoke(HttpContext context)
         }
     }
 
-    private static (HttpStatusCode StatusCode, Func<Exception, (string?, IEnumerable<string>)>? MessageFunc, LogLevel LogLevel) GetErrorInformation(Exception error)
-    {
-        HttpStatusCode statusCode;
-        var logLevel = LogLevel.Information;
-        Func<Exception, (string?, IEnumerable<string>)>? messageFunc = null;
-
-        if (error is ArgumentException argumentException)
-        {
-            statusCode = HttpStatusCode.BadRequest;
-            messageFunc = _ => (argumentException.ParamName, Enumerable.Repeat(argumentException.Message, 1));
-        }
-
-        else if (error is ControllerArgumentException caException)
-        {
-            statusCode = HttpStatusCode.BadRequest;
-            messageFunc = _ => (caException.ParamName, Enumerable.Repeat(caException.Message, 1));
-        }
-        else if (error is NotFoundException)
-        {
-            statusCode = HttpStatusCode.NotFound;
-        }
-        else if (error is ConflictException)
-        {
-            statusCode = HttpStatusCode.Conflict;
-        }
-        else if (error is ForbiddenException)
-        {
-            statusCode = HttpStatusCode.Forbidden;
-        }
-        else if (error is ServiceException serviceException)
-        {
-            statusCode = HttpStatusCode.BadGateway;
-            var serviceStatus = serviceException.StatusCode;
-            messageFunc = ex => (ex.Source, new[]
-            {
-                serviceStatus == null
-                    ? "remote service call failed"
-                    : $"remote service returned status code: {(int) serviceStatus} {serviceStatus}",
-                error.Message
-            });
-        }
-        else if (error is UnsupportedMediaTypeException)
-        {
-            statusCode = HttpStatusCode.UnsupportedMediaType;
-        }
-        else if (error is ConfigurationException)
-        {
-            statusCode = HttpStatusCode.InternalServerError;
-            messageFunc = ex => (ex.Source, new[] { $"Invalid service configuration: {ex.Message}" });
-        }
-        else
-        {
-            statusCode = HttpStatusCode.InternalServerError;
-            logLevel = LogLevel.Error;
-        }
-
-        return (statusCode, messageFunc, logLevel);
-    }
+    private static (HttpStatusCode StatusCode, Func<Exception, (string?, IEnumerable<string>)>? MessageFunc, LogLevel LogLevel) GetErrorInformation(Exception error) =>
+        ErrorTypes.TryGetValue(error.GetType(), out var mapping)
+            ? mapping
+            : (HttpStatusCode.InternalServerError, null, LogLevel.Error);
 
     private ErrorResponse CreateErrorResponse(HttpStatusCode statusCode, Exception error, string errorId, string message, IEnumerable<ErrorDetails>? details, Func<Exception, (string?, IEnumerable<string>)>? getSourceAndMessages)
     {
diff --git a/src/framework/Framework.ErrorHandling/Directory.Build.props b/src/framework/Framework.ErrorHandling/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.ErrorHandling/Directory.Build.props
+++ b/src/framework/Framework.ErrorHandling/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.HttpClientExtensions/Directory.Build.props b/src/framework/Framework.HttpClientExtensions/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.HttpClientExtensions/Directory.Build.props
+++ b/src/framework/Framework.HttpClientExtensions/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.IO/CsvParser.cs b/src/framework/Framework.IO/CsvParser.cs
index e08cc3af8f..ec851b0845 100644
--- a/src/framework/Framework.IO/CsvParser.cs
+++ b/src/framework/Framework.IO/CsvParser.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -92,7 +91,7 @@ public static IEnumerable<string> TrailingStringItemsNotNullOrWhiteSpace(IEnumer
         Func<IAsyncEnumerable<TLineType>, IAsyncEnumerable<(bool Processed, Exception? Error)>> processLines,
         CancellationToken cancellationToken)
     {
-        var reader = new StreamReader(new CancellableStream(stream, cancellationToken), Encoding.UTF8);
+        using var reader = new StreamReader(new CancellableStream(stream, cancellationToken), Encoding.UTF8);
 
         var numProcessed = 0;
         var errors = new List<(int Line, Exception Error)>();
diff --git a/src/framework/Framework.IO/Directory.Build.props b/src/framework/Framework.IO/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.IO/Directory.Build.props
+++ b/src/framework/Framework.IO/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Linq/Directory.Build.props b/src/framework/Framework.Linq/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Linq/Directory.Build.props
+++ b/src/framework/Framework.Linq/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Linq/DuplicatesExtension.cs b/src/framework/Framework.Linq/DuplicatesExtension.cs
index 26395cc10f..6cba928bc0 100644
--- a/src/framework/Framework.Linq/DuplicatesExtension.cs
+++ b/src/framework/Framework.Linq/DuplicatesExtension.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -25,24 +24,12 @@ public static class DuplicatesExtension
     public static IEnumerable<T> Duplicates<T>(this IEnumerable<T> source)
     {
         var buffer = new HashSet<T>();
-        foreach (var t in source)
-        {
-            if (!buffer.Add(t))
-            {
-                yield return t;
-            }
-        }
+        return source.Select(x => (Valid: buffer.Add(x), Value: x)).Where(x => !x.Valid).Select(x => x.Value);
     }
 
     public static IEnumerable<T> DuplicatesBy<T, S>(this IEnumerable<T> source, Func<T, S> selector)
     {
         var buffer = new HashSet<S>();
-        foreach (var t in source)
-        {
-            if (!buffer.Add(selector(t)))
-            {
-                yield return t;
-            }
-        }
+        return source.Select(x => (Valid: buffer.Add(selector(x)), Value: x)).Where(x => !x.Valid).Select(x => x.Value);
     }
 }
diff --git a/src/framework/Framework.Linq/IfAnyExtension.cs b/src/framework/Framework.Linq/IfAnyExtension.cs
index 764acc1809..2326bd00c3 100644
--- a/src/framework/Framework.Linq/IfAnyExtension.cs
+++ b/src/framework/Framework.Linq/IfAnyExtension.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/framework/Framework.Linq/ObjectToEnumerableExtension.cs b/src/framework/Framework.Linq/ObjectToEnumerableExtension.cs
index 137352bdba..e37341fac4 100644
--- a/src/framework/Framework.Linq/ObjectToEnumerableExtension.cs
+++ b/src/framework/Framework.Linq/ObjectToEnumerableExtension.cs
@@ -29,13 +29,8 @@ public static IEnumerable<object> ToIEnumerable(this object value)
         var enumerator = value?.GetType().GetMethod("GetEnumerator")?.Invoke(value, null) ?? throw new ArgumentException($"object instance does not implement IEnumerable ({value?.GetType()})");
         var moveNext = enumerator?.GetType().GetMethod("MoveNext") ?? throw new UnexpectedConditionException("method 'moveNext' should never be null here");
         var current = enumerator?.GetType().GetProperty("Current")?.GetMethod ?? throw new UnexpectedConditionException("property 'Current' should never be null here");
-        while (true)
+        while ((moveNext.Invoke(enumerator, null) ?? throw new UnexpectedConditionException($"failed to enumerate object {value}: moveNext should never return null here")) is true)
         {
-            var hasNext = moveNext.Invoke(enumerator, null) ?? throw new UnexpectedConditionException($"failed to enumerate object {value}: moveNext should never return null here");
-            if (hasNext is not true)
-            {
-                yield break;
-            }
             yield return current.Invoke(enumerator, null) ?? throw new UnexpectedConditionException($"failed to enumerate object {value}: Current should never return null here");
         }
     }
diff --git a/src/framework/Framework.Logging/Directory.Build.props b/src/framework/Framework.Logging/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Logging/Directory.Build.props
+++ b/src/framework/Framework.Logging/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Models/Configuration/EncryptionModeConfig.cs b/src/framework/Framework.Models/Configuration/EncryptionModeConfig.cs
new file mode 100644
index 0000000000..805a61ef93
--- /dev/null
+++ b/src/framework/Framework.Models/Configuration/EncryptionModeConfig.cs
@@ -0,0 +1,41 @@
+/********************************************************************************
+ * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation;
+using System.ComponentModel.DataAnnotations;
+using System.Security.Cryptography;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
+
+public class EncryptionModeConfig
+{
+    [Required]
+    public int Index { get; set; }
+
+    [Required(AllowEmptyStrings = false)]
+    public string EncryptionKey { get; set; } = null!;
+
+    [Required]
+    [ValidateEnumValue]
+    public CipherMode CipherMode { get; set; }
+
+    [Required]
+    [ValidateEnumValue]
+    public PaddingMode PaddingMode { get; set; }
+}
diff --git a/src/framework/Framework.Models/Directory.Build.props b/src/framework/Framework.Models/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Models/Directory.Build.props
+++ b/src/framework/Framework.Models/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Models/Encryption/CryptoHelper.cs b/src/framework/Framework.Models/Encryption/CryptoHelper.cs
new file mode 100644
index 0000000000..d044bc59d6
--- /dev/null
+++ b/src/framework/Framework.Models/Encryption/CryptoHelper.cs
@@ -0,0 +1,58 @@
+/********************************************************************************
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Encryption;
+
+public static class CryptoHelper
+{
+    public static (byte[] Result, byte[] InitializationVector) Encrypt(string data, byte[] encryptionKey, CipherMode cipherMode, PaddingMode paddingMode)
+    {
+        using var aes = Aes.Create();
+        aes.Mode = cipherMode;
+        aes.Padding = paddingMode;
+        var encryptor = aes.CreateEncryptor(encryptionKey, aes.IV);
+        using var memoryStream = new MemoryStream();
+        using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
+        {
+            using var sw = new StreamWriter(cryptoStream, Encoding.UTF8);
+            sw.Write(data);
+        }
+        return (memoryStream.ToArray(), aes.IV);
+    }
+
+    public static string Decrypt(byte[] data, byte[]? initializationVector, byte[] encryptionKey, CipherMode cipherMode, PaddingMode paddingMode)
+    {
+        using var aes = Aes.Create();
+        aes.Mode = cipherMode;
+        aes.Padding = paddingMode;
+        aes.Key = encryptionKey;
+        if (initializationVector != null)
+        {
+            aes.IV = initializationVector;
+        }
+        var decryptor = aes.CreateDecryptor();
+        using var msDecrypt = new MemoryStream(data);
+        using var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read);
+        using var srDecrypt = new StreamReader(csDecrypt, Encoding.UTF8);
+        return srDecrypt.ReadToEnd();
+    }
+}
diff --git a/src/framework/Framework.Models/Pagination.cs b/src/framework/Framework.Models/Pagination.cs
index e325e0ea22..815069ba1b 100644
--- a/src/framework/Framework.Models/Pagination.cs
+++ b/src/framework/Framework.Models/Pagination.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -101,7 +100,7 @@ public static async Task<Response<T>> CreateResponseAsync<T>(int page, int size,
                 count,
                 count / size + Math.Clamp(count % size, 0, 1),
                 page,
-                data.Count()),
+                data.Count),
             data);
     }
 
@@ -121,22 +120,20 @@ public static async Task<Response<T>> CreateResponseAsync<T>(int page, int size,
                 source.Data);
     }
 
-    public static IQueryable<Pagination.Source<T>?> CreateSourceQueryAsync<TEntity, TKey, T>(int skip, int take, IQueryable<IGrouping<TKey, TEntity>> query, Expression<Func<IEnumerable<TEntity>, IOrderedEnumerable<TEntity>>>? orderBy, Expression<Func<TEntity, T>> select) where TEntity : class
+    public static IQueryable<Source<T>?> CreateSourceQueryAsync<TEntity, TKey, T>(int skip, int take, IQueryable<IGrouping<TKey, TEntity>> query, Expression<Func<IEnumerable<TEntity>, IOrderedEnumerable<TEntity>>>? orderBy, Expression<Func<TEntity, T>> select) where TEntity : class
     {
         var paramGroup = Expression.Parameter(typeof(IGrouping<TKey, TEntity>), "group");
 
-        var selector = Expression.Lambda<Func<IGrouping<TKey, TEntity>, Pagination.Source<T>>>(
-            Expression.New(typeof(Pagination.Source<T>).GetConstructor(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance, new[] { typeof(int), typeof(IEnumerable<T>) })!,
-                new Expression[] {
-                    Expression.Call(typeof(Enumerable), "Count", new Type[] { typeof(TEntity) }, paramGroup),
-                    Expression.Call(typeof(Enumerable), "Select", new Type[] { typeof(TEntity), typeof(T) }, new Expression[] {
-                        Expression.Call(typeof(Enumerable), "Take", new Type[] { typeof(TEntity) }, new Expression [] {
-                            Expression.Call(typeof(Enumerable), "Skip", new Type[] { typeof(TEntity) }, new Expression[] {
-                                orderBy == null ? paramGroup : Expression.Invoke(orderBy, paramGroup),
-                                Expression.Constant(skip) }),
-                            Expression.Constant(take) }),
-                        select })
-                }
+        var selector = Expression.Lambda<Func<IGrouping<TKey, TEntity>, Source<T>>>(
+            Expression.New(typeof(Source<T>).GetConstructor(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance, new[] { typeof(int), typeof(IEnumerable<T>) })!,
+                Expression.Call(typeof(Enumerable), "Count", new[] { typeof(TEntity) }, paramGroup),
+                Expression.Call(typeof(Enumerable), "Select", new[] { typeof(TEntity), typeof(T) },
+                    Expression.Call(typeof(Enumerable), "Take", new[] { typeof(TEntity) },
+                        Expression.Call(typeof(Enumerable), "Skip", new[] { typeof(TEntity) },
+                            orderBy == null ? paramGroup : Expression.Invoke(orderBy, paramGroup),
+                            Expression.Constant(skip)),
+                        Expression.Constant(take)),
+                    select)
             ),
             paramGroup);
 
diff --git a/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs b/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs
index 0894ed569c..ca76563f20 100644
--- a/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs
+++ b/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs
@@ -98,7 +98,7 @@ var x when x.GetInterfaces().Contains(typeof(IEnumerable)) &&
                 (configSection.GetSection(propertyName).Get(property.PropertyType) as IEnumerable)
                 ?.ToIEnumerable()
                 .Select((_, i) => configSection.GetSection($"{propertyName}:{i}"))
-                .SelectMany(section => GetValidationErrors(genericType!, section)),
-            _ => null
-        } ?? Enumerable.Empty<ValidationResult>();
+                .SelectMany(section => GetValidationErrors(genericType!, section)) ?? Enumerable.Empty<ValidationResult>(),
+            _ => Enumerable.Empty<ValidationResult>()
+        };
 }
diff --git a/src/framework/Framework.Models/Validation/ValidateEnumValuesAttribute.cs b/src/framework/Framework.Models/Validation/ValidateEnumValuesAttribute.cs
index 724602b6e7..ccc483ec5e 100644
--- a/src/framework/Framework.Models/Validation/ValidateEnumValuesAttribute.cs
+++ b/src/framework/Framework.Models/Validation/ValidateEnumValuesAttribute.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -41,13 +40,11 @@ public class ValidateEnumValuesAttribute : ValidationAttribute
         }
         var values = type.GetEnumValues();
 
-        foreach (var item in value!.ToIEnumerable())
+        if (value!.ToIEnumerable().Where(item => item is null || Array.BinarySearch(values, item) < 0).IfAny(x => x.First(), out var item))
         {
-            if (item is null || Array.BinarySearch(values, item) < 0)
-            {
-                return new ValidationResult($"{item} is not a valid value for {type}. Valid values are: {string.Join(", ", type.GetEnumNames())}");
-            }
+            return new ValidationResult($"{item} is not a valid value for {type}. Valid values are: {string.Join(", ", type.GetEnumNames())}");
         }
+
         return null;
     }
 }
diff --git a/src/framework/Framework.Models/ValidationExpressions.cs b/src/framework/Framework.Models/ValidationExpressions.cs
index 3efc662680..9b6bf2e720 100644
--- a/src/framework/Framework.Models/ValidationExpressions.cs
+++ b/src/framework/Framework.Models/ValidationExpressions.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -22,7 +21,7 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 
 public static class ValidationExpressions
 {
-    public const string Name = @"^.+$"; // TODO: should be @"^(([A-Za-zÀ-ÿ]{1,40}?([-,.'\s]?[A-Za-zÀ-ÿ]{1,40}?)){1,8})$";
+    public const string Name = @"^.+$";
     public const string Bpn = @"^(BPNL|bpnl)[\w|\d]{12}$";
     public const string Company = @"^\d*?[A-Za-zÀ-ÿ]\d?([A-Za-z0-9À-ÿ-_+=.,:;!?'\x22&#@()]\s?){2,40}$";
 }
diff --git a/src/framework/Framework.Seeding/Directory.Build.props b/src/framework/Framework.Seeding/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Seeding/Directory.Build.props
+++ b/src/framework/Framework.Seeding/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Swagger/Directory.Build.props b/src/framework/Framework.Swagger/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Swagger/Directory.Build.props
+++ b/src/framework/Framework.Swagger/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Token/Directory.Build.props b/src/framework/Framework.Token/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Token/Directory.Build.props
+++ b/src/framework/Framework.Token/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Token/TokenService.cs b/src/framework/Framework.Token/TokenService.cs
index bda9355159..0f08468bb2 100644
--- a/src/framework/Framework.Token/TokenService.cs
+++ b/src/framework/Framework.Token/TokenService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -45,7 +44,7 @@ public async Task<HttpClient> GetAuthorizedClient<T>(KeyVaultAuthSettings settin
             settings.Scope,
             settings.TokenAddress);
 
-        var token = await this.GetTokenAsync(tokenParameters, cancellationToken).ConfigureAwait(false);
+        var token = await GetTokenAsync(tokenParameters, cancellationToken).ConfigureAwait(false);
 
         var httpClient = _httpClientFactory.CreateClient(typeof(T).Name);
         httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
@@ -63,8 +62,9 @@ public async Task<HttpClient> GetAuthorizedClient<T>(KeyVaultAuthSettings settin
             {"client_secret", settings.ClientSecret},
             {"scope", settings.Scope}
         };
-        var content = new FormUrlEncodedContent(formParameters);
-        var response = await _httpClientFactory.CreateClient(settings.HttpClientName).PostAsync(settings.TokenUrl, content, cancellationToken)
+        using var content = new FormUrlEncodedContent(formParameters);
+        using var httpClient = _httpClientFactory.CreateClient(settings.HttpClientName);
+        using var response = await httpClient.PostAsync(settings.TokenUrl, content, cancellationToken)
             .CatchingIntoServiceExceptionFor("token-post", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
 
         using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
diff --git a/src/framework/Framework.Web/Directory.Build.props b/src/framework/Framework.Web/Directory.Build.props
index ef267766b7..90377caa4f 100644
--- a/src/framework/Framework.Web/Directory.Build.props
+++ b/src/framework/Framework.Web/Directory.Build.props
@@ -19,7 +19,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Web/JwtBearerConfigurationHealthCheck.cs b/src/framework/Framework.Web/JwtBearerConfigurationHealthCheck.cs
index 4726de6eac..6fa55e1d9a 100644
--- a/src/framework/Framework.Web/JwtBearerConfigurationHealthCheck.cs
+++ b/src/framework/Framework.Web/JwtBearerConfigurationHealthCheck.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/keycloak/Keycloak.ErrorHandling/FlurlErrorHandler.cs b/src/keycloak/Keycloak.ErrorHandling/FlurlErrorHandler.cs
index 2580a96012..bdf2176644 100644
--- a/src/keycloak/Keycloak.ErrorHandling/FlurlErrorHandler.cs
+++ b/src/keycloak/Keycloak.ErrorHandling/FlurlErrorHandler.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -25,7 +24,7 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling;
 
-public class FlurlErrorHandler
+public static class FlurlErrorHandler
 {
     public static void ConfigureErrorHandler(ILogger logger, bool isDevelopment)
     {
@@ -36,14 +35,14 @@ public static void ConfigureErrorHandler(ILogger logger, bool isDevelopment)
             if (isDevelopment)
             {
                 var request = call.HttpRequestMessage == null ? "" : $"{call.HttpRequestMessage.Method} {call.HttpRequestMessage.RequestUri} HTTP/{call.HttpRequestMessage.Version}\n{call.HttpRequestMessage.Headers}\n";
-                var requestBody = call.RequestBody == null ? "\n" : call.RequestBody.ToString() + "\n\n";
+                var requestBody = call.RequestBody == null ? "\n" : call.RequestBody + "\n\n";
                 var response = call.HttpResponseMessage == null ? "" : call.HttpResponseMessage.ReasonPhrase + "\n";
                 var responseContent = call.HttpResponseMessage?.Content == null ? "" : call.HttpResponseMessage.Content.ReadAsStringAsync().Result + "\n";
-                logger.LogError(call.Exception, request + requestBody + response + responseContent);
+                logger.LogError(call.Exception, "{Request}{Body}{Response}{Content}", request, requestBody, response, responseContent);
             }
             else
             {
-                logger.LogError(call.Exception, message);
+                logger.LogError(call.Exception, "{Message}", message);
             }
 
             if (call.HttpResponseMessage != null)
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/ClientRoles.cs b/src/keycloak/Keycloak.ErrorHandling/KeycloakInvalidResponseException.cs
similarity index 61%
rename from src/portalbackend/PortalBackend.DBAccess/Models/ClientRoles.cs
rename to src/keycloak/Keycloak.ErrorHandling/KeycloakInvalidResponseException.cs
index 60d8062a3c..f52435504a 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Models/ClientRoles.cs
+++ b/src/keycloak/Keycloak.ErrorHandling/KeycloakInvalidResponseException.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -18,20 +17,15 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models
-{
-    [Obsolete("only referenced by code that is marked as obsolte")]
-    public class ClientRoles
-    {
-        public ClientRoles(Guid roleId, string role, string description)
-        {
-            RoleId = roleId;
-            Role = role;
-            Description = description;
-        }
+namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling;
 
-        public Guid RoleId { get; set; }
-        public string Role { get; set; }
-        public string Description { get; set; }
-    }
+[Serializable]
+public class KeycloakInvalidResponseException : Exception
+{
+    public KeycloakInvalidResponseException() { }
+    public KeycloakInvalidResponseException(string message) : base(message) { }
+    public KeycloakInvalidResponseException(string message, Exception inner) : base(message, inner) { }
+    protected KeycloakInvalidResponseException(
+        System.Runtime.Serialization.SerializationInfo info,
+        System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
 }
diff --git a/src/keycloak/Keycloak.Library/AuthenticationManagement/KeycloakClient.cs b/src/keycloak/Keycloak.Library/AuthenticationManagement/KeycloakClient.cs
index aeaed96a15..9a0b145538 100644
--- a/src/keycloak/Keycloak.Library/AuthenticationManagement/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/AuthenticationManagement/KeycloakClient.cs
@@ -116,25 +116,31 @@ public async Task CreateAuthenticationExecutionConfigurationAsync(string realm,
             .PostJsonAsync(authenticatorConfig, cancellationToken)
             .ConfigureAwait(false);
 
-    public async Task LowerAuthenticationExecutionPriorityAsync(string realm, string executionId) =>
+    public async Task LowerAuthenticationExecutionPriorityAsync(string realm, string executionId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/authentication/executions/")
             .AppendPathSegment(executionId, true)
             .AppendPathSegment("/lower-priority")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
-    public async Task RaiseAuthenticationExecutionPriorityAsync(string realm, string executionId) =>
+    public async Task RaiseAuthenticationExecutionPriorityAsync(string realm, string executionId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/authentication/executions/")
             .AppendPathSegment(executionId, true)
             .AppendPathSegment("/raise-priority")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task CreateAuthenticationFlowAsync(string realm, AuthenticationFlow authenticationFlow, CancellationToken cancellationToken = default) =>
         await (await GetBaseUrlAsync(realm, cancellationToken).ConfigureAwait(false))
@@ -316,25 +322,31 @@ public async Task DeleteRequiredActionAsync(string realm, string requiredActionA
             .DeleteAsync()
             .ConfigureAwait(false);
 
-    public async Task LowerRequiredActionPriorityAsync(string realm, string requiredActionAlias) =>
+    public async Task LowerRequiredActionPriorityAsync(string realm, string requiredActionAlias)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/authentication/required-actions/")
             .AppendPathSegment(requiredActionAlias, true)
             .AppendPathSegment("/lower-priority")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
-    public async Task RaiseRequiredActionPriorityAsync(string realm, string requiredActionAlias) =>
+    public async Task RaiseRequiredActionPriorityAsync(string realm, string requiredActionAlias)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/authentication/required-actions/")
             .AppendPathSegment(requiredActionAlias, true)
             .AppendPathSegment("/raise-priority")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task<IEnumerable<IDictionary<string, object>>> GetUnregisteredRequiredActionsAsync(string realm) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
diff --git a/src/keycloak/Keycloak.Library/ClientAttributeCertificate/KeycloakClient.cs b/src/keycloak/Keycloak.Library/ClientAttributeCertificate/KeycloakClient.cs
index 0a4652115f..767ca5a9ea 100644
--- a/src/keycloak/Keycloak.Library/ClientAttributeCertificate/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/ClientAttributeCertificate/KeycloakClient.cs
@@ -53,17 +53,21 @@ public async Task<byte[]> GetKeyStoreForClientAsync(string realm, string clientI
         .ReceiveBytes()
         .ConfigureAwait(false);
 
-    public async Task<Certificate> GenerateCertificateWithNewKeyPairAsync(string realm, string clientId, string attribute) => await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
-        .AppendPathSegment("/admin/realms/")
-        .AppendPathSegment(realm, true)
-        .AppendPathSegment("/clients/")
-        .AppendPathSegment(clientId, true)
-        .AppendPathSegment("/certificates/")
-        .AppendPathSegment(attribute, true)
-        .AppendPathSegment("/generate")
-        .PostAsync(new StringContent(""))
-        .ReceiveJson<Certificate>()
-        .ConfigureAwait(false);
+    public async Task<Certificate> GenerateCertificateWithNewKeyPairAsync(string realm, string clientId, string attribute)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+            .AppendPathSegment("/admin/realms/")
+            .AppendPathSegment(realm, true)
+            .AppendPathSegment("/clients/")
+            .AppendPathSegment(clientId, true)
+            .AppendPathSegment("/certificates/")
+            .AppendPathSegment(attribute, true)
+            .AppendPathSegment("/generate")
+            .PostAsync(stringContent)
+            .ReceiveJson<Certificate>()
+            .ConfigureAwait(false);
+    }
 
     public async Task<byte[]> GenerateCertificateWithNewKeyPairAndGetKeyStoreAsync(string realm, string clientId, string attribute, KeyStoreConfig keyStoreConfig) => await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
         .AppendPathSegment("/admin/realms/")
diff --git a/src/keycloak/Keycloak.Library/Clients/KeycloakClient.cs b/src/keycloak/Keycloak.Library/Clients/KeycloakClient.cs
index 47f5306eed..8b7c01fb1d 100644
--- a/src/keycloak/Keycloak.Library/Clients/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/Clients/KeycloakClient.cs
@@ -99,16 +99,19 @@ public async Task DeleteClientAsync(string realm, string clientId) =>
             .DeleteAsync()
             .ConfigureAwait(false);
 
-    public async Task<Credentials> GenerateClientSecretAsync(string realm, string clientId) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<Credentials> GenerateClientSecretAsync(string realm, string clientId)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/clients/")
             .AppendPathSegment(clientId, true)
             .AppendPathSegment("/client-secret")
-            .PostJsonAsync(new StringContent(""))
+            .PostJsonAsync(stringContent)
             .ReceiveJson<Credentials>()
             .ConfigureAwait(false);
+    }
 
     public async Task<Credentials> GetClientSecretAsync(string realm, string clientId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -130,7 +133,9 @@ public async Task<IEnumerable<ClientScope>> GetDefaultClientScopesAsync(string r
             .GetJsonAsync<IEnumerable<ClientScope>>()
             .ConfigureAwait(false);
 
-    public async Task UpdateDefaultClientScopeAsync(string realm, string clientId, string clientScopeId) =>
+    public async Task UpdateDefaultClientScopeAsync(string realm, string clientId, string clientScopeId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
@@ -138,9 +143,9 @@ public async Task UpdateDefaultClientScopeAsync(string realm, string clientId, s
             .AppendPathSegment(clientId, true)
             .AppendPathSegment("/default-client-scopes/")
             .AppendPathSegment(clientScopeId, true)
-            .PutAsync(new StringContent(""))
+            .PutAsync(stringContent)
             .ConfigureAwait(false);
-
+    }
     public async Task DeleteDefaultClientScopeAsync(string realm, string clientId, string clientScopeId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
@@ -326,7 +331,9 @@ public async Task<IEnumerable<ClientScope>> GetOptionalClientScopesAsync(string
             .GetJsonAsync<IEnumerable<ClientScope>>()
             .ConfigureAwait(false);
 
-    public async Task UpdateOptionalClientScopeAsync(string realm, string clientId, string clientScopeId) =>
+    public async Task UpdateOptionalClientScopeAsync(string realm, string clientId, string clientScopeId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
@@ -334,8 +341,9 @@ public async Task UpdateOptionalClientScopeAsync(string realm, string clientId,
             .AppendPathSegment(clientId, true)
             .AppendPathSegment("/optional-client-scopes/")
             .AppendPathSegment(clientScopeId, true)
-            .PutAsync(new StringContent(""))
+            .PutAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task DeleteOptionalClientScopeAsync(string realm, string clientId, string clientScopeId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -348,27 +356,33 @@ public async Task DeleteOptionalClientScopeAsync(string realm, string clientId,
             .DeleteAsync()
             .ConfigureAwait(false);
 
-    public async Task<GlobalRequestResult> PushClientRevocationPolicyAsync(string realm, string clientId) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<GlobalRequestResult> PushClientRevocationPolicyAsync(string realm, string clientId)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/clients/")
             .AppendPathSegment(clientId, true)
             .AppendPathSegment("/push-revocation")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<GlobalRequestResult>()
             .ConfigureAwait(false);
+    }
 
-    public async Task<Client> GenerateClientRegistrationAccessTokenAsync(string realm, string clientId) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<Client> GenerateClientRegistrationAccessTokenAsync(string realm, string clientId)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/clients/")
             .AppendPathSegment(clientId, true)
             .AppendPathSegment("/registration-access-token")
-            .PostJsonAsync(new StringContent(""))
+            .PostJsonAsync(stringContent)
             .ReceiveJson<Client>()
             .ConfigureAwait(false);
+    }
 
     // [Obsolete("Not working yet")] - seems to work fine?
     public async Task<User> GetUserForServiceAccountAsync(string realm, string clientId) =>
diff --git a/src/keycloak/Keycloak.Library/RealmsAdmin/KeycloakClient.cs b/src/keycloak/Keycloak.Library/RealmsAdmin/KeycloakClient.cs
index 8e8b00e345..0626501fa8 100644
--- a/src/keycloak/Keycloak.Library/RealmsAdmin/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/RealmsAdmin/KeycloakClient.cs
@@ -104,38 +104,50 @@ public async Task DeleteAdminEventsAsync(string realm) =>
             .DeleteAsync()
             .ConfigureAwait(false);
 
-    public async Task ClearKeysCacheAsync(string realm) =>
+    public async Task ClearKeysCacheAsync(string realm)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/clear-keys-cache")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
-    public async Task ClearRealmCacheAsync(string realm) =>
+    public async Task ClearRealmCacheAsync(string realm)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/clear-realm-cache")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
-    public async Task ClearUserCacheAsync(string realm) =>
+    public async Task ClearUserCacheAsync(string realm)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/clear-user-cache")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
-    public async Task<Client> BasePathForImportingClientsAsync(string realm, string description) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<Client> BasePathForImportingClientsAsync(string realm, string description)
+    {
+        using var stringContent = new StringContent(description);
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/client-description-converter")
-            .PostAsync(new StringContent(description))
+            .PostAsync(stringContent)
             .ReceiveJson<Client>()
             .ConfigureAwait(false);
+    }
 
     public async Task<IEnumerable<IDictionary<string, object>>> GetClientSessionStatsAsync(string realm) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -153,14 +165,17 @@ public async Task<IEnumerable<ClientScope>> GetRealmDefaultClientScopesAsync(str
             .GetJsonAsync<IEnumerable<ClientScope>>()
             .ConfigureAwait(false);
 
-    public async Task UpdateRealmDefaultClientScopeAsync(string realm, string clientScopeId) =>
+    public async Task UpdateRealmDefaultClientScopeAsync(string realm, string clientScopeId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/default-default-client-scopes/")
             .AppendPathSegment(clientScopeId, true)
-            .PutAsync(new StringContent(""))
+            .PutAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task DeleteRealmDefaultClientScopeAsync(string realm, string clientScopeId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -179,14 +194,17 @@ public async Task<IEnumerable<Group>> GetRealmGroupHierarchyAsync(string realm)
             .GetJsonAsync<IEnumerable<Group>>()
             .ConfigureAwait(false);
 
-    public async Task UpdateRealmGroupAsync(string realm, string groupId) =>
+    public async Task UpdateRealmGroupAsync(string realm, string groupId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/default-groups/")
             .AppendPathSegment(groupId, true)
-            .PutAsync(new StringContent(""))
+            .PutAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task DeleteRealmGroupAsync(string realm, string groupId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -205,14 +223,17 @@ public async Task<IEnumerable<ClientScope>> GetRealmOptionalClientScopesAsync(st
             .GetJsonAsync<IEnumerable<ClientScope>>()
             .ConfigureAwait(false);
 
-    public async Task UpdateRealmOptionalClientScopeAsync(string realm, string clientScopeId) =>
+    public async Task UpdateRealmOptionalClientScopeAsync(string realm, string clientScopeId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/default-optional-client-scopes/")
             .AppendPathSegment(clientScopeId, true)
-            .PutAsync(new StringContent(""))
+            .PutAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task DeleteRealmOptionalClientScopeAsync(string realm, string clientScopeId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -280,14 +301,17 @@ public async Task<Group> GetRealmGroupByPathAsync(string realm, string path) =>
             .GetJsonAsync<Group>()
             .ConfigureAwait(false);
 
-    public async Task<GlobalRequestResult> RemoveUserSessionsAsync(string realm) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<GlobalRequestResult> RemoveUserSessionsAsync(string realm)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/logout-all")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<GlobalRequestResult>()
             .ConfigureAwait(false);
+    }
 
     public async Task<Realm> RealmPartialExportAsync(string realm, bool? exportClients = null, bool? exportGroupsAndRoles = null)
     {
@@ -297,12 +321,13 @@ public async Task<Realm> RealmPartialExportAsync(string realm, bool? exportClien
             [nameof(exportGroupsAndRoles)] = exportGroupsAndRoles,
         };
 
+        using var stringContent = new StringContent("");
         return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/partial-export")
             .SetQueryParams(queryParams)
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<Realm>()
             .ConfigureAwait(false);
     }
@@ -315,14 +340,17 @@ public async Task RealmPartialImportAsync(string realm, PartialImport rep) =>
             .PostJsonAsync(rep)
             .ConfigureAwait(false);
 
-    public async Task<GlobalRequestResult> PushRealmRevocationPolicyAsync(string realm) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<GlobalRequestResult> PushRealmRevocationPolicyAsync(string realm)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/push-revocation")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<GlobalRequestResult>()
             .ConfigureAwait(false);
+    }
 
     public async Task DeleteUserSessionAsync(string realm, string session) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
@@ -349,14 +377,17 @@ public async Task TestLdapConnectionAsync(string realm, string? action = null, s
                 .AddString(nameof(useTruststoreSpi), useTruststoreSpi))
             .ConfigureAwait(false);
 
-    public async Task TestSmtpConnectionAsync(string realm, string config) =>
+    public async Task TestSmtpConnectionAsync(string realm, string config)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/testSMTPConnection/")
             .AppendPathSegment(config, true)
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task<ManagementPermission> GetRealmUsersManagementPermissionsAsync(string realm) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
diff --git a/src/keycloak/Keycloak.Library/RolesById/KeycloakClient.cs b/src/keycloak/Keycloak.Library/RolesById/KeycloakClient.cs
index 220f186b04..82394c7094 100755
--- a/src/keycloak/Keycloak.Library/RolesById/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/RolesById/KeycloakClient.cs
@@ -80,15 +80,18 @@ public async Task<IEnumerable<Role>> GetRoleChildrenAsync(string realm, string r
             .GetJsonAsync<IEnumerable<Role>>(cancellationToken)
             .ConfigureAwait(false);
 
-    public async Task RemoveRolesFromCompositeAsync(string realm, string roleId, IEnumerable<Role> roles) =>
+    public async Task RemoveRolesFromCompositeAsync(string realm, string roleId, IEnumerable<Role> roles)
+    {
+        using var jsonContent = new CapturedJsonContent(_serializer.Serialize(roles));
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/roles-by-id/")
             .AppendPathSegment(roleId, true)
             .AppendPathSegment("/composites")
-            .SendJsonAsync(HttpMethod.Delete, new CapturedJsonContent(_serializer.Serialize(roles)))
+            .SendJsonAsync(HttpMethod.Delete, jsonContent)
             .ConfigureAwait(false);
+    }
 
     public async Task<IEnumerable<Role>> GetClientRolesForCompositeByIdAsync(string realm, string roleId, string clientId) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
diff --git a/src/keycloak/Keycloak.Library/UserStorageProvider/KeycloakClient.cs b/src/keycloak/Keycloak.Library/UserStorageProvider/KeycloakClient.cs
index 353b208a51..e7ea196601 100644
--- a/src/keycloak/Keycloak.Library/UserStorageProvider/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/UserStorageProvider/KeycloakClient.cs
@@ -32,43 +32,54 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.Library;
 public partial class KeycloakClient
 {
     [Obsolete("Not working yet")]
-    public async Task RemoveImportedUsersAsync(string realm, string storageProviderId) =>
+    public async Task RemoveImportedUsersAsync(string realm, string storageProviderId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/user-storage/")
             .AppendPathSegment(storageProviderId, true)
             .AppendPathSegment("/remove-imported-users")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     [Obsolete("Not working yet")]
-    public async Task<SynchronizationResult> TriggerUserSynchronizationAsync(string realm, string storageProviderId, UserSyncActions action) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<SynchronizationResult> TriggerUserSynchronizationAsync(string realm, string storageProviderId, UserSyncActions action)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/user-storage/")
             .AppendPathSegment(storageProviderId, true)
             .AppendPathSegment("/sync")
             .SetQueryParam(nameof(action), action == UserSyncActions.Full ? "triggerFullSync" : "triggerChangedUsersSync")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<SynchronizationResult>()
             .ConfigureAwait(false);
+    }
 
     [Obsolete("Not working yet")]
-    public async Task UnlinkImportedUsersAsync(string realm, string storageProviderId) =>
+    public async Task UnlinkImportedUsersAsync(string realm, string storageProviderId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/user-storage/")
             .AppendPathSegment(storageProviderId, true)
             .AppendPathSegment("/unlink-users")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     [Obsolete("Not working yet")]
-    public async Task<SynchronizationResult> TriggerLdapMapperSynchronizationAsync(string realm, string storageProviderId, string mapperId, LdapMapperSyncActions direction) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<SynchronizationResult> TriggerLdapMapperSynchronizationAsync(string realm, string storageProviderId, string mapperId, LdapMapperSyncActions direction)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/user-storage/")
@@ -77,7 +88,8 @@ public async Task<SynchronizationResult> TriggerLdapMapperSynchronizationAsync(s
             .AppendPathSegment(mapperId, true)
             .AppendPathSegment("/sync")
             .SetQueryParam(nameof(direction), direction == LdapMapperSyncActions.FedToKeycloak ? "fedToKeycloak" : "keycloakToFed")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<SynchronizationResult>()
             .ConfigureAwait(false);
+    }
 }
diff --git a/src/keycloak/Keycloak.Library/Users/KeycloakClient.cs b/src/keycloak/Keycloak.Library/Users/KeycloakClient.cs
index 0bd8f7d805..9bb9131440 100644
--- a/src/keycloak/Keycloak.Library/Users/KeycloakClient.cs
+++ b/src/keycloak/Keycloak.Library/Users/KeycloakClient.cs
@@ -233,26 +233,32 @@ public async Task DeleteUserGroupAsync(string realm, string userId, string group
             .DeleteAsync()
             .ConfigureAwait(false);
 
-    public async Task<IDictionary<string, object>> ImpersonateUserAsync(string realm, string userId) =>
-        await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
+    public async Task<IDictionary<string, object>> ImpersonateUserAsync(string realm, string userId)
+    {
+        using var stringContent = new StringContent("");
+        return await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/users/")
             .AppendPathSegment(userId, true)
             .AppendPathSegment("/impersonation")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ReceiveJson<IDictionary<string, object>>()
             .ConfigureAwait(false);
+    }
 
-    public async Task RemoveUserSessionsAsync(string realm, string userId) =>
+    public async Task RemoveUserSessionsAsync(string realm, string userId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/users/")
             .AppendPathSegment(userId, true)
             .AppendPathSegment("/logout")
-            .PostAsync(new StringContent(""))
+            .PostAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     [Obsolete("Not working yet")]
     public async Task<IEnumerable<UserSession>> GetUserOfflineSessionsAsync(string realm, string userId, string clientId) =>
@@ -266,15 +272,18 @@ public async Task<IEnumerable<UserSession>> GetUserOfflineSessionsAsync(string r
             .GetJsonAsync<IEnumerable<UserSession>>()
             .ConfigureAwait(false);
 
-    public async Task RemoveUserTotpAsync(string realm, string userId) =>
+    public async Task RemoveUserTotpAsync(string realm, string userId)
+    {
+        using var stringContent = new StringContent("");
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
             .AppendPathSegment("/admin/realms/")
             .AppendPathSegment(realm, true)
             .AppendPathSegment("/users/")
             .AppendPathSegment(userId, true)
             .AppendPathSegment("/remove-totp")
-            .PutAsync(new StringContent(""))
+            .PutAsync(stringContent)
             .ConfigureAwait(false);
+    }
 
     public async Task ResetUserPasswordAsync(string realm, string userId, Credentials credentials) =>
         await (await GetBaseUrlAsync(realm).ConfigureAwait(false))
diff --git a/src/keycloak/Keycloak.Seeding/BusinessLogic/AuthenticationFlowsUpdater.cs b/src/keycloak/Keycloak.Seeding/BusinessLogic/AuthenticationFlowsUpdater.cs
index 097e84d59c..f3ae4baede 100644
--- a/src/keycloak/Keycloak.Seeding/BusinessLogic/AuthenticationFlowsUpdater.cs
+++ b/src/keycloak/Keycloak.Seeding/BusinessLogic/AuthenticationFlowsUpdater.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -307,12 +306,12 @@ private bool CompareFlowExecutions(AuthenticationFlowExecution execution, Authen
         private Task<(bool IsEqual, AuthenticatorConfig? AuthenticatorConfig)> CompareExecutions(AuthenticationFlowExecution execution, AuthenticationExecutionModel update, CancellationToken cancellationToken) =>
             (execution.ProviderId != update.Authenticator ||
             execution.Requirement != update.Requirement)
-                ? Task.FromResult((false, (AuthenticatorConfig?)null))
+                ? Task.FromResult<(bool, AuthenticatorConfig?)>((false, null))
                 : ((execution.AuthenticationConfig, update.AuthenticatorConfig) switch
                 {
-                    (null, null) => Task.FromResult((true, (AuthenticatorConfig?)null)),
-                    (null, _) => Task.FromResult((false, (AuthenticatorConfig?)null)),
-                    (_, null) => Task.FromResult((false, (AuthenticatorConfig?)null)),
+                    (null, null) => Task.FromResult<(bool, AuthenticatorConfig?)>((true, null)),
+                    (null, _) => Task.FromResult<(bool, AuthenticatorConfig?)>((false, null)),
+                    (_, null) => Task.FromResult<(bool, AuthenticatorConfig?)>((false, null)),
                     (_, _) => CompareAuthenticationConfig(execution.AuthenticationConfig, update.AuthenticatorConfig, cancellationToken)
                 });
 
diff --git a/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientScopesUpdater.cs b/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientScopesUpdater.cs
index 0fab2fb82a..bea6bfee5d 100644
--- a/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientScopesUpdater.cs
+++ b/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientScopesUpdater.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -155,7 +154,7 @@ private static ClientScope CreateClientScope(string? id, ClientScopeModel client
             Description = clientScope.Description,
             Protocol = clientScope.Protocol,
             Attributes = clientScope.Attributes == null ? null : CreateClientScopeAttributes(clientScope.Attributes),
-            ProtocolMappers = includeProtocolMappers ? clientScope?.ProtocolMappers?.Select(x => ProtocolMappersUpdater.CreateProtocolMapper(x.Id, x)) : null
+            ProtocolMappers = includeProtocolMappers ? clientScope.ProtocolMappers?.Select(x => ProtocolMappersUpdater.CreateProtocolMapper(x.Id, x)) : null
         };
 
     private static bool CompareClientScope(ClientScope scope, ClientScopeModel update) =>
diff --git a/src/keycloak/Keycloak.Seeding/Program.cs b/src/keycloak/Keycloak.Seeding/Program.cs
index f698493e48..111f04dbe2 100644
--- a/src/keycloak/Keycloak.Seeding/Program.cs
+++ b/src/keycloak/Keycloak.Seeding/Program.cs
@@ -72,7 +72,7 @@
 
     Log.Information("Building keycloak-seeder completed");
 
-    var tokenSource = new CancellationTokenSource();
+    using var tokenSource = new CancellationTokenSource();
     Console.CancelKeyPress += (s, e) =>
     {
         Log.Information("Canceling...");
diff --git a/src/mailing/Mailing.SendMail/SendMail.cs b/src/mailing/Mailing.SendMail/SendMail.cs
index 1b3af9b6a2..b69a2a046a 100644
--- a/src/mailing/Mailing.SendMail/SendMail.cs
+++ b/src/mailing/Mailing.SendMail/SendMail.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -36,18 +35,13 @@ public SendMail(IOptions<MailSettings> mailSettings)
 
         Task ISendMail.Send(string sender, string recipient, string subject, string body, bool useHtml)
         {
-            var message = new MimeMessage();
+            using var message = new MimeMessage();
             message.From.Add(MailboxAddress.Parse(sender));
             message.To.Add(MailboxAddress.Parse(recipient));
             message.Subject = subject;
-            if (useHtml)
-            {
-                message.Body = new TextPart("html") { Text = body };
-            }
-            else
-            {
-                message.Body = new TextPart("plain") { Text = body };
-            }
+            message.Body = useHtml
+                ? new TextPart("html") { Text = body }
+                : new TextPart("plain") { Text = body };
             return _send(message);
         }
 
diff --git a/src/mailing/Mailing.Template/EmailTemplates/additional_user_invitation_with_message.html b/src/mailing/Mailing.Template/EmailTemplates/additional_user_invitation_with_message.html
index b74a19255e..341614867a 100644
--- a/src/mailing/Mailing.Template/EmailTemplates/additional_user_invitation_with_message.html
+++ b/src/mailing/Mailing.Template/EmailTemplates/additional_user_invitation_with_message.html
@@ -160,7 +160,6 @@
                               <tr>
                                 <td  style="padding:20px;Margin:0;font-size:0;text-align: center;">
                                   <table role="presentation" aria-hidden="true" 
-                                     role="presentation" aria-hidden="true"
                                     style="mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;border-spacing:0px;width:100%;height:100%;border: 0">
                                     <tr>
                                       <td
diff --git a/src/mailing/Mailing.Template/EmailTemplates/password.html b/src/mailing/Mailing.Template/EmailTemplates/password.html
index 5024826be7..18ab11c908 100644
--- a/src/mailing/Mailing.Template/EmailTemplates/password.html
+++ b/src/mailing/Mailing.Template/EmailTemplates/password.html
@@ -151,7 +151,6 @@
                                                   <tr>
                                                     <td  style="padding:20px;Margin:0;font-size:0;text-align: center;">
                                                       <table role="presentation" aria-hidden="true" 
-                                                         role="presentation" aria-hidden="true"
                                                         style="mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;border-spacing:0px;width:100%;height:100%;border: 0">
                                                         <tr>
                                                           <td
diff --git a/src/mailing/Mailing.Template/EmailTemplates/registration_declined.html b/src/mailing/Mailing.Template/EmailTemplates/registration_declined.html
index 654d1535f9..467b06e7ed 100644
--- a/src/mailing/Mailing.Template/EmailTemplates/registration_declined.html
+++ b/src/mailing/Mailing.Template/EmailTemplates/registration_declined.html
@@ -134,7 +134,6 @@
                                                                 <td
                                                                     style="padding:20px;Margin:0;font-size:0;text-align: center;">
                                                                     <table role="presentation" aria-hidden="true"
-                                                                        role="presentation" aria-hidden="true"
                                                                         style="mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;border-spacing:0px;width:100%;height:100%;border: 0">
                                                                         <tr>
                                                                             <td
diff --git a/src/mailing/Mailing.Template/EmailTemplates/service_request_decline.html b/src/mailing/Mailing.Template/EmailTemplates/service_request_decline.html
index f5117e91b9..485f27ae84 100644
--- a/src/mailing/Mailing.Template/EmailTemplates/service_request_decline.html
+++ b/src/mailing/Mailing.Template/EmailTemplates/service_request_decline.html
@@ -487,7 +487,7 @@
                               style="mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;border-spacing:0px;width:100%;">
                               <tr>
                                 <td style="padding:15px;Margin:0;font-size:0;text-align: center;">
-                                  <table role="presentation" aria-hidden="true" role="presentation" aria-hidden="true"
+                                  <table role="presentation" aria-hidden="true"
                                     style="mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;border-spacing:0px;width:100%;height:100%;border: 0">
                                     <tr>
                                       <td
diff --git a/src/marketplace/Apps.Service/BusinessLogic/IAppsBusinessLogic.cs b/src/marketplace/Apps.Service/BusinessLogic/IAppsBusinessLogic.cs
index c8901ebf5e..70ca6ed107 100644
--- a/src/marketplace/Apps.Service/BusinessLogic/IAppsBusinessLogic.cs
+++ b/src/marketplace/Apps.Service/BusinessLogic/IAppsBusinessLogic.cs
@@ -86,6 +86,7 @@ public interface IAppsBusinessLogic
     /// <param name="sorting"></param>
     /// <param name="statusId"></param>
     /// <param name="offerId"></param>
+    /// <param name="companyName"></param>
     /// <returns>Async enumberable of user's company's provided apps' statuses.</returns>
     public Task<Pagination.Response<OfferCompanySubscriptionStatusResponse>> GetCompanyProvidedAppSubscriptionStatusesForUserAsync(int page, int size, SubscriptionStatusSorting? sorting, OfferSubscriptionStatusId? statusId, Guid? offerId, string? companyName = null);
 
diff --git a/src/marketplace/Apps.Service/Controllers/AppChangeController.cs b/src/marketplace/Apps.Service/Controllers/AppChangeController.cs
index 4304822be1..1a9b3598ee 100644
--- a/src/marketplace/Apps.Service/Controllers/AppChangeController.cs
+++ b/src/marketplace/Apps.Service/Controllers/AppChangeController.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/marketplace/Apps.Service/Controllers/AppsController.cs b/src/marketplace/Apps.Service/Controllers/AppsController.cs
index 0a5d5dbe45..6d7d7be317 100644
--- a/src/marketplace/Apps.Service/Controllers/AppsController.cs
+++ b/src/marketplace/Apps.Service/Controllers/AppsController.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/marketplace/Offers.Library/Service/OfferService.cs b/src/marketplace/Offers.Library/Service/OfferService.cs
index b95d99b578..e57dfd6c16 100644
--- a/src/marketplace/Offers.Library/Service/OfferService.cs
+++ b/src/marketplace/Offers.Library/Service/OfferService.cs
@@ -333,7 +333,7 @@ public void UpsertRemoveOfferDescription(Guid offerId, IEnumerable<LocalizedDesc
     {
         var offerRepository = _portalRepositories.GetInstance<IOfferRepository>();
         offerRepository.CreateUpdateDeleteOfferDescriptions(offerId, existingDescriptions,
-            updateDescriptions.Select(od => new ValueTuple<string, string, string>(od.LanguageCode, od.LongDescription, od.ShortDescription)));
+            updateDescriptions.Select(od => (od.LanguageCode, od.LongDescription, od.ShortDescription)));
     }
 
     public void CreateOrUpdateOfferLicense(Guid offerId, string licenseText, (Guid OfferLicenseId, string LicenseText, bool AssignedToMultipleOffers) offerLicense)
diff --git a/src/marketplace/Offers.Library/Service/OfferSetupService.cs b/src/marketplace/Offers.Library/Service/OfferSetupService.cs
index 8364717dfb..05ad9baa30 100644
--- a/src/marketplace/Offers.Library/Service/OfferSetupService.cs
+++ b/src/marketplace/Offers.Library/Service/OfferSetupService.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/notifications/Notifications.Service/BusinessLogic/NotificationBusinessLogic.cs b/src/notifications/Notifications.Service/BusinessLogic/NotificationBusinessLogic.cs
index ce626f926c..d01d61879b 100644
--- a/src/notifications/Notifications.Service/BusinessLogic/NotificationBusinessLogic.cs
+++ b/src/notifications/Notifications.Service/BusinessLogic/NotificationBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/portalbackend/PortalBackend.DBAccess/IPortalRepositories.cs b/src/portalbackend/PortalBackend.DBAccess/IPortalRepositories.cs
index ede460ca79..38cbfaff5c 100644
--- a/src/portalbackend/PortalBackend.DBAccess/IPortalRepositories.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/IPortalRepositories.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/OspDetails.cs b/src/portalbackend/PortalBackend.DBAccess/Models/OspDetails.cs
index 4930963c60..6092522b18 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Models/OspDetails.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Models/OspDetails.cs
@@ -25,5 +25,7 @@ public record OspDetails
     string CallbackUrl,
     string AuthUrl,
     string ClientId,
-    byte[] ClientSecret
+    byte[] ClientSecret,
+    byte[]? InitializationVector,
+    int EncryptionMode
 );
diff --git a/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs b/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs
index 31a3b1ee28..042cc32f2f 100644
--- a/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/PortalRepositories.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -30,38 +29,41 @@ public class PortalRepositories : IPortalRepositories
 {
     private readonly PortalDbContext _dbContext;
 
-    private static readonly IReadOnlyDictionary<Type, Func<PortalDbContext, Object>> _types = new Dictionary<Type, Func<PortalDbContext, Object>> {
-        { typeof(IAgreementRepository), context => new AgreementRepository(context) },
-        { typeof(IApplicationRepository), context => new ApplicationRepository(context) },
-        { typeof(IApplicationChecklistRepository), context => new ApplicationChecklistRepository(context) },
-        { typeof(IAppInstanceRepository), context => new AppInstanceRepository(context) },
-        { typeof(IAppSubscriptionDetailRepository), context => new AppSubscriptionDetailRepository(context) },
-        { typeof(IClientRepository), context => new ClientRepository(context) },
-        { typeof(ICompanyRepository), context => new CompanyRepository(context) },
-        { typeof(ICompanySsiDetailsRepository), context => new CompanySsiDetailsRepository(context) },
-        { typeof(ICompanyRolesRepository), context => new CompanyRolesRepository(context) },
-        { typeof(IConsentAssignedOfferSubscriptionRepository), context => new ConsentAssignedOfferSubscriptionRepository(context) },
-        { typeof(IConnectorsRepository), context => new ConnectorsRepository(context) },
-        { typeof(IConsentRepository), context => new ConsentRepository(context) },
-        { typeof(ICountryRepository), context => new CountryRepository(context) },
-        { typeof(IDocumentRepository), context => new DocumentRepository(context) },
-        { typeof(IIdentityProviderRepository), context => new IdentityProviderRepository(context) },
-        { typeof(IIdentityRepository), context => new IdentityRepository(context) },
-        { typeof(IInvitationRepository), context => new InvitationRepository(context) },
-        { typeof(ILanguageRepository), context => new LanguageRepository(context) },
-        { typeof(INotificationRepository), context => new NotificationRepository(context) },
-        { typeof(INetworkRepository), context => new NetworkRepository(context) },
-        { typeof(IOfferRepository), context => new OfferRepository(context) },
-        { typeof(IOfferSubscriptionsRepository), context => new OfferSubscriptionsRepository(context) },
-        { typeof(IProcessStepRepository), context => new ProcessStepRepository(context) },
-        { typeof(IServiceAccountRepository), context => new ServiceAccountRepository(context) },
-        { typeof(IStaticDataRepository), context => new StaticDataRepository(context) },
-        { typeof(ITechnicalUserProfileRepository), context => new TechnicalUserProfileRepository(context) },
-        { typeof(IUserBusinessPartnerRepository), context => new UserBusinessPartnerRepository(context) },
-        { typeof(IUserRepository), context => new UserRepository(context) },
-        { typeof(IUserRolesRepository), context => new UserRolesRepository(context) },
-        { typeof(ICompanyCertificateRepository), context => new CompanyCertificateRepository(context) },
-    }.ToImmutableDictionary();
+    private static KeyValuePair<Type, Func<PortalDbContext, object>> CreateTypeEntry<T>(Func<PortalDbContext, object> createFunc) => KeyValuePair.Create(typeof(T), createFunc);
+
+    private static readonly IReadOnlyDictionary<Type, Func<PortalDbContext, object>> RepositoryTypes = ImmutableDictionary.CreateRange(new[]
+    {
+        CreateTypeEntry<IAgreementRepository>(context => new AgreementRepository(context)),
+        CreateTypeEntry<IApplicationRepository>(context => new ApplicationRepository(context)),
+        CreateTypeEntry<IApplicationChecklistRepository>(context => new ApplicationChecklistRepository(context)),
+        CreateTypeEntry<IAppInstanceRepository>(context => new AppInstanceRepository(context)),
+        CreateTypeEntry<IAppSubscriptionDetailRepository>(context => new AppSubscriptionDetailRepository(context)),
+        CreateTypeEntry<IClientRepository>(context => new ClientRepository(context)),
+        CreateTypeEntry<ICompanyRepository>(context => new CompanyRepository(context)),
+        CreateTypeEntry<ICompanySsiDetailsRepository>(context => new CompanySsiDetailsRepository(context)),
+        CreateTypeEntry<ICompanyRolesRepository>(context => new CompanyRolesRepository(context)),
+        CreateTypeEntry<IConsentAssignedOfferSubscriptionRepository>(context => new ConsentAssignedOfferSubscriptionRepository(context)),
+        CreateTypeEntry<IConnectorsRepository>(context => new ConnectorsRepository(context)),
+        CreateTypeEntry<IConsentRepository>(context => new ConsentRepository(context)),
+        CreateTypeEntry<ICountryRepository>(context => new CountryRepository(context)),
+        CreateTypeEntry<IDocumentRepository>(context => new DocumentRepository(context)),
+        CreateTypeEntry<IIdentityProviderRepository>(context => new IdentityProviderRepository(context)),
+        CreateTypeEntry<IIdentityRepository>(context => new IdentityRepository(context)),
+        CreateTypeEntry<IInvitationRepository>(context => new InvitationRepository(context)),
+        CreateTypeEntry<ILanguageRepository>(context => new LanguageRepository(context)),
+        CreateTypeEntry<INotificationRepository>(context => new NotificationRepository(context)),
+        CreateTypeEntry<INetworkRepository>(context => new NetworkRepository(context)),
+        CreateTypeEntry<IOfferRepository>(context => new OfferRepository(context)),
+        CreateTypeEntry<IOfferSubscriptionsRepository>(context => new OfferSubscriptionsRepository(context)),
+        CreateTypeEntry<IProcessStepRepository>(context => new ProcessStepRepository(context)),
+        CreateTypeEntry<IServiceAccountRepository>(context => new ServiceAccountRepository(context)),
+        CreateTypeEntry<IStaticDataRepository>(context => new StaticDataRepository(context)),
+        CreateTypeEntry<ITechnicalUserProfileRepository>(context => new TechnicalUserProfileRepository(context)),
+        CreateTypeEntry<IUserBusinessPartnerRepository>(context => new UserBusinessPartnerRepository(context)),
+        CreateTypeEntry<IUserRepository>(context => new UserRepository(context)),
+        CreateTypeEntry<IUserRolesRepository>(context => new UserRolesRepository(context)),
+        CreateTypeEntry<ICompanyCertificateRepository>(context => new CompanyCertificateRepository(context)),
+    });
 
     public PortalRepositories(PortalDbContext portalDbContext)
     {
@@ -70,9 +72,9 @@ public PortalRepositories(PortalDbContext portalDbContext)
 
     public RepositoryType GetInstance<RepositoryType>()
     {
-        Object? repository = default;
+        object? repository = default;
 
-        if (_types.TryGetValue(typeof(RepositoryType), out var createFunc))
+        if (RepositoryTypes.TryGetValue(typeof(RepositoryType), out var createFunc))
         {
             repository = createFunc(_dbContext);
         }
@@ -90,9 +92,8 @@ public TEntity Attach<TEntity>(TEntity entity, Action<TEntity>? setOptionalParam
 
     public void AttachRange<TEntity>(IEnumerable<TEntity> entities, Action<TEntity> setOptionalParameters) where TEntity : class
     {
-        foreach (var entity in entities)
+        foreach (var attachedEntity in entities.Select(entity => _dbContext.Attach(entity).Entity))
         {
-            var attachedEntity = _dbContext.Attach(entity).Entity;
             setOptionalParameters.Invoke(attachedEntity);
         }
     }
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRepository.cs
index 01c98504eb..2ee644d2f2 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/CompanyRepository.cs
@@ -108,13 +108,13 @@ public void CreateUpdateDeleteIdentifiers(Guid companyId, IEnumerable<(UniqueIde
                 company!.CompanyAssignedRoles.SelectMany(car => car.CompanyRole!.CompanyRoleAssignedRoleCollection!.UserRoleCollection!.UserRoles.Where(ur => ur.Offer!.AppInstances.Any(ai => ai.IamClient!.ClientClientId == technicalUserClientId)).Select(ur => ur.Id)).Distinct()))
             .SingleOrDefaultAsync();
 
-    public IAsyncEnumerable<string?> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds) =>
+    public IAsyncEnumerable<string> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds) =>
         _context.Companies
             .AsNoTracking()
             .Where(company => company.CompanyStatusId == CompanyStatusId.ACTIVE &&
-                (bpnIds == null || bpnIds.Select(x => x.ToUpper()).Contains(company.BusinessPartnerNumber) &&
+                (bpnIds == null || bpnIds.Contains(company.BusinessPartnerNumber) &&
                 company.BusinessPartnerNumber != null))
-            .Select(company => company.BusinessPartnerNumber)
+            .Select(company => company.BusinessPartnerNumber!)
             .AsAsyncEnumerable();
 
     public Task<CompanyAddressDetailData?> GetCompanyDetailsAsync(Guid companyId) =>
@@ -344,20 +344,22 @@ public Task<OnboardingServiceProviderCallbackResponseData> GetCallbackData(Guid
                         c.OnboardingServiceProviderDetail!.CallbackUrl,
                         c.OnboardingServiceProviderDetail.AuthUrl,
                         c.OnboardingServiceProviderDetail.ClientId,
-                        c.OnboardingServiceProviderDetail.ClientSecret)
+                        c.OnboardingServiceProviderDetail.ClientSecret,
+                        c.OnboardingServiceProviderDetail.InitializationVector,
+                        c.OnboardingServiceProviderDetail.EncryptionMode)
                 ))
             .SingleOrDefaultAsync();
 
     public void AttachAndModifyOnboardingServiceProvider(Guid companyId, Action<OnboardingServiceProviderDetail>? initialize, Action<OnboardingServiceProviderDetail> setOptionalFields)
     {
-        var ospDetails = new OnboardingServiceProviderDetail(companyId, null!, null!, null!, null!);
+        var ospDetails = new OnboardingServiceProviderDetail(companyId, null!, null!, null!, null!, null, default);
         initialize?.Invoke(ospDetails);
         _context.OnboardingServiceProviderDetails.Attach(ospDetails);
         setOptionalFields.Invoke(ospDetails);
     }
 
-    public OnboardingServiceProviderDetail CreateOnboardingServiceProviderDetails(Guid companyId, string callbackUrl, string authUrl, string clientId, byte[] clientSecret) =>
-        _context.OnboardingServiceProviderDetails.Add(new OnboardingServiceProviderDetail(companyId, callbackUrl, authUrl, clientId, clientSecret)).Entity;
+    public OnboardingServiceProviderDetail CreateOnboardingServiceProviderDetails(Guid companyId, string callbackUrl, string authUrl, string clientId, byte[] clientSecret, byte[]? initializationVector, int encryptionMode) =>
+        _context.OnboardingServiceProviderDetails.Add(new OnboardingServiceProviderDetail(companyId, callbackUrl, authUrl, clientId, clientSecret, initializationVector, encryptionMode)).Entity;
 
     /// <inheritdoc />
     public Task<bool> CheckBpnExists(string bpn) =>
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/DocumentRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/DocumentRepository.cs
index 811e02d42a..feaf4b5203 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/DocumentRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/DocumentRepository.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -37,7 +36,7 @@ public class DocumentRepository : IDocumentRepository
     /// <param name="dbContext">PortalDb context.</param>
     public DocumentRepository(PortalDbContext dbContext)
     {
-        this._dbContext = dbContext;
+        _dbContext = dbContext;
     }
 
     /// <inheritdoc />
@@ -62,8 +61,9 @@ public Document CreateDocument(string documentName, byte[] documentContent, byte
         _dbContext.Documents
             .AsNoTracking()
             .Where(x => x.Id == documentId)
-            .Select(document => ((Guid DocumentId, DocumentStatusId DocumentStatusId, IEnumerable<Guid> ConsentIds, bool IsSameUser))
-                new(document.Id,
+            .Select(document =>
+                new ValueTuple<Guid, DocumentStatusId, IEnumerable<Guid>, bool>(
+                    document.Id,
                     document.DocumentStatusId,
                     document.Consents.Select(consent => consent.Id),
                     document.CompanyUserId == companyUserId))
@@ -92,14 +92,14 @@ public Document CreateDocument(string documentName, byte[] documentContent, byte
 
     /// <inheritdoc />
     public Task<(Guid DocumentId, bool IsSameUser)> GetDocumentIdWithCompanyUserCheckAsync(Guid documentId, Guid companyUserId) =>
-        this._dbContext.Documents
+        _dbContext.Documents
             .Where(x => x.Id == documentId)
             .Select(x => new ValueTuple<Guid, bool>(x.Id, x.CompanyUserId == companyUserId))
             .SingleOrDefaultAsync();
 
     /// <inheritdoc />
     public Task<(byte[]? Content, string FileName, MediaTypeId MediaTypeId, bool IsUserInCompany)> GetDocumentDataAndIsCompanyUserAsync(Guid documentId, Guid userCompanyId) =>
-        this._dbContext.Documents
+        _dbContext.Documents
             .Where(x => x.Id == documentId)
             .Select(x => new
             {
@@ -126,7 +126,7 @@ public void RemoveDocument(Guid documentId) =>
 
     /// <inheritdoc />
     public Task<Document?> GetDocumentByIdAsync(Guid documentId) =>
-        this._dbContext.Documents.SingleOrDefaultAsync(x => x.Id == documentId);
+        _dbContext.Documents.SingleOrDefaultAsync(x => x.Id == documentId);
 
     /// <inheritdoc />
     public Task<(Guid DocumentId, DocumentStatusId DocumentStatusId, bool IsSameApplicationUser, DocumentTypeId documentTypeId, bool IsQueriedApplicationStatus, IEnumerable<Guid> applicationId)> GetDocumentDetailsForApplicationUntrackedAsync(Guid documentId, Guid userCompanyId, IEnumerable<CompanyApplicationStatusId> applicationStatusIds) =>
@@ -243,7 +243,7 @@ public void RemoveDocuments(IEnumerable<Guid> documentIds) =>
         _dbContext.Documents.RemoveRange(documentIds.Select(documentId => new Document(documentId, null!, null!, null!, default, default, default, default)));
 
     public Task<(byte[] Content, string FileName, bool IsDocumentTypeMatch, MediaTypeId MediaTypeId)> GetDocumentAsync(Guid documentId, IEnumerable<DocumentTypeId> documentTypeIds) =>
-        this._dbContext.Documents
+        _dbContext.Documents
             .Where(x => x.Id == documentId)
             .Select(x => new ValueTuple<byte[], string, bool, MediaTypeId>(x.DocumentContent, x.DocumentName, documentTypeIds.Contains(x.DocumentTypeId), x.MediaTypeId))
             .SingleOrDefaultAsync();
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyRepository.cs
index e9bbc4142e..920b65d866 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/ICompanyRepository.cs
@@ -54,7 +54,7 @@ public interface ICompanyRepository
     /// </summary>
     /// <param name="bpnIds">Id of the users company</param>
     /// <returns> Business partner numbers of all active companies</returns>
-    IAsyncEnumerable<string?> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds);
+    IAsyncEnumerable<string> GetAllMemberCompaniesBPNAsync(IEnumerable<string>? bpnIds);
     Task<CompanyAddressDetailData?> GetCompanyDetailsAsync(Guid companyId);
 
     /// <summary>
@@ -171,6 +171,6 @@ public interface ICompanyRepository
     Task<OnboardingServiceProviderCallbackResponseData> GetCallbackData(Guid companyId);
     Task<(bool hasCompanyRole, OspDetails? ospDetails)> GetCallbackEditData(Guid companyId, CompanyRoleId companyRoleId);
     void AttachAndModifyOnboardingServiceProvider(Guid companyId, Action<OnboardingServiceProviderDetail>? initialize, Action<OnboardingServiceProviderDetail> setOptionalFields);
-    OnboardingServiceProviderDetail CreateOnboardingServiceProviderDetails(Guid companyId, string callbackUrl, string authUrl, string clientId, byte[] clientSecret);
+    OnboardingServiceProviderDetail CreateOnboardingServiceProviderDetails(Guid companyId, string callbackUrl, string authUrl, string clientId, byte[] clientSecret, byte[]? initializationVector, int encryptionMode);
     Task<bool> CheckBpnExists(string bpn);
 }
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferRepository.cs
index 8433d3bf13..01249ab31b 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferRepository.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -30,13 +29,6 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositorie
 /// </summary>
 public interface IOfferRepository
 {
-    /// <summary>
-    /// Checks if an app with the given id exists in the persistence layer. 
-    /// </summary>
-    /// <param name="appId">Id of the app.</param>
-    /// <returns><c>true</c> if an app exists on the persistence layer with the given id, <c>false</c> if not.</returns>
-    public Task<bool> CheckAppExistsById(Guid appId);
-
     /// <summary>
     /// Retrieves app provider company details by app id.
     /// </summary>
@@ -137,15 +129,6 @@ public interface IOfferRepository
     /// <param name="offerName"></param>
     Func<int, int, Task<Pagination.Source<AllOfferData>?>> GetProvidedOffersData(IEnumerable<OfferStatusId> offerStatusIds, OfferTypeId offerTypeId, Guid userCompanyId, OfferSorting sorting, string? offerName);
 
-    /// <summary>
-    /// Gets the client roles for a specific app
-    /// </summary>
-    /// <param name="appId">id of the app to get the client roles for</param>
-    /// <param name="languageShortName">The language short names</param>
-    /// <returns>Returns an asyncEnumerable from ClientRoles</returns>
-    [Obsolete("only referenced by code that is marked as obsolte")]
-    IAsyncEnumerable<ClientRoles> GetClientRolesAsync(Guid appId, string languageShortName);
-
     /// Get Offer Release data by Offer Id
     /// </summary>
     /// <param name="offerId">Id of the offer</param>
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferSubscriptionsRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferSubscriptionsRepository.cs
index 2b08abaeda..709d1655ed 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferSubscriptionsRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferSubscriptionsRepository.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/NetworkRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/NetworkRepository.cs
index 17b12a867a..522f92dc50 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/NetworkRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/NetworkRepository.cs
@@ -93,7 +93,9 @@ public Task<Guid> GetNetworkRegistrationDataForProcessIdAsync(Guid processId) =>
                         x.OnboardingServiceProvider.OnboardingServiceProviderDetail.CallbackUrl,
                         x.OnboardingServiceProvider.OnboardingServiceProviderDetail.AuthUrl,
                         x.OnboardingServiceProvider.OnboardingServiceProviderDetail.ClientId,
-                        x.OnboardingServiceProvider.OnboardingServiceProviderDetail.ClientSecret),
+                        x.OnboardingServiceProvider.OnboardingServiceProviderDetail.ClientSecret,
+                        x.OnboardingServiceProvider.OnboardingServiceProviderDetail.InitializationVector,
+                        x.OnboardingServiceProvider.OnboardingServiceProviderDetail.EncryptionMode),
                 x.ExternalId,
                 x.OnboardingServiceProvider.BusinessPartnerNumber,
                 x.ApplicationId,
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferRepository.cs
index 24bfaea49a..13741e7c23 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferRepository.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -43,10 +42,6 @@ public OfferRepository(PortalDbContext portalDbContext)
         this._context = portalDbContext;
     }
 
-    /// <inheritdoc />
-    public Task<bool> CheckAppExistsById(Guid appId) =>
-        _context.Offers.AnyAsync(x => x.Id == appId && x.OfferTypeId == OfferTypeId.APP);
-
     ///<inheritdoc/>
     public Task<OfferProviderDetailsData?> GetOfferProviderDetailsAsync(Guid offerId, OfferTypeId offerTypeId) =>
         _context.Offers.AsNoTracking()
@@ -231,18 +226,6 @@ public void RemoveAppLanguages(IEnumerable<(Guid appId, string languageShortName
                 ))
             .SingleOrDefaultAsync();
 
-    /// <inheritdoc />
-    [Obsolete("only referenced by code that is marked as obsolte")]
-    public IAsyncEnumerable<ClientRoles> GetClientRolesAsync(Guid appId, string languageShortName) =>
-        _context.Offers
-            .Where(app => app.Id == appId)
-            .SelectMany(app => app.UserRoles)
-            .Select(roles => new ClientRoles(
-                roles.Id,
-                roles.UserRoleText,
-                roles.UserRoleDescriptions.SingleOrDefault(desc => desc.LanguageShortName == languageShortName)!.Description
-            )).AsAsyncEnumerable();
-
     /// <inheritdoc />
     public Func<int, int, Task<Pagination.Source<ServiceOverviewData>?>> GetActiveServicesPaginationSource(ServiceOverviewSorting? sorting, ServiceTypeId? serviceTypeId, string languageShortName) =>
         (skip, take) => Pagination.CreateSourceQueryAsync(
@@ -331,7 +314,7 @@ public IAsyncEnumerable<ClientRoles> GetClientRolesAsync(Guid appId, string lang
                 OfferSorting.DateDesc => (IEnumerable<Offer> offers) => offers.OrderByDescending(offer => offer.DateCreated),
                 OfferSorting.NameAsc => (IEnumerable<Offer> offers) => offers.OrderBy(offer => offer.Name),
                 OfferSorting.NameDesc => (IEnumerable<Offer> offers) => offers.OrderByDescending(offer => offer.Name),
-                _ => (Expression<Func<IEnumerable<Offer>, IOrderedEnumerable<Offer>>>?)null
+                _ => null
             },
             offer => new InReviewAppData(
                 offer.Id,
@@ -597,7 +580,7 @@ public void CreateUpdateDeleteOfferDescriptions(Guid offerId, IEnumerable<Locali
             initial => initial.LanguageCode,
             modify => modify.LanguageCode,
             languageCode => new OfferDescription(offerId, languageCode, null!, null!),
-            (initial, modified) => (initial.LongDescription == modified.LongDescription && initial.ShortDescription == modified.ShortDescription),
+            (initial, modified) => initial.LongDescription == modified.LongDescription && initial.ShortDescription == modified.ShortDescription,
             (entity, initial) =>
                 {
                     entity.DescriptionLong = initial.LongDescription;
@@ -722,7 +705,7 @@ public void RemoveOffer(Guid offerId) =>
             {
                 OfferSorting.DateAsc => (IEnumerable<Offer> offers) => offers.OrderBy(offer => offer.DateCreated),
                 OfferSorting.DateDesc => (IEnumerable<Offer> offers) => offers.OrderByDescending(offer => offer.DateCreated),
-                _ => (Expression<Func<IEnumerable<Offer>, IOrderedEnumerable<Offer>>>?)null
+                _ => null
             },
             offer => new AllOfferStatusData(
                 offer.Id,
@@ -748,7 +731,7 @@ public void RemoveOffer(Guid offerId) =>
                 OfferSorting.DateDesc => (IEnumerable<Offer> offers) => offers.OrderByDescending(offer => offer.DateCreated),
                 OfferSorting.NameAsc => (IEnumerable<Offer> offers) => offers.OrderBy(offer => offer.Name),
                 OfferSorting.NameDesc => (IEnumerable<Offer> offers) => offers.OrderByDescending(offer => offer.Name),
-                _ => (Expression<Func<IEnumerable<Offer>, IOrderedEnumerable<Offer>>>?)null
+                _ => null
             },
             offer => new InReviewServiceData(
                 offer.Id,
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs
index 4b04e3d930..1685b8b646 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/OfferSubscriptionsRepository.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -66,7 +65,7 @@ public OfferSubscription CreateOfferSubscription(Guid offerId, Guid companyId, O
                     SubscriptionStatusSorting.CompanyNameDesc => (IEnumerable<Offer> o) => o.OrderByDescending(offer => offer.ProviderCompany!.Name),
                     SubscriptionStatusSorting.OfferIdAsc => (IEnumerable<Offer> o) => o.OrderBy(offer => offer.Id),
                     SubscriptionStatusSorting.OfferIdDesc => (IEnumerable<Offer> o) => o.OrderByDescending(offer => offer.Id),
-                    _ => (Expression<Func<IEnumerable<Offer>, IOrderedEnumerable<Offer>>>?)null
+                    _ => null
                 },
                 g => new OfferCompanySubscriptionStatusData
                 {
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/20240214131909_1.8.0-rc6.Designer.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/20240214131909_1.8.0-rc6.Designer.cs
index 7504af757b..3fb5637a0a 100644
--- a/src/portalbackend/PortalBackend.Migrations/Migrations/20240214131909_1.8.0-rc6.Designer.cs
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/20240214131909_1.8.0-rc6.Designer.cs
@@ -18,12 +18,9 @@
 // ********************************************************************************/
 
 // <auto-generated />
-using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
 
 #nullable disable
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/20240301164139_issue437-codeql-encryption.Designer.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/20240301164139_issue437-codeql-encryption.Designer.cs
new file mode 100644
index 0000000000..1ca400996c
--- /dev/null
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/20240301164139_issue437-codeql-encryption.Designer.cs
@@ -0,0 +1,9219 @@
+/********************************************************************************
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities;
+
+#nullable disable
+
+namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.Migrations.Migrations
+{
+    [DbContext(typeof(PortalDbContext))]
+    [Migration("20240301164139_issue437-codeql-encryption")]
+    partial class issue437codeqlencryption
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("portal")
+                .UseCollation("en_US.utf8")
+                .HasAnnotation("ProductVersion", "7.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20221118", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<Guid?>("AppInstanceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance_id");
+
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_app_subscription_detail20221118");
+
+                    b.ToTable("audit_app_subscription_detail20221118", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditAppSubscriptionDetail20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<Guid?>("AppInstanceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance_id");
+
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_app_subscription_detail20231115");
+
+                    b.ToTable("audit_app_subscription_detail20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20221005", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_application20221005");
+
+                    b.ToTable("audit_company_application20221005", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230214", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_application20230214");
+
+                    b.ToTable("audit_company_application20230214", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20230824", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<int>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_application20230824");
+
+                    b.ToTable("audit_company_application20230824", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyApplication20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<int?>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<int?>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
+
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_application20231115");
+
+                    b.ToTable("audit_company_application20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyAssignedRole2023316", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_assigned_role2023316");
+
+                    b.ToTable("audit_company_assigned_role2023316", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanySsiDetail20230621", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("CompanySsiDetailStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_ssi_detail_status_id");
+
+                    b.Property<Guid>("CreatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<DateTimeOffset?>("ExpiryDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiry_date");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("VerifiedCredentialExternalTypeUseCaseDetailId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("verified_credential_external_type_use_case_detail_id");
+
+                    b.Property<int>("VerifiedCredentialTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_ssi_detail20230621");
+
+                    b.ToTable("audit_company_ssi_detail20230621", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanySsiDetail20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int?>("CompanySsiDetailStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_ssi_detail_status_id");
+
+                    b.Property<Guid?>("CreatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_user_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<DateTimeOffset?>("ExpiryDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiry_date");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("VerifiedCredentialExternalTypeUseCaseDetailId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("verified_credential_external_type_use_case_detail_id");
+
+                    b.Property<int?>("VerifiedCredentialTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_ssi_detail20231115");
+
+                    b.ToTable("audit_company_ssi_detail20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20221005", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("CompanyUserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_user_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
+
+                    b.Property<string>("Lastname")
+                        .HasColumnType("text")
+                        .HasColumnName("lastname");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_user20221005");
+
+                    b.ToTable("audit_company_user20221005", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUser20230522", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
+
+                    b.Property<string>("Lastname")
+                        .HasColumnType("text")
+                        .HasColumnName("lastname");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_user20230523");
+
+                    b.ToTable("audit_company_user20230523", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditCompanyUserAssignedRole20221018", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_company_user_assigned_role20221018");
+
+                    b.ToTable("audit_company_user_assigned_role20221018", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230405", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
+
+                    b.Property<bool?>("DapsRegistrationSuccessful")
+                        .HasColumnType("boolean")
+                        .HasColumnName("daps_registration_successful");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
+
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_connector20230405");
+
+                    b.ToTable("audit_connector20230405", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230503", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
+
+                    b.Property<bool?>("DapsRegistrationSuccessful")
+                        .HasColumnType("boolean")
+                        .HasColumnName("daps_registration_successful");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
+
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_connector20230503");
+
+                    b.ToTable("audit_connector20230503", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20230803", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character varying(2)")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
+
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_connector20230803");
+
+                    b.ToTable("audit_connector20230803", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConnector20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("connector_url");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("LocationId")
+                        .HasColumnType("text")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
+
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int?>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int?>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_connector20231115");
+
+                    b.ToTable("audit_connector20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20230412", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("comment");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("Target")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("target");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_consent20230412");
+
+                    b.ToTable("audit_consent20230412", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditConsent20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<Guid?>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
+
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int?>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("Target")
+                        .HasColumnType("text")
+                        .HasColumnName("target");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_consent20231115");
+
+                    b.ToTable("audit_consent20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231108", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<byte[]>("DocumentContent")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("document_name");
+
+                    b.Property<int>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_document20231108");
+
+                    b.ToTable("audit_document20231108", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditDocument20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<byte[]>("DocumentContent")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .HasColumnType("text")
+                        .HasColumnName("document_name");
+
+                    b.Property<int?>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int?>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int?>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_document20231115");
+
+                    b.ToTable("audit_document20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20230526", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<int>("IdentityTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_type_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("UserEntityId")
+                        .HasMaxLength(36)
+                        .HasColumnType("character varying(36)")
+                        .HasColumnName("user_entity_id");
+
+                    b.Property<int>("UserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("user_status_id")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity20230526");
+
+                    b.ToTable("audit_identity20230526", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentity20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<int?>("IdentityTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_type_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("UserEntityId")
+                        .HasColumnType("text")
+                        .HasColumnName("user_entity_id");
+
+                    b.Property<int?>("UserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("user_status_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity20231115");
+
+                    b.ToTable("audit_identity20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditIdentityAssignedRole20230522", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("IdentityId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_identity_assigned_role20230522");
+
+                    b.ToTable("audit_identity_assigned_role20230522", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230119", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
+
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
+
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20230119");
+
+                    b.ToTable("audit_offer20230119", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20230406", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
+
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
+
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
+
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20230406");
+
+                    b.ToTable("audit_offer20230406", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOffer20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int?>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
+
+                    b.Property<string>("MarketingUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
+
+                    b.Property<int?>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<string>("Provider")
+                        .HasColumnType("text")
+                        .HasColumnName("provider");
+
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
+
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer20231115");
+
+                    b.ToTable("audit_offer20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20221005", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20221005");
+
+                    b.ToTable("audit_offer_subscription20221005", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20230317", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20230317");
+
+                    b.ToTable("audit_offer_subscription20230317", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231013", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20231013");
+
+                    b.ToTable("audit_offer_subscription20231013", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditOfferSubscription20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int?>("OfferSubscriptionStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid?>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_offer_subscription20231115");
+
+                    b.ToTable("audit_offer_subscription20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20230614", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
+
+                    b.Property<string>("AutoSetupUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_provider_company_detail20230614");
+
+                    b.ToTable("audit_provider_company_detail20230614", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditProviderCompanyDetail20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
+
+                    b.Property<string>("AutoSetupUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
+
+                    b.Property<Guid?>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset?>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_provider_company_detail20231115");
+
+                    b.ToTable("audit_provider_company_detail20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20221017", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("UserRoleText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_user_role20221017");
+
+                    b.ToTable("audit_user_role20221017", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.AuditEntities.AuditUserRole20231115", b =>
+                {
+                    b.Property<Guid>("AuditV1Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1id");
+
+                    b.Property<DateTimeOffset>("AuditV1DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("audit_v1date_last_changed");
+
+                    b.Property<Guid?>("AuditV1LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("audit_v1last_editor_id");
+
+                    b.Property<int>("AuditV1OperationId")
+                        .HasColumnType("integer")
+                        .HasColumnName("audit_v1operation_id");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("UserRoleText")
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
+
+                    b.HasKey("AuditV1Id")
+                        .HasName("pk_audit_user_role20231115");
+
+                    b.ToTable("audit_user_role20231115", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<int>("CompanyCertificateStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_status_id");
+
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<DateTimeOffset>("ValidFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_from");
+
+                    b.Property<DateTimeOffset?>("ValidTill")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_till");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_certificates");
+
+                    b.HasIndex("CompanyCertificateStatusId")
+                        .HasDatabaseName("ix_company_certificates_company_certificate_status_id");
+
+                    b.HasIndex("CompanyCertificateTypeId")
+                        .HasDatabaseName("ix_company_certificates_company_certificate_type_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_certificates_company_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_company_certificates_document_id");
+
+                    b.ToTable("company_certificates", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_certificate_statuses");
+
+                    b.ToTable("company_certificate_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTVIE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_certificate_types");
+
+                    b.ToTable("company_certificate_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "AEO_CTPAT_Security_Declaration"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ISO_9001"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "IATF_16949"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "ISO_14001_EMAS_or_national_certification"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ISO_45001_OHSAS_18001_or_national_certification"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "ISO_IEC_27001"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "ISO_50001_or_national_certification"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "ISO_IEC_17025"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "ISO_15504_SPICE"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "B_BBEE_Certificate_of_South_Africa"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "IATF"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "TISAX"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeAssignedStatus", b =>
+                {
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
+
+                    b.Property<int>("CompanyCertificateTypeStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_status_id");
+
+                    b.HasKey("CompanyCertificateTypeId")
+                        .HasName("pk_company_certificate_type_assigned_statuses");
+
+                    b.HasIndex("CompanyCertificateTypeStatusId")
+                        .HasDatabaseName("ix_company_certificate_type_assigned_statuses_company_certific");
+
+                    b.ToTable("company_certificate_type_assigned_statuses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeDescription", b =>
+                {
+                    b.Property<int>("CompanyCertificateTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_certificate_type_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.HasKey("CompanyCertificateTypeId", "LanguageShortName")
+                        .HasName("pk_company_certificate_type_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_company_certificate_type_descriptions_language_short_name");
+
+                    b.ToTable("company_certificate_type_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_certificate_type_statuses");
+
+                    b.ToTable("company_certificate_type_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTVIE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("city");
+
+                    b.Property<string>("CountryAlpha2Code")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("country_alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Region")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("region");
+
+                    b.Property<string>("Streetadditional")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetadditional");
+
+                    b.Property<string>("Streetname")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetname");
+
+                    b.Property<string>("Streetnumber")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("streetnumber");
+
+                    b.Property<string>("Zipcode")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("zipcode");
+
+                    b.HasKey("Id")
+                        .HasName("pk_addresses");
+
+                    b.HasIndex("CountryAlpha2Code")
+                        .HasDatabaseName("ix_addresses_country_alpha2code");
+
+                    b.ToTable("addresses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<int>("AgreementCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("agreement_category_id");
+
+                    b.Property<string>("AgreementLink")
+                        .HasColumnType("text")
+                        .HasColumnName("agreement_link");
+
+                    b.Property<int>("AgreementStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1)
+                        .HasColumnName("agreement_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<Guid>("IssuerCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("issuer_company_id");
+
+                    b.Property<bool>("Mandatory")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true)
+                        .HasColumnName("mandatory");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_agreements");
+
+                    b.HasIndex("AgreementCategoryId")
+                        .HasDatabaseName("ix_agreements_agreement_category_id");
+
+                    b.HasIndex("AgreementStatusId")
+                        .HasDatabaseName("ix_agreements_agreement_status_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_agreements_document_id");
+
+                    b.HasIndex("IssuerCompanyId")
+                        .HasDatabaseName("ix_agreements_issuer_company_id");
+
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_agreements_use_case_id");
+
+                    b.ToTable("agreements", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedCompanyRole", b =>
+                {
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
+
+                    b.HasKey("AgreementId", "CompanyRoleId")
+                        .HasName("pk_agreement_assigned_company_roles");
+
+                    b.HasIndex("CompanyRoleId")
+                        .HasDatabaseName("ix_agreement_assigned_company_roles_company_role_id");
+
+                    b.ToTable("agreement_assigned_company_roles", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOffer", b =>
+                {
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.HasKey("AgreementId", "OfferId")
+                        .HasName("pk_agreement_assigned_offers");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_agreement_assigned_offers_offer_id");
+
+                    b.ToTable("agreement_assigned_offers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOfferType", b =>
+                {
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.HasKey("AgreementId", "OfferTypeId")
+                        .HasName("pk_agreement_assigned_offer_types");
+
+                    b.HasIndex("OfferTypeId")
+                        .HasDatabaseName("ix_agreement_assigned_offer_types_offer_type_id");
+
+                    b.ToTable("agreement_assigned_offer_types", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_agreement_categories");
+
+                    b.ToTable("agreement_categories", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "CX_FRAME_CONTRACT"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "APP_CONTRACT"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "DATA_CONTRACT"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "SERVICE_CONTRACT"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_agreement_statuses");
+
+                    b.ToTable("agreement_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppAssignedUseCase", b =>
+                {
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
+
+                    b.Property<Guid>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
+
+                    b.HasKey("AppId", "UseCaseId")
+                        .HasName("pk_app_assigned_use_cases");
+
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_app_assigned_use_cases_use_case_id");
+
+                    b.ToTable("app_assigned_use_cases", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
+
+                    b.Property<Guid>("IamClientId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("iam_client_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_app_instances");
+
+                    b.HasIndex("AppId")
+                        .HasDatabaseName("ix_app_instances_app_id");
+
+                    b.HasIndex("IamClientId")
+                        .HasDatabaseName("ix_app_instances_iam_client_id");
+
+                    b.ToTable("app_instances", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceAssignedCompanyServiceAccount", b =>
+                {
+                    b.Property<Guid>("AppInstanceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance_id");
+
+                    b.Property<Guid>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.HasKey("AppInstanceId", "CompanyServiceAccountId")
+                        .HasName("pk_app_instance_assigned_service_accounts");
+
+                    b.HasIndex("CompanyServiceAccountId")
+                        .HasDatabaseName("ix_app_instance_assigned_service_accounts_company_service_acco");
+
+                    b.ToTable("app_instance_assigned_service_accounts", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
+
+                    b.Property<string>("InstanceUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("instance_url");
+
+                    b.Property<bool>("IsSingleInstance")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_single_instance");
+
+                    b.HasKey("Id")
+                        .HasName("pk_app_instance_setups");
+
+                    b.HasIndex("AppId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_app_instance_setups_app_id");
+
+                    b.ToTable("app_instance_setups", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppLanguage", b =>
+                {
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.HasKey("AppId", "LanguageShortName")
+                        .HasName("pk_app_languages");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_app_languages_language_short_name");
+
+                    b.ToTable("app_languages", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("AppInstanceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance_id");
+
+                    b.Property<string>("AppSubscriptionUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("app_subscription_url");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_app_subscription_details");
+
+                    b.HasIndex("AppInstanceId")
+                        .HasDatabaseName("ix_app_subscription_details_app_instance_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_app_subscription_details_last_editor_id");
+
+                    b.HasIndex("OfferSubscriptionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_app_subscription_details_offer_subscription_id");
+
+                    b.ToTable("app_subscription_details", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL AFTER INSERT\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_APPSUBSCRIPTIONDETAIL\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_app_subscription_detail20231115\" (\"id\", \"offer_subscription_id\", \"app_instance_id\", \"app_subscription_url\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"offer_subscription_id\", \r\n  NEW.\"app_instance_id\", \r\n  NEW.\"app_subscription_url\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL AFTER UPDATE\r\nON \"portal\".\"app_subscription_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_APPSUBSCRIPTIONDETAIL\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntry", b =>
+                {
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("application_id");
+
+                    b.Property<int>("ApplicationChecklistEntryTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_checklist_entry_type_id");
+
+                    b.Property<int>("ApplicationChecklistEntryStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_checklist_entry_status_id");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.HasKey("ApplicationId", "ApplicationChecklistEntryTypeId")
+                        .HasName("pk_application_checklist");
+
+                    b.HasIndex("ApplicationChecklistEntryStatusId")
+                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_status_id");
+
+                    b.HasIndex("ApplicationChecklistEntryTypeId")
+                        .HasDatabaseName("ix_application_checklist_application_checklist_entry_type_id");
+
+                    b.ToTable("application_checklist", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_application_checklist_statuses");
+
+                    b.ToTable("application_checklist_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "TO_DO"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "IN_PROGRESS"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "DONE"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FAILED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_application_checklist_types");
+
+                    b.ToTable("application_checklist_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "REGISTRATION_VERIFICATION"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "BUSINESS_PARTNER_NUMBER"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "APPLICATION_ACTIVATION"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AuditOperation", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_audit_operation");
+
+                    b.ToTable("audit_operation", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "INSERT"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "UPDATE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "DELETE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_bpdm_identifiers");
+
+                    b.ToTable("bpdm_identifiers", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "EU_VAT_ID_DE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CH_UID"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "EU_VAT_ID_FR"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FR_SIREN"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "EU_VAT_ID_AT"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "DE_BNUM"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "CZ_ICO"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "EU_VAT_ID_CZ"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "EU_VAT_ID_PL"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "EU_VAT_ID_BE"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "EU_VAT_ID_CH"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "EU_VAT_ID_DK"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "EU_VAT_ID_ES"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "EU_VAT_ID_GB"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "EU_VAT_ID_NO"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "BE_ENT_NO"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "CVR_DK"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "ID_CRN"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "NO_ORGID"
+                        },
+                        new
+                        {
+                            Id = 20,
+                            Label = "LEI_ID"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("AddressId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("address_id");
+
+                    b.Property<string>("BusinessPartnerNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("business_partner_number");
+
+                    b.Property<int>("CompanyStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("Shortname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("shortname");
+
+                    b.HasKey("Id")
+                        .HasName("pk_companies");
+
+                    b.HasIndex("AddressId")
+                        .HasDatabaseName("ix_companies_address_id");
+
+                    b.HasIndex("CompanyStatusId")
+                        .HasDatabaseName("ix_companies_company_status_id");
+
+                    b.HasIndex("SelfDescriptionDocumentId")
+                        .HasDatabaseName("ix_companies_self_description_document_id");
+
+                    b.ToTable("companies", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<int>("ApplicationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("application_status_id");
+
+                    b.Property<Guid?>("ChecklistProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("checklist_process_id");
+
+                    b.Property<int>("CompanyApplicationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_application_type_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_applications");
+
+                    b.HasIndex("ApplicationStatusId")
+                        .HasDatabaseName("ix_company_applications_application_status_id");
+
+                    b.HasIndex("ChecklistProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_applications_checklist_process_id");
+
+                    b.HasIndex("CompanyApplicationTypeId")
+                        .HasDatabaseName("ix_company_applications_company_application_type_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_applications_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_applications_last_editor_id");
+
+                    b.HasIndex("OnboardingServiceProviderId")
+                        .HasDatabaseName("ix_company_applications_onboarding_service_provider_id");
+
+                    b.ToTable("company_applications", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION AFTER INSERT\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYAPPLICATION\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_application20231115\" (\"id\", \"date_created\", \"date_last_changed\", \"application_status_id\", \"company_id\", \"checklist_process_id\", \"company_application_type_id\", \"onboarding_service_provider_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"application_status_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"checklist_process_id\", \r\n  NEW.\"company_application_type_id\", \r\n  NEW.\"onboarding_service_provider_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION AFTER UPDATE\r\nON \"portal\".\"company_applications\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYAPPLICATION\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_application_statuses");
+
+                    b.ToTable("company_application_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "CREATED"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ADD_COMPANY_DATA"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INVITE_USER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "SELECT_COMPANY_ROLE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "UPLOAD_DOCUMENTS"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "VERIFY"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "CONFIRMED"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "DECLINED"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CANCELLED_BY_CUSTOMER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_application_types");
+
+                    b.ToTable("company_application_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "INTERNAL"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "EXTERNAL"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedRole", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("CompanyId", "CompanyRoleId")
+                        .HasName("pk_company_assigned_roles");
+
+                    b.HasIndex("CompanyRoleId")
+                        .HasDatabaseName("ix_company_assigned_roles_company_role_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_assigned_roles_last_editor_id");
+
+                    b.ToTable("company_assigned_roles", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYASSIGNEDROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_assigned_role2023316\" (\"company_id\", \"company_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"company_id\", \r\n  NEW.\"company_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"company_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYASSIGNEDROLE\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedUseCase", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
+
+                    b.HasKey("CompanyId", "UseCaseId")
+                        .HasName("pk_company_assigned_use_cases");
+
+                    b.HasIndex("UseCaseId")
+                        .HasDatabaseName("ix_company_assigned_use_cases_use_case_id");
+
+                    b.ToTable("company_assigned_use_cases", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentifier", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("UniqueIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("unique_identifier_id");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("value");
+
+                    b.HasKey("CompanyId", "UniqueIdentifierId")
+                        .HasName("pk_company_identifiers");
+
+                    b.HasIndex("UniqueIdentifierId")
+                        .HasDatabaseName("ix_company_identifiers_unique_identifier_id");
+
+                    b.ToTable("company_identifiers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentityProvider", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
+
+                    b.HasKey("CompanyId", "IdentityProviderId")
+                        .HasName("pk_company_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .HasDatabaseName("ix_company_identity_providers_identity_provider_id");
+
+                    b.ToTable("company_identity_providers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_roles");
+
+                    b.ToTable("company_roles", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE_PARTICIPANT"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "APP_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "SERVICE_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "OPERATOR"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ONBOARDING_SERVICE_PROVIDER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", b =>
+                {
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
+
+                    b.Property<Guid>("UserRoleCollectionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_collection_id");
+
+                    b.HasKey("CompanyRoleId")
+                        .HasName("pk_company_role_assigned_role_collections");
+
+                    b.HasIndex("UserRoleCollectionId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_role_assigned_role_collections_user_role_collection");
+
+                    b.ToTable("company_role_assigned_role_collections", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleDescription", b =>
+                {
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("description");
+
+                    b.HasKey("CompanyRoleId", "LanguageShortName")
+                        .HasName("pk_company_role_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_company_role_descriptions_language_short_name");
+
+                    b.ToTable("company_role_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", b =>
+                {
+                    b.Property<int>("CompanyRoleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_role_id");
+
+                    b.Property<bool>("IsRegistrationRole")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_registration_role");
+
+                    b.HasKey("CompanyRoleId")
+                        .HasName("pk_company_role_registration_data");
+
+                    b.ToTable("company_role_registration_data", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ClientClientId")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("client_client_id");
+
+                    b.Property<int>("CompanyServiceAccountTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_service_account_type_id");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid?>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_service_accounts");
+
+                    b.HasIndex("ClientClientId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_service_accounts_client_client_id");
+
+                    b.HasIndex("CompanyServiceAccountTypeId")
+                        .HasDatabaseName("ix_company_service_accounts_company_service_account_type_id");
+
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_company_service_accounts_offer_subscription_id");
+
+                    b.ToTable("company_service_accounts", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccountType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_service_account_types");
+
+                    b.ToTable("company_service_account_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "MANAGED"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "OWN"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanySsiDetail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<int>("CompanySsiDetailStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("company_ssi_detail_status_id");
+
+                    b.Property<Guid>("CreatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<DateTimeOffset?>("ExpiryDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiry_date");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid?>("VerifiedCredentialExternalTypeUseCaseDetailId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("verified_credential_external_type_use_case_detail_id");
+
+                    b.Property<int>("VerifiedCredentialTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_ssi_details");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_company_ssi_details_company_id");
+
+                    b.HasIndex("CompanySsiDetailStatusId")
+                        .HasDatabaseName("ix_company_ssi_details_company_ssi_detail_status_id");
+
+                    b.HasIndex("CreatorUserId")
+                        .HasDatabaseName("ix_company_ssi_details_creator_user_id");
+
+                    b.HasIndex("DocumentId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_company_ssi_details_document_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_ssi_details_last_editor_id");
+
+                    b.HasIndex("VerifiedCredentialExternalTypeUseCaseDetailId")
+                        .HasDatabaseName("ix_company_ssi_details_verified_credential_external_type_use_c");
+
+                    b.HasIndex("VerifiedCredentialTypeId")
+                        .HasDatabaseName("ix_company_ssi_details_verified_credential_type_id");
+
+                    b.ToTable("company_ssi_details", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_ssi_detail20231115\" (\"id\", \"company_id\", \"verified_credential_type_id\", \"company_ssi_detail_status_id\", \"document_id\", \"date_created\", \"creator_user_id\", \"expiry_date\", \"verified_credential_external_type_use_case_detail_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"verified_credential_type_id\", \r\n  NEW.\"company_ssi_detail_status_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"creator_user_id\", \r\n  NEW.\"expiry_date\", \r\n  NEW.\"verified_credential_external_type_use_case_detail_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL AFTER INSERT\r\nON \"portal\".\"company_ssi_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYSSIDETAIL\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_ssi_detail20231115\" (\"id\", \"company_id\", \"verified_credential_type_id\", \"company_ssi_detail_status_id\", \"document_id\", \"date_created\", \"creator_user_id\", \"expiry_date\", \"verified_credential_external_type_use_case_detail_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"verified_credential_type_id\", \r\n  NEW.\"company_ssi_detail_status_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"creator_user_id\", \r\n  NEW.\"expiry_date\", \r\n  NEW.\"verified_credential_external_type_use_case_detail_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL AFTER UPDATE\r\nON \"portal\".\"company_ssi_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYSSIDETAIL\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanySsiDetailStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_ssi_detail_statuses");
+
+                    b.ToTable("company_ssi_detail_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_statuses");
+
+                    b.ToTable("company_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "REJECTED"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "INACTIVE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "DELETED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Firstname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("firstname");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<byte[]>("Lastlogin")
+                        .HasColumnType("bytea")
+                        .HasColumnName("lastlogin");
+
+                    b.Property<string>("Lastname")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("lastname");
+
+                    b.HasKey("Id")
+                        .HasName("pk_company_users");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_company_users_last_editor_id");
+
+                    b.ToTable("company_users", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_COMPANYUSER");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_COMPANYUSER AFTER INSERT\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_COMPANYUSER\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_COMPANYUSER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_company_user20230523\" (\"id\", \"email\", \"firstname\", \"lastlogin\", \"lastname\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"email\", \r\n  NEW.\"firstname\", \r\n  NEW.\"lastlogin\", \r\n  NEW.\"lastname\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_COMPANYUSER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_COMPANYUSER AFTER UPDATE\r\nON \"portal\".\"company_users\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_COMPANYUSER\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedAppFavourite", b =>
+                {
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<Guid>("AppId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_id");
+
+                    b.HasKey("CompanyUserId", "AppId")
+                        .HasName("pk_company_user_assigned_app_favourites");
+
+                    b.HasIndex("AppId")
+                        .HasDatabaseName("ix_company_user_assigned_app_favourites_app_id");
+
+                    b.ToTable("company_user_assigned_app_favourites", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedBusinessPartner", b =>
+                {
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<string>("BusinessPartnerNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("business_partner_number");
+
+                    b.HasKey("CompanyUserId", "BusinessPartnerNumber")
+                        .HasName("pk_company_user_assigned_business_partners");
+
+                    b.ToTable("company_user_assigned_business_partners", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedIdentityProvider", b =>
+                {
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
+
+                    b.Property<string>("ProviderId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("provider_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("CompanyUserId", "IdentityProviderId")
+                        .HasName("pk_company_user_assigned_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .HasDatabaseName("ix_company_user_assigned_identity_providers_identity_provider_");
+
+                    b.ToTable("company_user_assigned_identity_providers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("CompanyServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_service_account_id");
+
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("connector_url");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("HostId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("host_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("location_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<Guid>("ProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_id");
+
+                    b.Property<Guid?>("SelfDescriptionDocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("self_description_document_id");
+
+                    b.Property<string>("SelfDescriptionMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("self_description_message");
+
+                    b.Property<int>("StatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("status_id");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("type_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_connectors");
+
+                    b.HasIndex("CompanyServiceAccountId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_connectors_company_service_account_id");
+
+                    b.HasIndex("HostId")
+                        .HasDatabaseName("ix_connectors_host_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_connectors_last_editor_id");
+
+                    b.HasIndex("LocationId")
+                        .HasDatabaseName("ix_connectors_location_id");
+
+                    b.HasIndex("ProviderId")
+                        .HasDatabaseName("ix_connectors_provider_id");
+
+                    b.HasIndex("SelfDescriptionDocumentId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_connectors_self_description_document_id");
+
+                    b.HasIndex("StatusId")
+                        .HasDatabaseName("ix_connectors_status_id");
+
+                    b.HasIndex("TypeId")
+                        .HasDatabaseName("ix_connectors_type_id");
+
+                    b.ToTable("connectors", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONNECTOR");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONNECTOR");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20231115\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"company_service_account_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"company_service_account_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONNECTOR AFTER INSERT\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONNECTOR\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONNECTOR", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONNECTOR$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_connector20231115\" (\"id\", \"name\", \"connector_url\", \"type_id\", \"status_id\", \"provider_id\", \"host_id\", \"self_description_document_id\", \"location_id\", \"self_description_message\", \"date_last_changed\", \"company_service_account_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"connector_url\", \r\n  NEW.\"type_id\", \r\n  NEW.\"status_id\", \r\n  NEW.\"provider_id\", \r\n  NEW.\"host_id\", \r\n  NEW.\"self_description_document_id\", \r\n  NEW.\"location_id\", \r\n  NEW.\"self_description_message\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"company_service_account_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONNECTOR$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONNECTOR AFTER UPDATE\r\nON \"portal\".\"connectors\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONNECTOR\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorAssignedOfferSubscription", b =>
+                {
+                    b.Property<Guid>("ConnectorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("connector_id");
+
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.HasKey("ConnectorId", "OfferSubscriptionId")
+                        .HasName("pk_connector_assigned_offer_subscriptions");
+
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_connector_assigned_offer_subscriptions_offer_subscription_id");
+
+                    b.ToTable("connector_assigned_offer_subscriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_connector_statuses");
+
+                    b.ToTable("connector_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_connector_types");
+
+                    b.ToTable("connector_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "COMPANY_CONNECTOR"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CONNECTOR_AS_A_SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("comment");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<int>("ConsentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("consent_status_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("Target")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("target");
+
+                    b.HasKey("Id")
+                        .HasName("pk_consents");
+
+                    b.HasIndex("AgreementId")
+                        .HasDatabaseName("ix_consents_agreement_id");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_consents_company_id");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_consents_company_user_id");
+
+                    b.HasIndex("ConsentStatusId")
+                        .HasDatabaseName("ix_consents_consent_status_id");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_consents_document_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_consents_last_editor_id");
+
+                    b.ToTable("consents", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_CONSENT");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_CONSENT");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_CONSENT AFTER INSERT\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_CONSENT\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_CONSENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_CONSENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_consent20231115\" (\"id\", \"date_created\", \"comment\", \"consent_status_id\", \"target\", \"agreement_id\", \"company_id\", \"document_id\", \"company_user_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"comment\", \r\n  NEW.\"consent_status_id\", \r\n  NEW.\"target\", \r\n  NEW.\"agreement_id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"document_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_CONSENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_CONSENT AFTER UPDATE\r\nON \"portal\".\"consents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_CONSENT\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOffer", b =>
+                {
+                    b.Property<Guid>("ConsentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("consent_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.HasKey("ConsentId", "OfferId")
+                        .HasName("pk_consent_assigned_offers");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_consent_assigned_offers_offer_id");
+
+                    b.ToTable("consent_assigned_offers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOfferSubscription", b =>
+                {
+                    b.Property<Guid>("ConsentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("consent_id");
+
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.HasKey("ConsentId", "OfferSubscriptionId")
+                        .HasName("pk_consent_assigned_offer_subscriptions");
+
+                    b.HasIndex("OfferSubscriptionId")
+                        .HasDatabaseName("ix_consent_assigned_offer_subscriptions_offer_subscription_id");
+
+                    b.ToTable("consent_assigned_offer_subscriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_consent_statuses");
+
+                    b.ToTable("consent_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", b =>
+                {
+                    b.Property<string>("Alpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("alpha2code")
+                        .IsFixedLength()
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
+
+                    b.Property<string>("Alpha3Code")
+                        .HasMaxLength(3)
+                        .HasColumnType("character(3)")
+                        .HasColumnName("alpha3code")
+                        .IsFixedLength()
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha3code");
+
+                    b.HasKey("Alpha2Code")
+                        .HasName("pk_countries");
+
+                    b.ToTable("countries", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryAssignedIdentifier", b =>
+                {
+                    b.Property<string>("CountryAlpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("country_alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "country_alpha2code");
+
+                    b.Property<int>("UniqueIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("unique_identifier_id");
+
+                    b.Property<int?>("BpdmIdentifierId")
+                        .HasColumnType("integer")
+                        .HasColumnName("bpdm_identifier_id");
+
+                    b.HasKey("CountryAlpha2Code", "UniqueIdentifierId")
+                        .HasName("pk_country_assigned_identifiers");
+
+                    b.HasIndex("BpdmIdentifierId")
+                        .HasDatabaseName("ix_country_assigned_identifiers_bpdm_identifier_id");
+
+                    b.HasIndex("UniqueIdentifierId")
+                        .HasDatabaseName("ix_country_assigned_identifiers_unique_identifier_id");
+
+                    b.ToTable("country_assigned_identifiers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryLongName", b =>
+                {
+                    b.Property<string>("Alpha2Code")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("alpha2code")
+                        .HasAnnotation("Relational:JsonPropertyName", "alpha2code");
+
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name");
+
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("long_name");
+
+                    b.HasKey("Alpha2Code", "ShortName")
+                        .HasName("pk_country_long_names");
+
+                    b.HasIndex("ShortName")
+                        .HasDatabaseName("ix_country_long_names_short_name");
+
+                    b.ToTable("country_long_names", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<byte[]>("DocumentContent")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_content");
+
+                    b.Property<byte[]>("DocumentHash")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("document_hash");
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("document_name");
+
+                    b.Property<int>("DocumentStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_status_id");
+
+                    b.Property<int>("DocumentTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("document_type_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int>("MediaTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("media_type_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_documents");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_documents_company_user_id");
+
+                    b.HasIndex("DocumentStatusId")
+                        .HasDatabaseName("ix_documents_document_status_id");
+
+                    b.HasIndex("DocumentTypeId")
+                        .HasDatabaseName("ix_documents_document_type_id");
+
+                    b.HasIndex("MediaTypeId")
+                        .HasDatabaseName("ix_documents_media_type_id");
+
+                    b.ToTable("documents", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_DOCUMENT");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_DOCUMENT");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20231115\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_DOCUMENT AFTER INSERT\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_DOCUMENT\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_DOCUMENT", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_DOCUMENT$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_document20231115\" (\"id\", \"date_created\", \"document_hash\", \"document_content\", \"document_name\", \"media_type_id\", \"document_type_id\", \"document_status_id\", \"company_user_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"document_hash\", \r\n  NEW.\"document_content\", \r\n  NEW.\"document_name\", \r\n  NEW.\"media_type_id\", \r\n  NEW.\"document_type_id\", \r\n  NEW.\"document_status_id\", \r\n  NEW.\"company_user_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_DOCUMENT$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_DOCUMENT AFTER UPDATE\r\nON \"portal\".\"documents\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_DOCUMENT\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_document_status");
+
+                    b.ToTable("document_status", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "LOCKED"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_document_types");
+
+                    b.ToTable("document_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "CX_FRAME_CONTRACT"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "COMMERCIAL_REGISTER_EXTRACT"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "APP_CONTRACT"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "CONFORMITY_APPROVAL_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "ADDITIONAL_DETAILS"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "APP_LEADIMAGE"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "APP_IMAGE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "SELF_DESCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "APP_TECHNICAL_INFORMATION"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CONFORMITY_APPROVAL_CONNECTOR"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "CONFORMITY_APPROVAL_BUSINESS_APPS"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "CONFORMITY_APPROVAL_SERVICES"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "SERVICE_LEADIMAGE"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "PRESENTATION"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "COMPANY_CERTIFICATE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ClientClientId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("client_client_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_iam_clients");
+
+                    b.HasIndex("ClientClientId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_iam_clients_client_client_id");
+
+                    b.ToTable("iam_clients", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", b =>
+                {
+                    b.Property<string>("IamIdpAlias")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("iam_idp_alias");
+
+                    b.Property<Guid>("IdentityProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_provider_id");
+
+                    b.Property<string>("MetadataUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("metadata_url");
+
+                    b.HasKey("IamIdpAlias")
+                        .HasName("pk_iam_identity_providers");
+
+                    b.HasIndex("IdentityProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_iam_identity_providers_identity_provider_id");
+
+                    b.ToTable("iam_identity_providers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<int>("IdentityTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_type_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<string>("UserEntityId")
+                        .HasMaxLength(36)
+                        .HasColumnType("character varying(36)")
+                        .HasColumnName("user_entity_id");
+
+                    b.Property<int>("UserStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("user_status_id")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_status_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identities");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_identities_company_id");
+
+                    b.HasIndex("IdentityTypeId")
+                        .HasDatabaseName("ix_identities_identity_type_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_identities_last_editor_id");
+
+                    b.HasIndex("UserEntityId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_identities_user_entity_id");
+
+                    b.HasIndex("UserStatusId")
+                        .HasDatabaseName("ix_identities_user_status_id");
+
+                    b.ToTable("identities", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITY");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITY");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITY AFTER INSERT\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITY\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITY", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITY$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity20231115\" (\"id\", \"date_created\", \"company_id\", \"user_status_id\", \"user_entity_id\", \"identity_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"company_id\", \r\n  NEW.\"user_status_id\", \r\n  NEW.\"user_entity_id\", \r\n  NEW.\"identity_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITY$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITY AFTER UPDATE\r\nON \"portal\".\"identities\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITY\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityAssignedRole", b =>
+                {
+                    b.Property<Guid>("IdentityId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_id");
+
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("IdentityId", "UserRoleId")
+                        .HasName("pk_identity_assigned_roles");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_identity_assigned_roles_last_editor_id");
+
+                    b.HasIndex("UserRoleId")
+                        .HasDatabaseName("ix_identity_assigned_roles_user_role_id");
+
+                    b.ToTable("identity_assigned_roles", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE AFTER INSERT\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_IDENTITYASSIGNEDROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_identity_assigned_role20230522\" (\"identity_id\", \"user_role_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"identity_id\", \r\n  NEW.\"user_role_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE AFTER UPDATE\r\nON \"portal\".\"identity_assigned_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_IDENTITYASSIGNEDROLE\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<int>("IdentityProviderCategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_provider_category_id");
+
+                    b.Property<int>("IdentityProviderTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("identity_provider_type_id");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_providers");
+
+                    b.HasIndex("IdentityProviderCategoryId")
+                        .HasDatabaseName("ix_identity_providers_identity_provider_category_id");
+
+                    b.HasIndex("IdentityProviderTypeId")
+                        .HasDatabaseName("ix_identity_providers_identity_provider_type_id");
+
+                    b.HasIndex("OwnerId")
+                        .HasDatabaseName("ix_identity_providers_owner_id");
+
+                    b.ToTable("identity_providers", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_provider_categories");
+
+                    b.ToTable("identity_provider_categories", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 2,
+                            Label = "KEYCLOAK_OIDC"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "KEYCLOAK_SAML"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_provider_types");
+
+                    b.ToTable("identity_provider_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "OWN"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "MANAGED"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "SHARED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_type");
+
+                    b.ToTable("identity_type", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "COMPANY_USER"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "COMPANY_SERVICE_ACCOUNT"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_identity_user_statuses");
+
+                    b.ToTable("identity_user_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "INACTIVE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "DELETED"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "PENDING"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Invitation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_application_id");
+
+                    b.Property<Guid>("CompanyUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<int>("InvitationStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("invitation_status_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_invitations");
+
+                    b.HasIndex("CompanyApplicationId")
+                        .HasDatabaseName("ix_invitations_company_application_id");
+
+                    b.HasIndex("CompanyUserId")
+                        .HasDatabaseName("ix_invitations_company_user_id");
+
+                    b.HasIndex("InvitationStatusId")
+                        .HasDatabaseName("ix_invitations_invitation_status_id");
+
+                    b.ToTable("invitations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_invitation_statuses");
+
+                    b.ToTable("invitation_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "CREATED"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "ACCEPTED"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "DECLINED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", b =>
+                {
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name")
+                        .IsFixedLength();
+
+                    b.HasKey("ShortName")
+                        .HasName("pk_languages");
+
+                    b.ToTable("languages", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LanguageLongName", b =>
+                {
+                    b.Property<string>("ShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("short_name")
+                        .IsFixedLength();
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name")
+                        .IsFixedLength();
+
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("long_name");
+
+                    b.HasKey("ShortName", "LanguageShortName")
+                        .HasName("pk_language_long_names");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_language_long_names_language_short_name");
+
+                    b.ToTable("language_long_names", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_license_types");
+
+                    b.ToTable("license_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "COTS"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "FOSS"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_media_types");
+
+                    b.ToTable("media_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "JPEG"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "GIF"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "PNG"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "SVG"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "TIFF"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "PDF"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "JSON"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "PEM"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "CA_CERT"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "PKX_CER"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "OCTET"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("application_id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("ExternalId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("external_id");
+
+                    b.Property<Guid>("OnboardingServiceProviderId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("onboarding_service_provider_id");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_network_registrations");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_application_id");
+
+                    b.HasIndex("CompanyId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_company_id");
+
+                    b.HasIndex("OnboardingServiceProviderId")
+                        .HasDatabaseName("ix_network_registrations_onboarding_service_provider_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_process_id");
+
+                    b.HasIndex("ExternalId", "OnboardingServiceProviderId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_network_registrations_external_id_onboarding_service_provid");
+
+                    b.ToTable("network_registrations", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Content")
+                        .HasColumnType("text")
+                        .HasColumnName("content");
+
+                    b.Property<Guid?>("CreatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_user_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<bool?>("Done")
+                        .HasColumnType("boolean")
+                        .HasColumnName("done");
+
+                    b.Property<DateTimeOffset?>("DueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("due_date");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<int>("NotificationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_type_id");
+
+                    b.Property<Guid>("ReceiverUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("receiver_user_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notifications");
+
+                    b.HasIndex("CreatorUserId")
+                        .HasDatabaseName("ix_notifications_creator_user_id");
+
+                    b.HasIndex("NotificationTypeId")
+                        .HasDatabaseName("ix_notifications_notification_type_id");
+
+                    b.HasIndex("ReceiverUserId")
+                        .HasDatabaseName("ix_notifications_receiver_user_id");
+
+                    b.ToTable("notifications", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_topic");
+
+                    b.ToTable("notification_topic", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "INFO"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ACTION"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "OFFER"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_notification_type");
+
+                    b.ToTable("notification_type", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "INFO"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ACTION"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "WELCOME"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "WELCOME_USE_CASES"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "WELCOME_SERVICE_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "WELCOME_CONNECTOR_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "WELCOME_APP_MARKETPLACE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "APP_SUBSCRIPTION_REQUEST"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "APP_SUBSCRIPTION_ACTIVATION"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "CONNECTOR_REGISTERED"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "APP_RELEASE_REQUEST"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "TECHNICAL_USER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "SERVICE_REQUEST"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "SERVICE_ACTIVATION"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "APP_ROLE_ADDED"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "APP_RELEASE_APPROVAL"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "SERVICE_RELEASE_REQUEST"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "SERVICE_RELEASE_APPROVAL"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "APP_RELEASE_REJECTION"
+                        },
+                        new
+                        {
+                            Id = 20,
+                            Label = "SERVICE_RELEASE_REJECTION"
+                        },
+                        new
+                        {
+                            Id = 21,
+                            Label = "ROLE_UPDATE_CORE_OFFER"
+                        },
+                        new
+                        {
+                            Id = 22,
+                            Label = "ROLE_UPDATE_APP_OFFER"
+                        },
+                        new
+                        {
+                            Id = 23,
+                            Label = "SUBSCRIPTION_URL_UPDATE"
+                        },
+                        new
+                        {
+                            Id = 24,
+                            Label = "CREDENTIAL_APPROVAL"
+                        },
+                        new
+                        {
+                            Id = 25,
+                            Label = "CREDENTIAL_REJECTED"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", b =>
+                {
+                    b.Property<int>("NotificationTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_type_id");
+
+                    b.Property<int>("NotificationTopicId")
+                        .HasColumnType("integer")
+                        .HasColumnName("notification_topic_id");
+
+                    b.HasKey("NotificationTypeId", "NotificationTopicId")
+                        .HasName("pk_notification_type_assigned_topics");
+
+                    b.HasIndex("NotificationTopicId")
+                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_topic_id");
+
+                    b.HasIndex("NotificationTypeId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_notification_type_assigned_topics_notification_type_id");
+
+                    b.ToTable("notification_type_assigned_topics", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ContactEmail")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("contact_email");
+
+                    b.Property<string>("ContactNumber")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("contact_number");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<DateTimeOffset?>("DateReleased")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_released");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<int>("LicenseTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("license_type_id");
+
+                    b.Property<string>("MarketingUrl")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("marketing_url");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<int>("OfferStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_status_id");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("provider");
+
+                    b.Property<Guid?>("ProviderCompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider_company_id");
+
+                    b.Property<Guid?>("SalesManagerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("sales_manager_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offers");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_offers_last_editor_id");
+
+                    b.HasIndex("LicenseTypeId")
+                        .HasDatabaseName("ix_offers_license_type_id");
+
+                    b.HasIndex("OfferStatusId")
+                        .HasDatabaseName("ix_offers_offer_status_id");
+
+                    b.HasIndex("OfferTypeId")
+                        .HasDatabaseName("ix_offers_offer_type_id");
+
+                    b.HasIndex("ProviderCompanyId")
+                        .HasDatabaseName("ix_offers_provider_company_id");
+
+                    b.HasIndex("SalesManagerId")
+                        .HasDatabaseName("ix_offers_sales_manager_id");
+
+                    b.ToTable("offers", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFER");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFER");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20231115\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"provider\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"provider\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFER AFTER INSERT\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFER\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFER", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFER$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer20231115\" (\"id\", \"name\", \"date_created\", \"date_released\", \"marketing_url\", \"contact_email\", \"contact_number\", \"provider\", \"offer_type_id\", \"sales_manager_id\", \"provider_company_id\", \"offer_status_id\", \"license_type_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"name\", \r\n  NEW.\"date_created\", \r\n  NEW.\"date_released\", \r\n  NEW.\"marketing_url\", \r\n  NEW.\"contact_email\", \r\n  NEW.\"contact_number\", \r\n  NEW.\"provider\", \r\n  NEW.\"offer_type_id\", \r\n  NEW.\"sales_manager_id\", \r\n  NEW.\"provider_company_id\", \r\n  NEW.\"offer_status_id\", \r\n  NEW.\"license_type_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFER$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFER AFTER UPDATE\r\nON \"portal\".\"offers\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFER\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedDocument", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("document_id");
+
+                    b.HasKey("OfferId", "DocumentId")
+                        .HasName("pk_offer_assigned_documents");
+
+                    b.HasIndex("DocumentId")
+                        .HasDatabaseName("ix_offer_assigned_documents_document_id");
+
+                    b.ToTable("offer_assigned_documents", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedLicense", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<Guid>("OfferLicenseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_license_id");
+
+                    b.HasKey("OfferId", "OfferLicenseId")
+                        .HasName("pk_offer_assigned_licenses");
+
+                    b.HasIndex("OfferLicenseId")
+                        .HasDatabaseName("ix_offer_assigned_licenses_offer_license_id");
+
+                    b.ToTable("offer_assigned_licenses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedPrivacyPolicy", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("PrivacyPolicyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("privacy_policy_id");
+
+                    b.HasKey("OfferId", "PrivacyPolicyId")
+                        .HasName("pk_offer_assigned_privacy_policies");
+
+                    b.HasIndex("PrivacyPolicyId")
+                        .HasDatabaseName("ix_offer_assigned_privacy_policies_privacy_policy_id");
+
+                    b.ToTable("offer_assigned_privacy_policies", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferDescription", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("DescriptionLong")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("description_long");
+
+                    b.Property<string>("DescriptionShort")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("description_short");
+
+                    b.HasKey("OfferId", "LanguageShortName")
+                        .HasName("pk_offer_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_offer_descriptions_language_short_name");
+
+                    b.ToTable("offer_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferLicense", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Licensetext")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("licensetext");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_licenses");
+
+                    b.ToTable("offer_licenses", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_statuses");
+
+                    b.ToTable("offer_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "CREATED"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "IN_REVIEW"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("description");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("display_name");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<int>("OfferSubscriptionStatusId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(1)
+                        .HasColumnName("offer_subscription_status_id");
+
+                    b.Property<Guid?>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<Guid>("RequesterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("requester_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscriptions");
+
+                    b.HasIndex("CompanyId")
+                        .HasDatabaseName("ix_offer_subscriptions_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_offer_subscriptions_last_editor_id");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_offer_subscriptions_offer_id");
+
+                    b.HasIndex("OfferSubscriptionStatusId")
+                        .HasDatabaseName("ix_offer_subscriptions_offer_subscription_status_id");
+
+                    b.HasIndex("ProcessId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_offer_subscriptions_process_id");
+
+                    b.HasIndex("RequesterId")
+                        .HasDatabaseName("ix_offer_subscriptions_requester_id");
+
+                    b.ToTable("offer_subscriptions", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION AFTER INSERT\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_OFFERSUBSCRIPTION\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_offer_subscription20231115\" (\"id\", \"company_id\", \"offer_id\", \"offer_subscription_status_id\", \"display_name\", \"description\", \"requester_id\", \"last_editor_id\", \"process_id\", \"date_created\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"company_id\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"offer_subscription_status_id\", \r\n  NEW.\"display_name\", \r\n  NEW.\"description\", \r\n  NEW.\"requester_id\", \r\n  NEW.\"last_editor_id\", \r\n  NEW.\"process_id\", \r\n  NEW.\"date_created\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION AFTER UPDATE\r\nON \"portal\".\"offer_subscriptions\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_OFFERSUBSCRIPTION\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", b =>
+                {
+                    b.Property<Guid>("OfferSubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_subscription_id");
+
+                    b.Property<string>("OfferUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("offer_url");
+
+                    b.HasKey("OfferSubscriptionId")
+                        .HasName("pk_offer_subscriptions_process_datas");
+
+                    b.ToTable("offer_subscriptions_process_datas", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_subscription_statuses");
+
+                    b.ToTable("offer_subscription_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "PENDING"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "ACTIVE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "INACTIVE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferTag", b =>
+                {
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("tag_name")
+                        .HasAnnotation("Relational:JsonPropertyName", "tag_name");
+
+                    b.HasKey("OfferId", "Name")
+                        .HasName("pk_offer_tags");
+
+                    b.ToTable("offer_tags", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_offer_types");
+
+                    b.ToTable("offer_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "APP"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CORE_COMPONENT"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("AuthUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auth_url");
+
+                    b.Property<string>("CallbackUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("callback_url");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("client_id");
+
+                    b.Property<byte[]>("ClientSecret")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("client_secret");
+
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
+                    b.HasKey("CompanyId")
+                        .HasName("pk_onboarding_service_provider_details");
+
+                    b.ToTable("onboarding_service_provider_details", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_privacy_policies");
+
+                    b.ToTable("privacy_policies", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "COMPANY_DATA"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "USER_DATA"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "LOCATION"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "BROWSER_HISTORY"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "NONE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset?>("LockExpiryDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("lock_expiry_date");
+
+                    b.Property<int>("ProcessTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("process_type_id");
+
+                    b.Property<Guid>("Version")
+                        .IsConcurrencyToken()
+                        .HasColumnType("uuid")
+                        .HasColumnName("version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_processes");
+
+                    b.HasIndex("ProcessTypeId")
+                        .HasDatabaseName("ix_processes_process_type_id");
+
+                    b.ToTable("processes", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStep", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<Guid>("ProcessId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("process_id");
+
+                    b.Property<int>("ProcessStepStatusId")
+                        .HasColumnType("integer")
+                        .HasColumnName("process_step_status_id");
+
+                    b.Property<int>("ProcessStepTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("process_step_type_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_process_steps");
+
+                    b.HasIndex("ProcessId")
+                        .HasDatabaseName("ix_process_steps_process_id");
+
+                    b.HasIndex("ProcessStepStatusId")
+                        .HasDatabaseName("ix_process_steps_process_step_status_id");
+
+                    b.HasIndex("ProcessStepTypeId")
+                        .HasDatabaseName("ix_process_steps_process_step_type_id");
+
+                    b.ToTable("process_steps", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepStatus", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_process_step_statuses");
+
+                    b.ToTable("process_step_statuses", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "TODO"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "DONE"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "SKIPPED"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "FAILED"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "DUPLICATE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_process_step_types");
+
+                    b.ToTable("process_step_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "VERIFY_REGISTRATION"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PUSH"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_PULL"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "CREATE_BUSINESS_PARTNER_NUMBER_MANUAL"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "CREATE_IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "RETRIGGER_IDENTITY_WALLET"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Label = "START_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Label = "RETRIGGER_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Label = "END_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            Label = "START_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            Label = "RETRIGGER_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            Label = "ACTIVATE_APPLICATION"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PUSH"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            Label = "RETRIGGER_BUSINESS_PARTNER_NUMBER_PULL"
+                        },
+                        new
+                        {
+                            Id = 15,
+                            Label = "OVERRIDE_BUSINESS_PARTNER_NUMBER"
+                        },
+                        new
+                        {
+                            Id = 16,
+                            Label = "TRIGGER_OVERRIDE_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 17,
+                            Label = "START_OVERRIDE_CLEARING_HOUSE"
+                        },
+                        new
+                        {
+                            Id = 18,
+                            Label = "FINISH_SELF_DESCRIPTION_LP"
+                        },
+                        new
+                        {
+                            Id = 19,
+                            Label = "DECLINE_APPLICATION"
+                        },
+                        new
+                        {
+                            Id = 100,
+                            Label = "TRIGGER_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 101,
+                            Label = "START_AUTOSETUP"
+                        },
+                        new
+                        {
+                            Id = 102,
+                            Label = "OFFERSUBSCRIPTION_CLIENT_CREATION"
+                        },
+                        new
+                        {
+                            Id = 103,
+                            Label = "SINGLE_INSTANCE_SUBSCRIPTION_DETAILS_CREATION"
+                        },
+                        new
+                        {
+                            Id = 104,
+                            Label = "OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 105,
+                            Label = "ACTIVATE_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 106,
+                            Label = "TRIGGER_PROVIDER_CALLBACK"
+                        },
+                        new
+                        {
+                            Id = 107,
+                            Label = "RETRIGGER_PROVIDER"
+                        },
+                        new
+                        {
+                            Id = 108,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_CLIENT_CREATION"
+                        },
+                        new
+                        {
+                            Id = 109,
+                            Label = "RETRIGGER_OFFERSUBSCRIPTION_TECHNICALUSER_CREATION"
+                        },
+                        new
+                        {
+                            Id = 110,
+                            Label = "RETRIGGER_PROVIDER_CALLBACK"
+                        },
+                        new
+                        {
+                            Id = 111,
+                            Label = "TRIGGER_ACTIVATE_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 200,
+                            Label = "SYNCHRONIZE_USER"
+                        },
+                        new
+                        {
+                            Id = 201,
+                            Label = "RETRIGGER_SYNCHRONIZE_USER"
+                        },
+                        new
+                        {
+                            Id = 202,
+                            Label = "TRIGGER_CALLBACK_OSP_SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 203,
+                            Label = "TRIGGER_CALLBACK_OSP_APPROVED"
+                        },
+                        new
+                        {
+                            Id = 204,
+                            Label = "TRIGGER_CALLBACK_OSP_DECLINED"
+                        },
+                        new
+                        {
+                            Id = 205,
+                            Label = "RETRIGGER_CALLBACK_OSP_SUBMITTED"
+                        },
+                        new
+                        {
+                            Id = 206,
+                            Label = "RETRIGGER_CALLBACK_OSP_APPROVED"
+                        },
+                        new
+                        {
+                            Id = 207,
+                            Label = "RETRIGGER_CALLBACK_OSP_DECLINED"
+                        },
+                        new
+                        {
+                            Id = 208,
+                            Label = "MANUAL_DECLINE_OSP"
+                        },
+                        new
+                        {
+                            Id = 209,
+                            Label = "REMOVE_KEYCLOAK_USERS"
+                        },
+                        new
+                        {
+                            Id = 210,
+                            Label = "RETRIGGER_REMOVE_KEYCLOAK_USERS"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_process_types");
+
+                    b.ToTable("process_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "APPLICATION_CHECKLIST"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "OFFER_SUBSCRIPTION"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "PARTNER_REGISTRATION"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AutoSetupCallbackUrl")
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_callback_url");
+
+                    b.Property<string>("AutoSetupUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("auto_setup_url");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<DateTimeOffset>("DateCreated")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_created");
+
+                    b.Property<DateTimeOffset?>("DateLastChanged")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_last_changed");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_provider_company_details");
+
+                    b.HasIndex("CompanyId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_provider_company_details_company_id");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_provider_company_details_last_editor_id");
+
+                    b.ToTable("provider_company_details", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_provider_company_detail20231115\" (\"id\", \"date_created\", \"auto_setup_url\", \"auto_setup_callback_url\", \"company_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"auto_setup_url\", \r\n  NEW.\"auto_setup_callback_url\", \r\n  NEW.\"company_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL AFTER INSERT\r\nON \"portal\".\"provider_company_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_PROVIDERCOMPANYDETAIL\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_provider_company_detail20231115\" (\"id\", \"date_created\", \"auto_setup_url\", \"auto_setup_callback_url\", \"company_id\", \"date_last_changed\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"date_created\", \r\n  NEW.\"auto_setup_url\", \r\n  NEW.\"auto_setup_callback_url\", \r\n  NEW.\"company_id\", \r\n  NEW.\"date_last_changed\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL AFTER UPDATE\r\nON \"portal\".\"provider_company_details\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_PROVIDERCOMPANYDETAIL\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceDetail", b =>
+                {
+                    b.Property<Guid>("ServiceId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("service_id");
+
+                    b.Property<int>("ServiceTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("service_type_id");
+
+                    b.HasKey("ServiceId", "ServiceTypeId")
+                        .HasName("pk_service_details");
+
+                    b.HasIndex("ServiceTypeId")
+                        .HasDatabaseName("ix_service_details_service_type_id");
+
+                    b.ToTable("service_details", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_service_types");
+
+                    b.ToTable("service_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "DATASPACE_SERVICE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CONSULTANCY_SERVICE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_technical_user_profiles");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_technical_user_profiles_offer_id");
+
+                    b.ToTable("technical_user_profiles", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUserProfileAssignedUserRole", b =>
+                {
+                    b.Property<Guid>("TechnicalUserProfileId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("technical_user_profile_id");
+
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
+
+                    b.HasKey("TechnicalUserProfileId", "UserRoleId")
+                        .HasName("pk_technical_user_profile_assigned_user_roles");
+
+                    b.HasIndex("UserRoleId")
+                        .HasDatabaseName("ix_technical_user_profile_assigned_user_roles_user_role_id");
+
+                    b.ToTable("technical_user_profile_assigned_user_roles", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UniqueIdentifier", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_unique_identifiers");
+
+                    b.ToTable("unique_identifiers", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "COMMERCIAL_REG_NUMBER"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "VAT_ID"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "LEI_CODE"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "VIES"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "EORI"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Shortname")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("shortname");
+
+                    b.HasKey("Id")
+                        .HasName("pk_use_cases");
+
+                    b.ToTable("use_cases", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCaseDescription", b =>
+                {
+                    b.Property<Guid>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.HasKey("UseCaseId", "LanguageShortName")
+                        .HasName("pk_use_case_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_use_case_descriptions_language_short_name");
+
+                    b.ToTable("use_case_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<Guid?>("LastEditorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_editor_id");
+
+                    b.Property<Guid>("OfferId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("offer_id");
+
+                    b.Property<string>("UserRoleText")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("user_role")
+                        .HasAnnotation("Relational:JsonPropertyName", "user_role");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user_roles");
+
+                    b.HasIndex("LastEditorId")
+                        .HasDatabaseName("ix_user_roles_last_editor_id");
+
+                    b.HasIndex("OfferId")
+                        .HasDatabaseName("ix_user_roles_offer_id");
+
+                    b.ToTable("user_roles", "portal", t =>
+                        {
+                            t.HasTrigger("LC_TRIGGER_AFTER_INSERT_USERROLE");
+
+                            t.HasTrigger("LC_TRIGGER_AFTER_UPDATE_USERROLE");
+                        });
+
+                    b
+                        .HasAnnotation("LC_TRIGGER_AFTER_INSERT_USERROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_INSERT_USERROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_INSERT_USERROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_user_role20231115\" (\"id\", \"user_role\", \"offer_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"user_role\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  1, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_INSERT_USERROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_INSERT_USERROLE AFTER INSERT\r\nON \"portal\".\"user_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_INSERT_USERROLE\"();")
+                        .HasAnnotation("LC_TRIGGER_AFTER_UPDATE_USERROLE", "CREATE FUNCTION \"portal\".\"LC_TRIGGER_AFTER_UPDATE_USERROLE\"() RETURNS trigger as $LC_TRIGGER_AFTER_UPDATE_USERROLE$\r\nBEGIN\r\n  INSERT INTO \"portal\".\"audit_user_role20231115\" (\"id\", \"user_role\", \"offer_id\", \"last_editor_id\", \"audit_v1id\", \"audit_v1operation_id\", \"audit_v1date_last_changed\", \"audit_v1last_editor_id\") SELECT NEW.\"id\", \r\n  NEW.\"user_role\", \r\n  NEW.\"offer_id\", \r\n  NEW.\"last_editor_id\", \r\n  gen_random_uuid(), \r\n  2, \r\n  CURRENT_TIMESTAMP, \r\n  NEW.\"last_editor_id\";\r\nRETURN NEW;\r\nEND;\r\n$LC_TRIGGER_AFTER_UPDATE_USERROLE$ LANGUAGE plpgsql;\r\nCREATE TRIGGER LC_TRIGGER_AFTER_UPDATE_USERROLE AFTER UPDATE\r\nON \"portal\".\"user_roles\"\r\nFOR EACH ROW EXECUTE PROCEDURE \"portal\".\"LC_TRIGGER_AFTER_UPDATE_USERROLE\"();");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleAssignedCollection", b =>
+                {
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
+
+                    b.Property<Guid>("UserRoleCollectionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_collection_id");
+
+                    b.HasKey("UserRoleId", "UserRoleCollectionId")
+                        .HasName("pk_user_role_assigned_collections");
+
+                    b.HasIndex("UserRoleCollectionId")
+                        .HasDatabaseName("ix_user_role_assigned_collections_user_role_collection_id");
+
+                    b.ToTable("user_role_assigned_collections", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_user_role_collections");
+
+                    b.ToTable("user_role_collections", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollectionDescription", b =>
+                {
+                    b.Property<Guid>("UserRoleCollectionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_collection_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("description");
+
+                    b.HasKey("UserRoleCollectionId", "LanguageShortName")
+                        .HasName("pk_user_role_collection_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_user_role_collection_descriptions_language_short_name");
+
+                    b.ToTable("user_role_collection_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleDescription", b =>
+                {
+                    b.Property<Guid>("UserRoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_role_id");
+
+                    b.Property<string>("LanguageShortName")
+                        .HasMaxLength(2)
+                        .HasColumnType("character(2)")
+                        .HasColumnName("language_short_name");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("description");
+
+                    b.HasKey("UserRoleId", "LanguageShortName")
+                        .HasName("pk_user_role_descriptions");
+
+                    b.HasIndex("LanguageShortName")
+                        .HasDatabaseName("ix_user_role_descriptions_language_short_name");
+
+                    b.ToTable("user_role_descriptions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_verified_credential_external_types");
+
+                    b.ToTable("verified_credential_external_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "TRACEABILITY_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "PCF_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "BEHAVIOR_TWIN_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "VEHICLE_DISMANTLE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "SUSTAINABILITY_CREDENTIAL"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "Quality_Credential"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalTypeUseCaseDetailVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<DateTimeOffset?>("Expiry")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiry");
+
+                    b.Property<string>("Template")
+                        .HasColumnType("text")
+                        .HasColumnName("template");
+
+                    b.Property<DateTimeOffset>("ValidFrom")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("valid_from");
+
+                    b.Property<int>("VerifiedCredentialExternalTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_external_type_id");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("version");
+
+                    b.HasKey("Id")
+                        .HasName("pk_verified_credential_external_type_use_case_detail_versions");
+
+                    b.HasIndex("VerifiedCredentialExternalTypeId", "Version")
+                        .IsUnique()
+                        .HasDatabaseName("ix_verified_credential_external_type_use_case_detail_versions_");
+
+                    b.ToTable("verified_credential_external_type_use_case_detail_versions", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_verified_credential_types");
+
+                    b.ToTable("verified_credential_types", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "TRACEABILITY_FRAMEWORK"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "PCF_FRAMEWORK"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Label = "BEHAVIOR_TWIN_FRAMEWORK"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Label = "DISMANTLER_CERTIFICATE"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Label = "SUSTAINABILITY_FRAMEWORK"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Label = "FRAMEWORK_AGREEMENT_QUALITY"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedExternalType", b =>
+                {
+                    b.Property<int>("VerifiedCredentialTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_id");
+
+                    b.Property<int>("VerifiedCredentialExternalTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_external_type_id");
+
+                    b.HasKey("VerifiedCredentialTypeId", "VerifiedCredentialExternalTypeId")
+                        .HasName("pk_verified_credential_type_assigned_external_types");
+
+                    b.HasIndex("VerifiedCredentialExternalTypeId")
+                        .HasDatabaseName("ix_verified_credential_type_assigned_external_types_verified_c");
+
+                    b.HasIndex("VerifiedCredentialTypeId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_verified_credential_type_assigned_external_types_verified_c1");
+
+                    b.ToTable("verified_credential_type_assigned_external_types", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedKind", b =>
+                {
+                    b.Property<int>("VerifiedCredentialTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_id");
+
+                    b.Property<int>("VerifiedCredentialTypeKindId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_kind_id");
+
+                    b.HasKey("VerifiedCredentialTypeId", "VerifiedCredentialTypeKindId")
+                        .HasName("pk_verified_credential_type_assigned_kinds");
+
+                    b.HasIndex("VerifiedCredentialTypeId")
+                        .HasDatabaseName("ix_verified_credential_type_assigned_kinds_verified_credential");
+
+                    b.HasIndex("VerifiedCredentialTypeKindId")
+                        .HasDatabaseName("ix_verified_credential_type_assigned_kinds_verified_credential1");
+
+                    b.ToTable("verified_credential_type_assigned_kinds", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedUseCase", b =>
+                {
+                    b.Property<int>("VerifiedCredentialTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("verified_credential_type_id");
+
+                    b.Property<Guid>("UseCaseId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("use_case_id");
+
+                    b.HasKey("VerifiedCredentialTypeId", "UseCaseId")
+                        .HasName("pk_verified_credential_type_assigned_use_cases");
+
+                    b.HasIndex("UseCaseId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_verified_credential_type_assigned_use_cases_use_case_id");
+
+                    b.HasIndex("VerifiedCredentialTypeId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_verified_credential_type_assigned_use_cases_verified_creden");
+
+                    b.ToTable("verified_credential_type_assigned_use_cases", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeKind", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
+                        .HasColumnName("label");
+
+                    b.HasKey("Id")
+                        .HasName("pk_verified_credential_type_kinds");
+
+                    b.ToTable("verified_credential_type_kinds", "portal");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Label = "USE_CASE"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Label = "CERTIFICATE"
+                        });
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.AgreementView", b =>
+                {
+                    b.Property<string>("AgreementCompanyRole")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("agreement_company_role");
+
+                    b.Property<Guid>("AgreementId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("agreement_id");
+
+                    b.Property<string>("AgreementName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("agreement_name");
+
+                    b.Property<string>("AgreementStatus")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("agreement_status");
+
+                    b.Property<bool>("Mandatory")
+                        .HasColumnType("boolean")
+                        .HasColumnName("mandatory");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("agreement_view", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompaniesLinkedServiceAccount", b =>
+                {
+                    b.Property<Guid>("ServiceAccountId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("service_account_id");
+
+                    b.Property<Guid>("Owners")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owners");
+
+                    b.Property<Guid?>("Provider")
+                        .HasColumnType("uuid")
+                        .HasColumnName("provider");
+
+                    b.HasKey("ServiceAccountId");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("company_linked_service_accounts", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompanyConnectorView", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("ConnectorStatus")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("connector_status");
+
+                    b.Property<string>("ConnectorUrl")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("connector_url");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("company_connector_view", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompanyIdpView", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("IdpAlias")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("idp_alias");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("company_idp_view", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompanyRoleCollectionRolesView", b =>
+                {
+                    b.Property<string>("ClientName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<string>("CollectionName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("collection_name");
+
+                    b.Property<string>("UserRole")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_role");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("companyrole_collectionroles_view", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompanyUsersView", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("company_id");
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("text")
+                        .HasColumnName("first_name");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("text")
+                        .HasColumnName("last_name");
+
+                    b.Property<string>("UserEmail")
+                        .HasColumnType("text")
+                        .HasColumnName("user_email");
+
+                    b.Property<string>("UserStatus")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_status");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("company_users_view", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.OfferSubscriptionView", b =>
+                {
+                    b.Property<Guid?>("AppInstance")
+                        .HasColumnType("uuid")
+                        .HasColumnName("app_instance");
+
+                    b.Property<Guid?>("Connector")
+                        .HasColumnType("uuid")
+                        .HasColumnName("connector");
+
+                    b.Property<int>("OfferTypeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("offer_type_id");
+
+                    b.Property<Guid>("SubscriptionId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("subscription_id");
+
+                    b.Property<Guid?>("TechnicalUser")
+                        .HasColumnType("uuid")
+                        .HasColumnName("technical_user");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("offer_subscription_view", "portal");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificate", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateStatus", "CompanyCertificateStatus")
+                        .WithMany("CompanyCertificates")
+                        .HasForeignKey("CompanyCertificateStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificates_company_certificate_statuses_company_c");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateType", "CompanyCertificateType")
+                        .WithMany("CompanyCertificates")
+                        .HasForeignKey("CompanyCertificateTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificates_company_certificate_types_company_cert");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("CompanyCertificates")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificates_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "Document")
+                        .WithMany("CompanyCertificates")
+                        .HasForeignKey("DocumentId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificates_documents_document_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CompanyCertificateStatus");
+
+                    b.Navigation("CompanyCertificateType");
+
+                    b.Navigation("Document");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeAssignedStatus", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateType", "CompanyCertificateType")
+                        .WithOne("CompanyCertificateTypeAssignedStatus")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeAssignedStatus", "CompanyCertificateTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificate_type_assigned_statuses_company_certific");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeStatus", "CompanyCertificateTypeStatus")
+                        .WithMany("CompanyCertificateTypeAssignedStatuses")
+                        .HasForeignKey("CompanyCertificateTypeStatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificate_type_assigned_statuses_company_certific1");
+
+                    b.Navigation("CompanyCertificateType");
+
+                    b.Navigation("CompanyCertificateTypeStatus");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeDescription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateType", "CompanyCertificateType")
+                        .WithMany("CompanyCertificateTypeDescriptions")
+                        .HasForeignKey("CompanyCertificateTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificate_type_descriptions_company_certificate_t");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("CompanyCertificateTypeDescriptions")
+                        .HasForeignKey("LanguageShortName")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_certificate_type_descriptions_languages_language_te");
+
+                    b.Navigation("CompanyCertificateType");
+
+                    b.Navigation("Language");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", "Country")
+                        .WithMany("Addresses")
+                        .HasForeignKey("CountryAlpha2Code")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_addresses_countries_country_temp_id");
+
+                    b.Navigation("Country");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", "AgreementCategory")
+                        .WithMany("Agreements")
+                        .HasForeignKey("AgreementCategoryId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreements_agreement_categories_agreement_category_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", null)
+                        .WithMany("Agreements")
+                        .HasForeignKey("AgreementStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_agreements_agreement_statuses_agreement_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "Document")
+                        .WithMany("Agreements")
+                        .HasForeignKey("DocumentId")
+                        .HasConstraintName("fk_agreements_documents_document_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "IssuerCompany")
+                        .WithMany("Agreements")
+                        .HasForeignKey("IssuerCompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreements_companies_issuer_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", "UseCase")
+                        .WithMany("Agreements")
+                        .HasForeignKey("UseCaseId")
+                        .HasConstraintName("fk_agreements_use_cases_use_case_id");
+
+                    b.Navigation("AgreementCategory");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("IssuerCompany");
+
+                    b.Navigation("UseCase");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedCompanyRole", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", "Agreement")
+                        .WithMany("AgreementAssignedCompanyRoles")
+                        .HasForeignKey("AgreementId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreement_assigned_company_roles_agreements_agreement_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", "CompanyRole")
+                        .WithMany("AgreementAssignedCompanyRoles")
+                        .HasForeignKey("CompanyRoleId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreement_assigned_company_roles_company_roles_company_role");
+
+                    b.Navigation("Agreement");
+
+                    b.Navigation("CompanyRole");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOffer", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", "Agreement")
+                        .WithMany("AgreementAssignedOffers")
+                        .HasForeignKey("AgreementId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreement_assigned_offers_agreements_agreement_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("AgreementAssignedOffers")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreement_assigned_offers_offers_offer_id");
+
+                    b.Navigation("Agreement");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementAssignedOfferType", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", "Agreement")
+                        .WithMany("AgreementAssignedOfferTypes")
+                        .HasForeignKey("AgreementId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreement_assigned_offer_types_agreements_agreement_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", "OfferType")
+                        .WithMany("AgreementAssignedOfferTypes")
+                        .HasForeignKey("OfferTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_agreement_assigned_offer_types_offer_types_offer_type_id");
+
+                    b.Navigation("Agreement");
+
+                    b.Navigation("OfferType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppAssignedUseCase", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "App")
+                        .WithMany()
+                        .HasForeignKey("AppId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_assigned_use_cases_offers_app_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", "UseCase")
+                        .WithMany()
+                        .HasForeignKey("UseCaseId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_assigned_use_cases_use_cases_use_case_id");
+
+                    b.Navigation("App");
+
+                    b.Navigation("UseCase");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "App")
+                        .WithMany("AppInstances")
+                        .HasForeignKey("AppId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("fk_app_instances_offers_app_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", "IamClient")
+                        .WithMany("AppInstances")
+                        .HasForeignKey("IamClientId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("fk_app_instances_iam_clients_iam_client_id");
+
+                    b.Navigation("App");
+
+                    b.Navigation("IamClient");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceAssignedCompanyServiceAccount", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", "AppInstance")
+                        .WithMany("ServiceAccounts")
+                        .HasForeignKey("AppInstanceId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_instance_assigned_service_accounts_app_instances_app_in");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", "CompanyServiceAccount")
+                        .WithMany("AppInstances")
+                        .HasForeignKey("CompanyServiceAccountId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_instance_assigned_service_accounts_company_service_acco");
+
+                    b.Navigation("AppInstance");
+
+                    b.Navigation("CompanyServiceAccount");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "App")
+                        .WithOne("AppInstanceSetup")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstanceSetup", "AppId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_instance_setups_offers_app_id");
+
+                    b.Navigation("App");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppLanguage", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "App")
+                        .WithMany()
+                        .HasForeignKey("AppId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_languages_offers_app_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany()
+                        .HasForeignKey("LanguageShortName")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_languages_languages_language_temp_id");
+
+                    b.Navigation("App");
+
+                    b.Navigation("Language");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", "AppInstance")
+                        .WithMany("AppSubscriptionDetails")
+                        .HasForeignKey("AppInstanceId")
+                        .HasConstraintName("fk_app_subscription_details_app_instances_app_instance_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_app_subscription_details_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "OfferSubscription")
+                        .WithOne("AppSubscriptionDetail")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppSubscriptionDetail", "OfferSubscriptionId")
+                        .IsRequired()
+                        .HasConstraintName("fk_app_subscription_details_offer_subscriptions_offer_subscrip");
+
+                    b.Navigation("AppInstance");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("OfferSubscription");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntry", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", "ApplicationChecklistEntryStatus")
+                        .WithMany("ApplicationChecklistEntries")
+                        .HasForeignKey("ApplicationChecklistEntryStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_application_checklist_application_checklist_statuses_applic");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", "ApplicationChecklistEntryType")
+                        .WithMany("ApplicationChecklistEntries")
+                        .HasForeignKey("ApplicationChecklistEntryTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_application_checklist_application_checklist_types_applicati");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", "Application")
+                        .WithMany("ApplicationChecklistEntries")
+                        .HasForeignKey("ApplicationId")
+                        .IsRequired()
+                        .HasConstraintName("fk_application_checklist_company_applications_application_id");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("ApplicationChecklistEntryStatus");
+
+                    b.Navigation("ApplicationChecklistEntryType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", "Address")
+                        .WithMany("Companies")
+                        .HasForeignKey("AddressId")
+                        .HasConstraintName("fk_companies_addresses_address_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", "CompanyStatus")
+                        .WithMany("Companies")
+                        .HasForeignKey("CompanyStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_companies_company_statuses_company_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "SelfDescriptionDocument")
+                        .WithMany("Companies")
+                        .HasForeignKey("SelfDescriptionDocumentId")
+                        .HasConstraintName("fk_companies_documents_self_description_document_id");
+
+                    b.Navigation("Address");
+
+                    b.Navigation("CompanyStatus");
+
+                    b.Navigation("SelfDescriptionDocument");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", "ApplicationStatus")
+                        .WithMany("CompanyApplications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_applications_company_application_statuses_applicati");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "ChecklistProcess")
+                        .WithOne("CompanyApplication")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", "ChecklistProcessId")
+                        .HasConstraintName("fk_company_applications_processes_checklist_process_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", "CompanyApplicationType")
+                        .WithMany("CompanyApplications")
+                        .HasForeignKey("CompanyApplicationTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_applications_company_application_types_company_appl");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("CompanyApplications")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_applications_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_company_applications_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "OnboardingServiceProvider")
+                        .WithMany("ProvidedApplications")
+                        .HasForeignKey("OnboardingServiceProviderId")
+                        .HasConstraintName("fk_company_applications_companies_onboarding_service_provider_");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("ChecklistProcess");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CompanyApplicationType");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("OnboardingServiceProvider");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedRole", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("CompanyAssignedRoles")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_assigned_roles_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", "CompanyRole")
+                        .WithMany("CompanyAssignedRoles")
+                        .HasForeignKey("CompanyRoleId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_assigned_roles_company_roles_company_role_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_company_assigned_roles_identities_last_editor_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CompanyRole");
+
+                    b.Navigation("LastEditor");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyAssignedUseCase", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("CompanyAssignedUseCase")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_assigned_use_cases_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", "UseCase")
+                        .WithMany("CompanyAssignedUseCase")
+                        .HasForeignKey("UseCaseId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_assigned_use_cases_use_cases_use_case_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("UseCase");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentifier", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("CompanyIdentifiers")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_identifiers_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UniqueIdentifier", "UniqueIdentifier")
+                        .WithMany("CompanyIdentifiers")
+                        .HasForeignKey("UniqueIdentifierId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_identifiers_unique_identifiers_unique_identifier_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("UniqueIdentifier");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyIdentityProvider", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany()
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_identity_providers_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", "IdentityProvider")
+                        .WithMany("CompanyIdentityProviders")
+                        .HasForeignKey("IdentityProviderId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_identity_providers_identity_providers_identity_prov");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("IdentityProvider");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", "CompanyRole")
+                        .WithOne("CompanyRoleAssignedRoleCollection")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", "CompanyRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_role_assigned_role_collections_company_roles_compan");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollection", "UserRoleCollection")
+                        .WithOne("CompanyRoleAssignedRoleCollection")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleAssignedRoleCollection", "UserRoleCollectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_role_assigned_role_collections_user_role_collection");
+
+                    b.Navigation("CompanyRole");
+
+                    b.Navigation("UserRoleCollection");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleDescription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", "CompanyRole")
+                        .WithMany("CompanyRoleDescriptions")
+                        .HasForeignKey("CompanyRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_role_descriptions_company_roles_company_role_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("CompanyRoleDescriptions")
+                        .HasForeignKey("LanguageShortName")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_role_descriptions_languages_language_temp_id2");
+
+                    b.Navigation("CompanyRole");
+
+                    b.Navigation("Language");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", "CompanyRole")
+                        .WithOne("CompanyRoleRegistrationData")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRoleRegistrationData", "CompanyRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_role_registration_data_company_roles_company_role_id");
+
+                    b.Navigation("CompanyRole");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccountType", "CompanyServiceAccountType")
+                        .WithMany("CompanyServiceAccounts")
+                        .HasForeignKey("CompanyServiceAccountTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_service_accounts_company_service_account_types_comp");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "Identity")
+                        .WithOne("CompanyServiceAccount")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", "Id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_service_accounts_identities_identity_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "OfferSubscription")
+                        .WithMany("CompanyServiceAccounts")
+                        .HasForeignKey("OfferSubscriptionId")
+                        .HasConstraintName("fk_company_service_accounts_offer_subscriptions_offer_subscrip");
+
+                    b.Navigation("CompanyServiceAccountType");
+
+                    b.Navigation("Identity");
+
+                    b.Navigation("OfferSubscription");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanySsiDetail", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("CompanySsiDetails")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_ssi_details_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanySsiDetailStatus", "CompanySsiDetailStatus")
+                        .WithMany("CompanySsiDetails")
+                        .HasForeignKey("CompanySsiDetailStatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_ssi_details_company_ssi_detail_statuses_company_ssi");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CreatorUser")
+                        .WithMany("CompanySsiDetails")
+                        .HasForeignKey("CreatorUserId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_ssi_details_company_users_creator_user_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "Document")
+                        .WithOne("CompanySsiDetail")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanySsiDetail", "DocumentId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_ssi_details_documents_document_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_company_ssi_details_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalTypeUseCaseDetailVersion", "VerifiedCredentialExternalTypeUseCaseDetailVersion")
+                        .WithMany("CompanySsiDetails")
+                        .HasForeignKey("VerifiedCredentialExternalTypeUseCaseDetailId")
+                        .HasConstraintName("fk_company_ssi_details_verified_credential_external_type_use_c");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialType", "VerifiedCredentialType")
+                        .WithMany("CompanySsiDetails")
+                        .HasForeignKey("VerifiedCredentialTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_ssi_details_verified_credential_types_verified_cred");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CompanySsiDetailStatus");
+
+                    b.Navigation("CreatorUser");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("VerifiedCredentialExternalTypeUseCaseDetailVersion");
+
+                    b.Navigation("VerifiedCredentialType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "Identity")
+                        .WithOne("CompanyUser")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "Id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_users_identities_identity_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_company_users_identities_last_editor_id");
+
+                    b.Navigation("Identity");
+
+                    b.Navigation("LastEditor");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedAppFavourite", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "App")
+                        .WithMany()
+                        .HasForeignKey("AppId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_user_assigned_app_favourites_offers_app_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CompanyUser")
+                        .WithMany()
+                        .HasForeignKey("CompanyUserId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_user_assigned_app_favourites_company_users_company_");
+
+                    b.Navigation("App");
+
+                    b.Navigation("CompanyUser");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedBusinessPartner", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CompanyUser")
+                        .WithMany("CompanyUserAssignedBusinessPartners")
+                        .HasForeignKey("CompanyUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_user_assigned_business_partners_company_users_compa");
+
+                    b.Navigation("CompanyUser");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUserAssignedIdentityProvider", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CompanyUser")
+                        .WithMany("CompanyUserAssignedIdentityProviders")
+                        .HasForeignKey("CompanyUserId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_user_assigned_identity_providers_company_users_comp");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", "IdentityProvider")
+                        .WithMany("CompanyUserAssignedIdentityProviders")
+                        .HasForeignKey("IdentityProviderId")
+                        .IsRequired()
+                        .HasConstraintName("fk_company_user_assigned_identity_providers_identity_providers");
+
+                    b.Navigation("CompanyUser");
+
+                    b.Navigation("IdentityProvider");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", "CompanyServiceAccount")
+                        .WithOne("Connector")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", "CompanyServiceAccountId")
+                        .HasConstraintName("fk_connectors_company_service_accounts_company_service_account");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Host")
+                        .WithMany("HostedConnectors")
+                        .HasForeignKey("HostId")
+                        .HasConstraintName("fk_connectors_companies_host_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_connectors_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", "Location")
+                        .WithMany("Connectors")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_connectors_countries_location_temp_id1");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Provider")
+                        .WithMany("ProvidedConnectors")
+                        .HasForeignKey("ProviderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_connectors_companies_provider_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "SelfDescriptionDocument")
+                        .WithOne("Connector")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", "SelfDescriptionDocumentId")
+                        .HasConstraintName("fk_connectors_documents_self_description_document_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", "Status")
+                        .WithMany("Connectors")
+                        .HasForeignKey("StatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_connectors_connector_statuses_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", "Type")
+                        .WithMany("Connectors")
+                        .HasForeignKey("TypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_connectors_connector_types_type_id");
+
+                    b.Navigation("CompanyServiceAccount");
+
+                    b.Navigation("Host");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("Location");
+
+                    b.Navigation("Provider");
+
+                    b.Navigation("SelfDescriptionDocument");
+
+                    b.Navigation("Status");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorAssignedOfferSubscription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", "Connector")
+                        .WithMany("ConnectorAssignedOfferSubscriptions")
+                        .HasForeignKey("ConnectorId")
+                        .IsRequired()
+                        .HasConstraintName("fk_connector_assigned_offer_subscriptions_connectors_connector");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "OfferSubscription")
+                        .WithMany("ConnectorAssignedOfferSubscriptions")
+                        .HasForeignKey("OfferSubscriptionId")
+                        .IsRequired()
+                        .HasConstraintName("fk_connector_assigned_offer_subscriptions_offer_subscriptions_");
+
+                    b.Navigation("Connector");
+
+                    b.Navigation("OfferSubscription");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", "Agreement")
+                        .WithMany("Consents")
+                        .HasForeignKey("AgreementId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consents_agreements_agreement_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("Consents")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consents_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CompanyUser")
+                        .WithMany("Consents")
+                        .HasForeignKey("CompanyUserId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consents_company_users_company_user_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", "ConsentStatus")
+                        .WithMany("Consents")
+                        .HasForeignKey("ConsentStatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consents_consent_statuses_consent_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "Document")
+                        .WithMany("Consents")
+                        .HasForeignKey("DocumentId")
+                        .HasConstraintName("fk_consents_documents_document_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_consents_identities_last_editor_id");
+
+                    b.Navigation("Agreement");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CompanyUser");
+
+                    b.Navigation("ConsentStatus");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LastEditor");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOffer", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", "Consent")
+                        .WithMany("ConsentAssignedOffers")
+                        .HasForeignKey("ConsentId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consent_assigned_offers_consents_consent_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("ConsentAssignedOffers")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consent_assigned_offers_offers_offer_id");
+
+                    b.Navigation("Consent");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentAssignedOfferSubscription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", "Consent")
+                        .WithMany("ConsentAssignedOfferSubscriptions")
+                        .HasForeignKey("ConsentId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consent_assigned_offer_subscriptions_consents_consent_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "OfferSubscription")
+                        .WithMany("ConsentAssignedOfferSubscriptions")
+                        .HasForeignKey("OfferSubscriptionId")
+                        .IsRequired()
+                        .HasConstraintName("fk_consent_assigned_offer_subscriptions_offer_subscriptions_of");
+
+                    b.Navigation("Consent");
+
+                    b.Navigation("OfferSubscription");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryAssignedIdentifier", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", "BpdmIdentifier")
+                        .WithMany("CountryAssignedIdentifiers")
+                        .HasForeignKey("BpdmIdentifierId")
+                        .HasConstraintName("fk_country_assigned_identifiers_bpdm_identifiers_bpdm_identifi");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", "Country")
+                        .WithMany("CountryAssignedIdentifiers")
+                        .HasForeignKey("CountryAlpha2Code")
+                        .IsRequired()
+                        .HasConstraintName("fk_country_assigned_identifiers_countries_country_alpha2code");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UniqueIdentifier", "UniqueIdentifier")
+                        .WithMany("CountryAssignedIdentifiers")
+                        .HasForeignKey("UniqueIdentifierId")
+                        .IsRequired()
+                        .HasConstraintName("fk_country_assigned_identifiers_unique_identifiers_unique_iden");
+
+                    b.Navigation("BpdmIdentifier");
+
+                    b.Navigation("Country");
+
+                    b.Navigation("UniqueIdentifier");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CountryLongName", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", "Country")
+                        .WithMany("CountryLongNames")
+                        .HasForeignKey("Alpha2Code")
+                        .IsRequired()
+                        .HasConstraintName("fk_country_long_names_countries_country_alpha2code");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("CountryLongNames")
+                        .HasForeignKey("ShortName")
+                        .IsRequired()
+                        .HasConstraintName("fk_country_long_names_languages_language_temp_id3");
+
+                    b.Navigation("Country");
+
+                    b.Navigation("Language");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CompanyUser")
+                        .WithMany("Documents")
+                        .HasForeignKey("CompanyUserId")
+                        .HasConstraintName("fk_documents_company_users_company_user_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", "DocumentStatus")
+                        .WithMany("Documents")
+                        .HasForeignKey("DocumentStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_documents_document_status_document_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", "DocumentType")
+                        .WithMany("Documents")
+                        .HasForeignKey("DocumentTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_documents_document_types_document_type_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", "MediaType")
+                        .WithMany("Documents")
+                        .HasForeignKey("MediaTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_documents_media_types_media_type_id");
+
+                    b.Navigation("CompanyUser");
+
+                    b.Navigation("DocumentStatus");
+
+                    b.Navigation("DocumentType");
+
+                    b.Navigation("MediaType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", "IdentityProvider")
+                        .WithOne("IamIdentityProvider")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamIdentityProvider", "IdentityProviderId")
+                        .IsRequired()
+                        .HasConstraintName("fk_iam_identity_providers_identity_providers_identity_provider");
+
+                    b.Navigation("IdentityProvider");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("Identities")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identities_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", "IdentityType")
+                        .WithMany("Identities")
+                        .HasForeignKey("IdentityTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identities_identity_type_identity_type_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_identities_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", "IdentityStatus")
+                        .WithMany("Identities")
+                        .HasForeignKey("UserStatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identities_identity_user_statuses_identity_status_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("IdentityStatus");
+
+                    b.Navigation("IdentityType");
+
+                    b.Navigation("LastEditor");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityAssignedRole", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "Identity")
+                        .WithMany("IdentityAssignedRoles")
+                        .HasForeignKey("IdentityId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identity_assigned_roles_identities_identity_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_identity_assigned_roles_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", "UserRole")
+                        .WithMany("IdentityAssignedRoles")
+                        .HasForeignKey("UserRoleId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identity_assigned_roles_user_roles_user_role_id");
+
+                    b.Navigation("Identity");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("UserRole");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", "IdentityProviderCategory")
+                        .WithMany("IdentityProviders")
+                        .HasForeignKey("IdentityProviderCategoryId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identity_providers_identity_provider_categories_identity_pr");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", "IdentityProviderType")
+                        .WithMany("IdentityProviders")
+                        .HasForeignKey("IdentityProviderTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identity_providers_identity_provider_types_identity_provide");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Owner")
+                        .WithMany("OwnedIdentityProviders")
+                        .HasForeignKey("OwnerId")
+                        .IsRequired()
+                        .HasConstraintName("fk_identity_providers_companies_owner_id");
+
+                    b.Navigation("IdentityProviderCategory");
+
+                    b.Navigation("IdentityProviderType");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Invitation", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", "CompanyApplication")
+                        .WithMany("Invitations")
+                        .HasForeignKey("CompanyApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_invitations_company_applications_company_application_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "CompanyUser")
+                        .WithMany("Invitations")
+                        .HasForeignKey("CompanyUserId")
+                        .IsRequired()
+                        .HasConstraintName("fk_invitations_company_users_company_user_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", "InvitationStatus")
+                        .WithMany("Invitations")
+                        .HasForeignKey("InvitationStatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_invitations_invitation_statuses_invitation_status_id");
+
+                    b.Navigation("CompanyApplication");
+
+                    b.Navigation("CompanyUser");
+
+                    b.Navigation("InvitationStatus");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LanguageLongName", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "LongNameLanguage")
+                        .WithMany("LanguageLongNameLanguages")
+                        .HasForeignKey("LanguageShortName")
+                        .IsRequired()
+                        .HasConstraintName("fk_language_long_names_languages_long_name_language_short_name");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("LanguageLongNames")
+                        .HasForeignKey("ShortName")
+                        .IsRequired()
+                        .HasConstraintName("fk_language_long_names_languages_language_short_name");
+
+                    b.Navigation("Language");
+
+                    b.Navigation("LongNameLanguage");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", "CompanyApplication")
+                        .WithOne("NetworkRegistration")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", "ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_network_registrations_company_applications_application_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithOne("NetworkRegistration")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", "CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_network_registrations_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "OnboardingServiceProvider")
+                        .WithMany("OnboardedNetworkRegistrations")
+                        .HasForeignKey("OnboardingServiceProviderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_network_registrations_companies_onboarding_service_provider");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("NetworkRegistration")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NetworkRegistration", "ProcessId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_network_registrations_processes_process_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CompanyApplication");
+
+                    b.Navigation("OnboardingServiceProvider");
+
+                    b.Navigation("Process");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Notification", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "Creator")
+                        .WithMany("CreatedNotifications")
+                        .HasForeignKey("CreatorUserId")
+                        .HasConstraintName("fk_notifications_identities_creator_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", "NotificationType")
+                        .WithMany("Notifications")
+                        .HasForeignKey("NotificationTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_notifications_notification_type_notification_type_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "Receiver")
+                        .WithMany("Notifications")
+                        .HasForeignKey("ReceiverUserId")
+                        .IsRequired()
+                        .HasConstraintName("fk_notifications_company_users_receiver_id");
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("NotificationType");
+
+                    b.Navigation("Receiver");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", "NotificationTopic")
+                        .WithMany("NotificationTypeAssignedTopics")
+                        .HasForeignKey("NotificationTopicId")
+                        .IsRequired()
+                        .HasConstraintName("fk_notification_type_assigned_topics_notification_topic_notifi");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", "NotificationType")
+                        .WithOne("NotificationTypeAssignedTopic")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTypeAssignedTopic", "NotificationTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_notification_type_assigned_topics_notification_type_notific");
+
+                    b.Navigation("NotificationTopic");
+
+                    b.Navigation("NotificationType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_offers_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", "LicenseType")
+                        .WithMany("Offers")
+                        .HasForeignKey("LicenseTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_offers_license_types_license_type_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", "OfferStatus")
+                        .WithMany("Offers")
+                        .HasForeignKey("OfferStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_offers_offer_statuses_offer_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", "OfferType")
+                        .WithMany("Offers")
+                        .HasForeignKey("OfferTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_offers_offer_types_offer_type_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "ProviderCompany")
+                        .WithMany("ProvidedOffers")
+                        .HasForeignKey("ProviderCompanyId")
+                        .HasConstraintName("fk_offers_companies_provider_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "SalesManager")
+                        .WithMany("SalesManagerOfOffers")
+                        .HasForeignKey("SalesManagerId")
+                        .HasConstraintName("fk_offers_company_users_sales_manager_id");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("LicenseType");
+
+                    b.Navigation("OfferStatus");
+
+                    b.Navigation("OfferType");
+
+                    b.Navigation("ProviderCompany");
+
+                    b.Navigation("SalesManager");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedDocument", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_assigned_documents_documents_document_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany()
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_assigned_documents_offers_offer_id");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedLicense", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany()
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_assigned_licenses_offers_offer_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferLicense", "OfferLicense")
+                        .WithMany()
+                        .HasForeignKey("OfferLicenseId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_assigned_licenses_offer_licenses_offer_license_id");
+
+                    b.Navigation("Offer");
+
+                    b.Navigation("OfferLicense");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferAssignedPrivacyPolicy", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("OfferAssignedPrivacyPolicies")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_assigned_privacy_policies_offers_offer_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", "PrivacyPolicy")
+                        .WithMany("OfferAssignedPrivacyPolicies")
+                        .HasForeignKey("PrivacyPolicyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_assigned_privacy_policies_privacy_policies_privacy_po");
+
+                    b.Navigation("Offer");
+
+                    b.Navigation("PrivacyPolicy");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferDescription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("AppDescriptions")
+                        .HasForeignKey("LanguageShortName")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_descriptions_languages_language_short_name");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("OfferDescriptions")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_descriptions_offers_offer_id");
+
+                    b.Navigation("Language");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithMany("OfferSubscriptions")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_subscriptions_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_offer_subscriptions_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("OfferSubscriptions")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_subscriptions_offers_offer_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", "OfferSubscriptionStatus")
+                        .WithMany("OfferSubscriptions")
+                        .HasForeignKey("OfferSubscriptionStatusId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_subscriptions_offer_subscription_statuses_offer_subsc");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithOne("OfferSubscription")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "ProcessId")
+                        .HasConstraintName("fk_offer_subscriptions_processes_process_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", "Requester")
+                        .WithMany("RequestedSubscriptions")
+                        .HasForeignKey("RequesterId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_subscriptions_company_users_requester_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("Offer");
+
+                    b.Navigation("OfferSubscriptionStatus");
+
+                    b.Navigation("Process");
+
+                    b.Navigation("Requester");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", "OfferSubscription")
+                        .WithOne("OfferSubscriptionProcessData")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionProcessData", "OfferSubscriptionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_subscriptions_process_datas_offer_subscriptions_offer");
+
+                    b.Navigation("OfferSubscription");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferTag", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("Tags")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_offer_tags_offers_offer_id");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithOne("OnboardingServiceProviderDetail")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OnboardingServiceProviderDetail", "CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_onboarding_service_provider_details_companies_company_id");
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", "ProcessType")
+                        .WithMany("Processes")
+                        .HasForeignKey("ProcessTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_processes_process_types_process_type_id");
+
+                    b.Navigation("ProcessType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStep", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", "Process")
+                        .WithMany("ProcessSteps")
+                        .HasForeignKey("ProcessId")
+                        .IsRequired()
+                        .HasConstraintName("fk_process_steps_processes_process_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepStatus", "ProcessStepStatus")
+                        .WithMany("ProcessSteps")
+                        .HasForeignKey("ProcessStepStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_process_steps_process_step_statuses_process_step_status_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", "ProcessStepType")
+                        .WithMany("ProcessSteps")
+                        .HasForeignKey("ProcessStepTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_process_steps_process_step_types_process_step_type_id");
+
+                    b.Navigation("Process");
+
+                    b.Navigation("ProcessStepStatus");
+
+                    b.Navigation("ProcessStepType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", "Company")
+                        .WithOne("ProviderCompanyDetail")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProviderCompanyDetail", "CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("fk_provider_company_details_companies_company_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_provider_company_details_identities_last_editor_id");
+
+                    b.Navigation("Company");
+
+                    b.Navigation("LastEditor");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceDetail", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Service")
+                        .WithMany("ServiceDetails")
+                        .HasForeignKey("ServiceId")
+                        .IsRequired()
+                        .HasConstraintName("fk_service_details_offers_service_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceType", "ServiceType")
+                        .WithMany("ServiceDetails")
+                        .HasForeignKey("ServiceTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_service_details_service_types_service_type_id");
+
+                    b.Navigation("Service");
+
+                    b.Navigation("ServiceType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUserProfile", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("TechnicalUserProfiles")
+                        .HasForeignKey("OfferId")
+                        .IsRequired()
+                        .HasConstraintName("fk_technical_user_profiles_offers_offer_id");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUserProfileAssignedUserRole", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUserProfile", "TechnicalUserProfile")
+                        .WithMany("TechnicalUserProfileAssignedUserRoles")
+                        .HasForeignKey("TechnicalUserProfileId")
+                        .IsRequired()
+                        .HasConstraintName("fk_technical_user_profile_assigned_user_roles_technical_user_p");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", "UserRole")
+                        .WithMany("TechnicalUserProfileAssignedUserRole")
+                        .HasForeignKey("UserRoleId")
+                        .IsRequired()
+                        .HasConstraintName("fk_technical_user_profile_assigned_user_roles_user_roles_user_r");
+
+                    b.Navigation("TechnicalUserProfile");
+
+                    b.Navigation("UserRole");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCaseDescription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("UseCases")
+                        .HasForeignKey("LanguageShortName")
+                        .IsRequired()
+                        .HasConstraintName("fk_use_case_descriptions_languages_language_short_name");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", "UseCase")
+                        .WithMany("UseCaseDescriptions")
+                        .HasForeignKey("UseCaseId")
+                        .IsRequired()
+                        .HasConstraintName("fk_use_case_descriptions_use_cases_use_case_id");
+
+                    b.Navigation("Language");
+
+                    b.Navigation("UseCase");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", "LastEditor")
+                        .WithMany()
+                        .HasForeignKey("LastEditorId")
+                        .HasConstraintName("fk_user_roles_identities_last_editor_id");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", "Offer")
+                        .WithMany("UserRoles")
+                        .HasForeignKey("OfferId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_roles_offers_offer_id");
+
+                    b.Navigation("LastEditor");
+
+                    b.Navigation("Offer");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleAssignedCollection", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollection", "UserRoleCollection")
+                        .WithMany()
+                        .HasForeignKey("UserRoleCollectionId")
+                        .IsRequired()
+                        .HasConstraintName("fk_user_role_assigned_collections_user_role_collections_user_r");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", "UserRole")
+                        .WithMany()
+                        .HasForeignKey("UserRoleId")
+                        .IsRequired()
+                        .HasConstraintName("fk_user_role_assigned_collections_user_roles_user_role_id");
+
+                    b.Navigation("UserRole");
+
+                    b.Navigation("UserRoleCollection");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollectionDescription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany()
+                        .HasForeignKey("LanguageShortName")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_role_collection_descriptions_languages_language_short_");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollection", "UserRoleCollection")
+                        .WithMany("UserRoleCollectionDescriptions")
+                        .HasForeignKey("UserRoleCollectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_role_collection_descriptions_user_role_collections_use");
+
+                    b.Navigation("Language");
+
+                    b.Navigation("UserRoleCollection");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleDescription", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", "Language")
+                        .WithMany("UserRoleDescriptions")
+                        .HasForeignKey("LanguageShortName")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_role_descriptions_languages_language_short_name");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", "UserRole")
+                        .WithMany("UserRoleDescriptions")
+                        .HasForeignKey("UserRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_user_role_descriptions_user_roles_user_role_id");
+
+                    b.Navigation("Language");
+
+                    b.Navigation("UserRole");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalTypeUseCaseDetailVersion", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalType", "VerifiedCredentialExternalType")
+                        .WithMany("VerifiedCredentialExternalTypeUseCaseDetailVersions")
+                        .HasForeignKey("VerifiedCredentialExternalTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_external_type_use_case_detail_versions_");
+
+                    b.Navigation("VerifiedCredentialExternalType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedExternalType", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalType", "VerifiedCredentialExternalType")
+                        .WithMany("VerifiedCredentialTypeAssignedExternalTypes")
+                        .HasForeignKey("VerifiedCredentialExternalTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_type_assigned_external_types_verified_c");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialType", "VerifiedCredentialType")
+                        .WithOne("VerifiedCredentialTypeAssignedExternalType")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedExternalType", "VerifiedCredentialTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_type_assigned_external_types_verified_c1");
+
+                    b.Navigation("VerifiedCredentialExternalType");
+
+                    b.Navigation("VerifiedCredentialType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedKind", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialType", "VerifiedCredentialType")
+                        .WithOne("VerifiedCredentialTypeAssignedKind")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedKind", "VerifiedCredentialTypeId")
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_type_assigned_kinds_verified_credential");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeKind", "VerifiedCredentialTypeKind")
+                        .WithMany("VerifiedCredentialTypeAssignedKinds")
+                        .HasForeignKey("VerifiedCredentialTypeKindId")
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_type_assigned_kinds_verified_credential1");
+
+                    b.Navigation("VerifiedCredentialType");
+
+                    b.Navigation("VerifiedCredentialTypeKind");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedUseCase", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", "UseCase")
+                        .WithOne("VerifiedCredentialAssignedUseCase")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedUseCase", "UseCaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_type_assigned_use_cases_use_cases_use_c");
+
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialType", "VerifiedCredentialType")
+                        .WithOne("VerifiedCredentialTypeAssignedUseCase")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeAssignedUseCase", "VerifiedCredentialTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_verified_credential_type_assigned_use_cases_verified_creden");
+
+                    b.Navigation("UseCase");
+
+                    b.Navigation("VerifiedCredentialType");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompaniesLinkedServiceAccount", b =>
+                {
+                    b.HasOne("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", "CompanyServiceAccount")
+                        .WithOne("CompaniesLinkedServiceAccount")
+                        .HasForeignKey("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Views.CompaniesLinkedServiceAccount", "ServiceAccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_company_linked_service_accounts_company_service_accounts_co");
+
+                    b.Navigation("CompanyServiceAccount");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateStatus", b =>
+                {
+                    b.Navigation("CompanyCertificates");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateType", b =>
+                {
+                    b.Navigation("CompanyCertificateTypeAssignedStatus");
+
+                    b.Navigation("CompanyCertificateTypeDescriptions");
+
+                    b.Navigation("CompanyCertificates");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.CompanyCertificateTypeStatus", b =>
+                {
+                    b.Navigation("CompanyCertificateTypeAssignedStatuses");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Address", b =>
+                {
+                    b.Navigation("Companies");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Agreement", b =>
+                {
+                    b.Navigation("AgreementAssignedCompanyRoles");
+
+                    b.Navigation("AgreementAssignedOfferTypes");
+
+                    b.Navigation("AgreementAssignedOffers");
+
+                    b.Navigation("Consents");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementCategory", b =>
+                {
+                    b.Navigation("Agreements");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AgreementStatus", b =>
+                {
+                    b.Navigation("Agreements");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.AppInstance", b =>
+                {
+                    b.Navigation("AppSubscriptionDetails");
+
+                    b.Navigation("ServiceAccounts");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryStatus", b =>
+                {
+                    b.Navigation("ApplicationChecklistEntries");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ApplicationChecklistEntryType", b =>
+                {
+                    b.Navigation("ApplicationChecklistEntries");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.BpdmIdentifier", b =>
+                {
+                    b.Navigation("CountryAssignedIdentifiers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Company", b =>
+                {
+                    b.Navigation("Agreements");
+
+                    b.Navigation("CompanyApplications");
+
+                    b.Navigation("CompanyAssignedRoles");
+
+                    b.Navigation("CompanyAssignedUseCase");
+
+                    b.Navigation("CompanyCertificates");
+
+                    b.Navigation("CompanyIdentifiers");
+
+                    b.Navigation("CompanySsiDetails");
+
+                    b.Navigation("Consents");
+
+                    b.Navigation("HostedConnectors");
+
+                    b.Navigation("Identities");
+
+                    b.Navigation("NetworkRegistration");
+
+                    b.Navigation("OfferSubscriptions");
+
+                    b.Navigation("OnboardedNetworkRegistrations");
+
+                    b.Navigation("OnboardingServiceProviderDetail");
+
+                    b.Navigation("OwnedIdentityProviders");
+
+                    b.Navigation("ProvidedApplications");
+
+                    b.Navigation("ProvidedConnectors");
+
+                    b.Navigation("ProvidedOffers");
+
+                    b.Navigation("ProviderCompanyDetail");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplication", b =>
+                {
+                    b.Navigation("ApplicationChecklistEntries");
+
+                    b.Navigation("Invitations");
+
+                    b.Navigation("NetworkRegistration");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationStatus", b =>
+                {
+                    b.Navigation("CompanyApplications");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyApplicationType", b =>
+                {
+                    b.Navigation("CompanyApplications");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyRole", b =>
+                {
+                    b.Navigation("AgreementAssignedCompanyRoles");
+
+                    b.Navigation("CompanyAssignedRoles");
+
+                    b.Navigation("CompanyRoleAssignedRoleCollection");
+
+                    b.Navigation("CompanyRoleDescriptions");
+
+                    b.Navigation("CompanyRoleRegistrationData");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccount", b =>
+                {
+                    b.Navigation("AppInstances");
+
+                    b.Navigation("CompaniesLinkedServiceAccount");
+
+                    b.Navigation("Connector");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyServiceAccountType", b =>
+                {
+                    b.Navigation("CompanyServiceAccounts");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanySsiDetailStatus", b =>
+                {
+                    b.Navigation("CompanySsiDetails");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyStatus", b =>
+                {
+                    b.Navigation("Companies");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.CompanyUser", b =>
+                {
+                    b.Navigation("CompanySsiDetails");
+
+                    b.Navigation("CompanyUserAssignedBusinessPartners");
+
+                    b.Navigation("CompanyUserAssignedIdentityProviders");
+
+                    b.Navigation("Consents");
+
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invitations");
+
+                    b.Navigation("Notifications");
+
+                    b.Navigation("RequestedSubscriptions");
+
+                    b.Navigation("SalesManagerOfOffers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Connector", b =>
+                {
+                    b.Navigation("ConnectorAssignedOfferSubscriptions");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorStatus", b =>
+                {
+                    b.Navigation("Connectors");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConnectorType", b =>
+                {
+                    b.Navigation("Connectors");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Consent", b =>
+                {
+                    b.Navigation("ConsentAssignedOfferSubscriptions");
+
+                    b.Navigation("ConsentAssignedOffers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ConsentStatus", b =>
+                {
+                    b.Navigation("Consents");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Country", b =>
+                {
+                    b.Navigation("Addresses");
+
+                    b.Navigation("Connectors");
+
+                    b.Navigation("CountryAssignedIdentifiers");
+
+                    b.Navigation("CountryLongNames");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Document", b =>
+                {
+                    b.Navigation("Agreements");
+
+                    b.Navigation("Companies");
+
+                    b.Navigation("CompanyCertificates");
+
+                    b.Navigation("CompanySsiDetail");
+
+                    b.Navigation("Connector");
+
+                    b.Navigation("Consents");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentStatus", b =>
+                {
+                    b.Navigation("Documents");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.DocumentType", b =>
+                {
+                    b.Navigation("Documents");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IamClient", b =>
+                {
+                    b.Navigation("AppInstances");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Identity", b =>
+                {
+                    b.Navigation("CompanyServiceAccount");
+
+                    b.Navigation("CompanyUser");
+
+                    b.Navigation("CreatedNotifications");
+
+                    b.Navigation("IdentityAssignedRoles");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProvider", b =>
+                {
+                    b.Navigation("CompanyIdentityProviders");
+
+                    b.Navigation("CompanyUserAssignedIdentityProviders");
+
+                    b.Navigation("IamIdentityProvider");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderCategory", b =>
+                {
+                    b.Navigation("IdentityProviders");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityProviderType", b =>
+                {
+                    b.Navigation("IdentityProviders");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityType", b =>
+                {
+                    b.Navigation("Identities");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.IdentityUserStatus", b =>
+                {
+                    b.Navigation("Identities");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.InvitationStatus", b =>
+                {
+                    b.Navigation("Invitations");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Language", b =>
+                {
+                    b.Navigation("AppDescriptions");
+
+                    b.Navigation("CompanyCertificateTypeDescriptions");
+
+                    b.Navigation("CompanyRoleDescriptions");
+
+                    b.Navigation("CountryLongNames");
+
+                    b.Navigation("LanguageLongNameLanguages");
+
+                    b.Navigation("LanguageLongNames");
+
+                    b.Navigation("UseCases");
+
+                    b.Navigation("UserRoleDescriptions");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.LicenseType", b =>
+                {
+                    b.Navigation("Offers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.MediaType", b =>
+                {
+                    b.Navigation("Documents");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationTopic", b =>
+                {
+                    b.Navigation("NotificationTypeAssignedTopics");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.NotificationType", b =>
+                {
+                    b.Navigation("NotificationTypeAssignedTopic");
+
+                    b.Navigation("Notifications");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Offer", b =>
+                {
+                    b.Navigation("AgreementAssignedOffers");
+
+                    b.Navigation("AppInstanceSetup");
+
+                    b.Navigation("AppInstances");
+
+                    b.Navigation("ConsentAssignedOffers");
+
+                    b.Navigation("OfferAssignedPrivacyPolicies");
+
+                    b.Navigation("OfferDescriptions");
+
+                    b.Navigation("OfferSubscriptions");
+
+                    b.Navigation("ServiceDetails");
+
+                    b.Navigation("Tags");
+
+                    b.Navigation("TechnicalUserProfiles");
+
+                    b.Navigation("UserRoles");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferStatus", b =>
+                {
+                    b.Navigation("Offers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscription", b =>
+                {
+                    b.Navigation("AppSubscriptionDetail");
+
+                    b.Navigation("CompanyServiceAccounts");
+
+                    b.Navigation("ConnectorAssignedOfferSubscriptions");
+
+                    b.Navigation("ConsentAssignedOfferSubscriptions");
+
+                    b.Navigation("OfferSubscriptionProcessData");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferSubscriptionStatus", b =>
+                {
+                    b.Navigation("OfferSubscriptions");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.OfferType", b =>
+                {
+                    b.Navigation("AgreementAssignedOfferTypes");
+
+                    b.Navigation("Offers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.PrivacyPolicy", b =>
+                {
+                    b.Navigation("OfferAssignedPrivacyPolicies");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.Process", b =>
+                {
+                    b.Navigation("CompanyApplication");
+
+                    b.Navigation("NetworkRegistration");
+
+                    b.Navigation("OfferSubscription");
+
+                    b.Navigation("ProcessSteps");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepStatus", b =>
+                {
+                    b.Navigation("ProcessSteps");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessStepType", b =>
+                {
+                    b.Navigation("ProcessSteps");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ProcessType", b =>
+                {
+                    b.Navigation("Processes");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.ServiceType", b =>
+                {
+                    b.Navigation("ServiceDetails");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.TechnicalUserProfile", b =>
+                {
+                    b.Navigation("TechnicalUserProfileAssignedUserRoles");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UniqueIdentifier", b =>
+                {
+                    b.Navigation("CompanyIdentifiers");
+
+                    b.Navigation("CountryAssignedIdentifiers");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UseCase", b =>
+                {
+                    b.Navigation("Agreements");
+
+                    b.Navigation("CompanyAssignedUseCase");
+
+                    b.Navigation("UseCaseDescriptions");
+
+                    b.Navigation("VerifiedCredentialAssignedUseCase");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRole", b =>
+                {
+                    b.Navigation("IdentityAssignedRoles");
+
+                    b.Navigation("TechnicalUserProfileAssignedUserRole");
+
+                    b.Navigation("UserRoleDescriptions");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.UserRoleCollection", b =>
+                {
+                    b.Navigation("CompanyRoleAssignedRoleCollection");
+
+                    b.Navigation("UserRoleCollectionDescriptions");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalType", b =>
+                {
+                    b.Navigation("VerifiedCredentialExternalTypeUseCaseDetailVersions");
+
+                    b.Navigation("VerifiedCredentialTypeAssignedExternalTypes");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialExternalTypeUseCaseDetailVersion", b =>
+                {
+                    b.Navigation("CompanySsiDetails");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialType", b =>
+                {
+                    b.Navigation("CompanySsiDetails");
+
+                    b.Navigation("VerifiedCredentialTypeAssignedExternalType");
+
+                    b.Navigation("VerifiedCredentialTypeAssignedKind");
+
+                    b.Navigation("VerifiedCredentialTypeAssignedUseCase");
+                });
+
+            modelBuilder.Entity("Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities.VerifiedCredentialTypeKind", b =>
+                {
+                    b.Navigation("VerifiedCredentialTypeAssignedKinds");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/20240301164139_issue437-codeql-encryption.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/20240301164139_issue437-codeql-encryption.cs
new file mode 100644
index 0000000000..5a4b48ad1b
--- /dev/null
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/20240301164139_issue437-codeql-encryption.cs
@@ -0,0 +1,62 @@
+/********************************************************************************
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.Migrations.Migrations
+{
+    /// <inheritdoc />
+    public partial class issue437codeqlencryption : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "encryption_mode",
+                schema: "portal",
+                table: "onboarding_service_provider_details",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<byte[]>(
+                name: "initialization_vector",
+                schema: "portal",
+                table: "onboarding_service_provider_details",
+                type: "bytea",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "encryption_mode",
+                schema: "portal",
+                table: "onboarding_service_provider_details");
+
+            migrationBuilder.DropColumn(
+                name: "initialization_vector",
+                schema: "portal",
+                table: "onboarding_service_provider_details");
+        }
+    }
+}
diff --git a/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs b/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs
index 807a801652..7484639516 100644
--- a/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs
+++ b/src/portalbackend/PortalBackend.Migrations/Migrations/PortalDbContextModelSnapshot.cs
@@ -5810,6 +5810,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("bytea")
                         .HasColumnName("client_secret");
 
+                    b.Property<int>("EncryptionMode")
+                        .HasColumnType("integer")
+                        .HasColumnName("encryption_mode");
+
+                    b.Property<byte[]>("InitializationVector")
+                        .HasColumnType("bytea")
+                        .HasColumnName("initialization_vector");
+
                     b.HasKey("CompanyId")
                         .HasName("pk_onboarding_service_provider_details");
 
diff --git a/src/portalbackend/PortalBackend.PortalEntities/Entities/OnboardingServiceProviderDetail.cs b/src/portalbackend/PortalBackend.PortalEntities/Entities/OnboardingServiceProviderDetail.cs
index 628771a69c..85c6cebbfc 100644
--- a/src/portalbackend/PortalBackend.PortalEntities/Entities/OnboardingServiceProviderDetail.cs
+++ b/src/portalbackend/PortalBackend.PortalEntities/Entities/OnboardingServiceProviderDetail.cs
@@ -30,7 +30,7 @@ public OnboardingServiceProviderDetail()
         ClientSecret = null!;
     }
 
-    public OnboardingServiceProviderDetail(Guid companyId, string callbackUrl, string authUrl, string clientId, byte[] clientSecret)
+    public OnboardingServiceProviderDetail(Guid companyId, string callbackUrl, string authUrl, string clientId, byte[] clientSecret, byte[]? initializationVector, int encryptionMode)
         : this()
     {
         CompanyId = companyId;
@@ -38,6 +38,8 @@ public OnboardingServiceProviderDetail(Guid companyId, string callbackUrl, strin
         AuthUrl = authUrl;
         ClientId = clientId;
         ClientSecret = clientSecret;
+        InitializationVector = initializationVector;
+        EncryptionMode = encryptionMode;
     }
 
     public Guid CompanyId { get; set; }
@@ -49,6 +51,8 @@ public OnboardingServiceProviderDetail(Guid companyId, string callbackUrl, strin
     public string ClientId { get; set; }
 
     public byte[] ClientSecret { get; set; }
+    public byte[]? InitializationVector { get; set; }
+    public int EncryptionMode { get; set; }
 
     public virtual Company? Company { get; private set; }
 }
diff --git a/src/processes/Processes.Worker/Program.cs b/src/processes/Processes.Worker/Program.cs
index c08343094f..1bd0f4b69c 100644
--- a/src/processes/Processes.Worker/Program.cs
+++ b/src/processes/Processes.Worker/Program.cs
@@ -71,7 +71,7 @@
         .Build();
     Log.Information("Building worker completed");
 
-    var tokenSource = new CancellationTokenSource();
+    using var tokenSource = new CancellationTokenSource();
     Console.CancelKeyPress += (s, e) =>
     {
         Log.Information("Canceling...");
diff --git a/src/processes/Processes.Worker/appsettings.json b/src/processes/Processes.Worker/appsettings.json
index a7b58544b9..3e255ecf35 100644
--- a/src/processes/Processes.Worker/appsettings.json
+++ b/src/processes/Processes.Worker/appsettings.json
@@ -394,6 +394,14 @@
     "EncryptionKey": ""
   },
   "OnboardingServiceProvider": {
-    "EncryptionKey": ""
+    "EncrptionConfigIndex": 0,
+    "EncryptionConfigs": [
+      {
+        "Index": 0,
+        "EncryptionKey": "",
+        "CipherMode": "",
+        "PaddingMode": ""
+      }
+    ]
   }
 }
diff --git a/src/provisioning/Provisioning.Library/Extensions/IdentityProviderManager.cs b/src/provisioning/Provisioning.Library/Extensions/IdentityProviderManager.cs
index a91117b89f..4ad32ae6a7 100644
--- a/src/provisioning/Provisioning.Library/Extensions/IdentityProviderManager.cs
+++ b/src/provisioning/Provisioning.Library/Extensions/IdentityProviderManager.cs
@@ -207,7 +207,7 @@ private IdentityProvider GetIdentityProviderTemplate(IamIdentityProviderProtocol
             case IamIdentityProviderProtocol.SAML:
                 return _Settings.SamlIdentityProvider;
             default:
-                throw new ArgumentOutOfRangeException($"unexpexted value of providerProtocol: {providerProtocol.ToString()}");
+                throw new ArgumentOutOfRangeException($"unexpexted value of providerProtocol: {providerProtocol}");
         }
     }
 
diff --git a/src/provisioning/Provisioning.Library/Extensions/RoleManager.cs b/src/provisioning/Provisioning.Library/Extensions/RoleManager.cs
index be8b54bef4..1d9f6158c0 100644
--- a/src/provisioning/Provisioning.Library/Extensions/RoleManager.cs
+++ b/src/provisioning/Provisioning.Library/Extensions/RoleManager.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -33,15 +32,12 @@ public partial class ProvisioningManager
         try
         {
             idOfClient = await GetIdOfCentralClientAsync(clientName).ConfigureAwait(false);
-            switch (count)
+            return count switch
             {
-                case 0:
-                    return (idOfClient, Enumerable.Empty<Role>());
-                case 1:
-                    return (idOfClient, Enumerable.Repeat<Role>(await _CentralIdp.GetRoleByNameAsync(_Settings.CentralRealm, idOfClient, roleNames.Single()).ConfigureAwait(false), 1));
-                default:
-                    return (idOfClient, (await _CentralIdp.GetRolesAsync(_Settings.CentralRealm, idOfClient).ConfigureAwait(false)).Where(x => roleNames.Contains(x.Name)));
-            }
+                0 => (idOfClient, Enumerable.Empty<Role>()),
+                1 => (idOfClient, Enumerable.Repeat(await _CentralIdp.GetRoleByNameAsync(_Settings.CentralRealm, idOfClient, roleNames.Single()).ConfigureAwait(false), 1)),
+                _ => (idOfClient, (await _CentralIdp.GetRolesAsync(_Settings.CentralRealm, idOfClient).ConfigureAwait(false)).Where(x => roleNames.Contains(x.Name))),
+            };
         }
         catch (KeycloakEntityNotFoundException)
         {
@@ -61,28 +57,31 @@ await Task.WhenAll(clientRoleNames.Select(async x =>
             }
         )).ConfigureAwait(false);
 
-    public async IAsyncEnumerable<(string Client, IEnumerable<string> Roles)> AssignClientRolesToCentralUserAsync(string centralUserId, IDictionary<string, IEnumerable<string>> clientRoleNames)
+    public async IAsyncEnumerable<(string Client, IEnumerable<string> Roles, Exception? Error)> AssignClientRolesToCentralUserAsync(string centralUserId, IDictionary<string, IEnumerable<string>> clientRoleNames)
     {
         foreach (var (client, roleNames) in clientRoleNames)
         {
             var (clientId, roles) = await GetCentralClientIdRolesAsync(client, roleNames).ConfigureAwait(false);
             if (clientId == null || !roles.Any())
             {
-                yield return (Client: client, Roles: Enumerable.Empty<string>());
+                yield return (Client: client, Roles: Enumerable.Empty<string>(), null);
                 continue;
             }
 
             IEnumerable<string> assigned;
+            Exception? error;
             try
             {
                 await _CentralIdp.AddClientRoleMappingsToUserAsync(_Settings.CentralRealm, centralUserId, clientId, roles).ConfigureAwait(false);
-                assigned = roles.Select(role => role.Name);
+                assigned = roles.Select(role => role.Name ?? throw new KeycloakInvalidResponseException("name of role is null"));
+                error = null;
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 assigned = Enumerable.Empty<string>();
+                error = e;
             }
-            yield return (Client: client, Roles: assigned);
+            yield return (Client: client, Roles: assigned, Error: error);
         }
     }
 
@@ -94,13 +93,14 @@ public async Task AddRolesToClientAsync(string clientName, IEnumerable<string> r
             throw new ConflictException($"Client {clientName} does not exist");
         }
 
-        foreach (var roleName in roleNames.Except(result.RoleNames.Select(x => x.Name)))
+        foreach (var role in roleNames.Except(result.RoleNames.Select(x => x.Name))
+            .Select(roleName =>
+                new Role
+                {
+                    Name = roleName,
+                    ClientRole = true
+                }))
         {
-            var role = new Role
-            {
-                Name = roleName,
-                ClientRole = true,
-            };
             await _CentralIdp.CreateRoleAsync(_Settings.CentralRealm, result.ClientId, role).ConfigureAwait(false);
         }
     }
diff --git a/src/provisioning/Provisioning.Library/Extensions/ServiceAccountManager.cs b/src/provisioning/Provisioning.Library/Extensions/ServiceAccountManager.cs
index e941541d1d..ece0ef9cc6 100644
--- a/src/provisioning/Provisioning.Library/Extensions/ServiceAccountManager.cs
+++ b/src/provisioning/Provisioning.Library/Extensions/ServiceAccountManager.cs
@@ -17,6 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Enums;
@@ -35,16 +36,16 @@ public async Task<ServiceAccountData> SetupCentralServiceAccountClientAsync(stri
             throw new KeycloakEntityConflictException($"serviceAccountUser {internalClientId} has no Id in keycloak");
         }
         var assignedRoles = await AssignClientRolesToCentralUserAsync(serviceAccountUser.Id, config.ClientRoles)
-            .ToDictionaryAsync(assigned => assigned.Client, assigned => assigned.Roles).ConfigureAwait(false);
+            .ToDictionaryAsync(assigned => assigned.Client, assigned => (assigned.Roles, assigned.Error)).ConfigureAwait(false);
 
-        var unassignedClientRoles = config.ClientRoles
-            .Select(clientRoles => (client: clientRoles.Key, roles: clientRoles.Value.Except(assignedRoles[clientRoles.Key])))
-            .Where(clientRoles => clientRoles.roles.Any());
-
-        if (unassignedClientRoles.Any())
-        {
-            throw new KeycloakNoSuccessException($"inconsistend data. roles were not assigned in keycloak: {string.Join(", ", unassignedClientRoles.Select(clientRoles => $"client: {clientRoles.client}, roles: [{string.Join(", ", clientRoles.roles)}]"))}");
-        }
+        config.ClientRoles
+            .Select(clientRoles => (ClientRoles: clientRoles, Assigned: assignedRoles[clientRoles.Key]))
+            .Select(x => (Client: x.ClientRoles.Key, UnAssignedRoles: x.ClientRoles.Value.Except(x.Assigned.Roles), Error: x.Assigned.Error))
+            .Where(x => x.UnAssignedRoles.Any())
+            .IfAny(unassignedClientRoles =>
+            {
+                throw new KeycloakNoSuccessException($"inconsistend data. roles were not assigned in keycloak: {string.Join(", ", unassignedClientRoles.Select(clientRoles => $"client: {clientRoles.Client}, roles: [{string.Join(", ", clientRoles.UnAssignedRoles)}], error: {clientRoles.Error?.Message}"))}");
+            });
 
         return new ServiceAccountData(
             internalClientId,
@@ -70,7 +71,7 @@ public async Task<ServiceAccountData> SetupCentralServiceAccountClientAsync(stri
         var serviceAccountUser = await sharedIdp.GetUserForServiceAccountAsync("master", internalClientId).ConfigureAwait(false);
         var roleCreateRealm = await sharedIdp.GetRoleByNameAsync("master", "create-realm").ConfigureAwait(false);
 
-        await sharedIdp.AddRealmRoleMappingsToUserAsync("master", serviceAccountUser.Id, Enumerable.Repeat(roleCreateRealm, 1)).ConfigureAwait(false);
+        await sharedIdp.AddRealmRoleMappingsToUserAsync("master", serviceAccountUser.Id ?? throw new KeycloakInvalidResponseException("id of serviceAccountUser is null"), Enumerable.Repeat(roleCreateRealm, 1)).ConfigureAwait(false);
 
         var credentials = await sharedIdp.GetClientSecretAsync("master", internalClientId).ConfigureAwait(false);
         return new ValueTuple<string, string>(clientId, credentials.Value);
diff --git a/src/provisioning/Provisioning.Library/Extensions/UserManager.cs b/src/provisioning/Provisioning.Library/Extensions/UserManager.cs
index d3c5dee7ea..6a0df82c10 100644
--- a/src/provisioning/Provisioning.Library/Extensions/UserManager.cs
+++ b/src/provisioning/Provisioning.Library/Extensions/UserManager.cs
@@ -91,9 +91,9 @@ public async IAsyncEnumerable<IdentityProviderLink> GetProviderUserLinkDataForCe
         foreach (var federatedIdentity in await _CentralIdp.GetUserSocialLoginsAsync(_Settings.CentralRealm, userId).ConfigureAwait(false))
         {
             yield return new IdentityProviderLink(
-                federatedIdentity.IdentityProvider,
-                federatedIdentity.UserId,
-                federatedIdentity.UserName);
+                federatedIdentity.IdentityProvider ?? throw new KeycloakInvalidResponseException("identity_provider of ferderated_identity is null"),
+                federatedIdentity.UserId ?? throw new KeycloakInvalidResponseException("user_id of ferderated_identity is null"),
+                federatedIdentity.UserName ?? throw new KeycloakInvalidResponseException("user_name of ferderated_identity is null"));
         }
     }
 
diff --git a/src/provisioning/Provisioning.Library/IProvisioningManager.cs b/src/provisioning/Provisioning.Library/IProvisioningManager.cs
index 1a12e5c930..ef0450543a 100644
--- a/src/provisioning/Provisioning.Library/IProvisioningManager.cs
+++ b/src/provisioning/Provisioning.Library/IProvisioningManager.cs
@@ -28,7 +28,7 @@ public interface IProvisioningManager
     Task SetupSharedIdpAsync(string idpName, string organisationName, string? loginTheme);
     Task<string> CreateSharedRealmUserAsync(string realm, UserProfile profile);
     Task<string> CreateCentralUserAsync(UserProfile profile, IEnumerable<(string Name, IEnumerable<string> Values)> attributes);
-    IAsyncEnumerable<(string Client, IEnumerable<string> Roles)> AssignClientRolesToCentralUserAsync(string centralUserId, IDictionary<string, IEnumerable<string>> clientRoleNames);
+    IAsyncEnumerable<(string Client, IEnumerable<string> Roles, Exception? Error)> AssignClientRolesToCentralUserAsync(string centralUserId, IDictionary<string, IEnumerable<string>> clientRoleNames);
     Task AddRolesToClientAsync(string clientName, IEnumerable<string> roleNames);
     Task<string> CreateOwnIdpAsync(string displayName, string organisationName, IamIdentityProviderProtocol providerProtocol);
     Task<string?> GetProviderUserIdForCentralUserIdAsync(string identityProvider, string userId);
diff --git a/src/provisioning/Provisioning.Library/ProvisioningManager.cs b/src/provisioning/Provisioning.Library/ProvisioningManager.cs
index 33a77f3f71..bf461f5fdb 100644
--- a/src/provisioning/Provisioning.Library/ProvisioningManager.cs
+++ b/src/provisioning/Provisioning.Library/ProvisioningManager.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -19,6 +18,7 @@
  ********************************************************************************/
 
 using Microsoft.Extensions.Options;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory;
 using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Library;
@@ -110,20 +110,20 @@ async Task<string> IProvisioningManager.SetupClientAsync(string redirectUrl, str
         await CreateCentralOIDCClientAudienceMapperAsync(internalId, clientId).ConfigureAwait(false);
         if (optionalRoleNames != null && optionalRoleNames.Any())
         {
-            await this.AssignClientRolesToClient(internalId, optionalRoleNames).ConfigureAwait(false);
+            await AssignClientRolesToClient(internalId, optionalRoleNames).ConfigureAwait(false);
         }
 
         return clientId;
     }
 
-    public async Task AddBpnAttributetoUserAsync(string userId, IEnumerable<string> bpns)
+    public async Task AddBpnAttributetoUserAsync(string centralUserId, IEnumerable<string> bpns)
     {
-        var user = await _CentralIdp.GetUserAsync(_Settings.CentralRealm, userId).ConfigureAwait(false);
+        var user = await _CentralIdp.GetUserAsync(_Settings.CentralRealm, centralUserId).ConfigureAwait(false);
         user.Attributes ??= new Dictionary<string, IEnumerable<string>>();
-        user.Attributes[_Settings.MappedBpnAttribute] = (user.Attributes.TryGetValue(_Settings.MappedBpnAttribute, out var existingBpns))
+        user.Attributes[_Settings.MappedBpnAttribute] = user.Attributes.TryGetValue(_Settings.MappedBpnAttribute, out var existingBpns)
             ? existingBpns.Concat(bpns).Distinct()
             : bpns;
-        await _CentralIdp.UpdateUserAsync(_Settings.CentralRealm, userId.ToString(), user).ConfigureAwait(false);
+        await _CentralIdp.UpdateUserAsync(_Settings.CentralRealm, centralUserId.ToString(), user).ConfigureAwait(false);
     }
 
     public Task AddProtocolMapperAsync(string clientId) =>
@@ -132,18 +132,18 @@ public Task AddProtocolMapperAsync(string clientId) =>
             clientId,
             Clone(_Settings.ClientProtocolMapper));
 
-    public async Task DeleteCentralUserBusinessPartnerNumberAsync(string userId, string businessPartnerNumber)
+    public async Task DeleteCentralUserBusinessPartnerNumberAsync(string centralUserId, string businessPartnerNumber)
     {
-        var user = await _CentralIdp.GetUserAsync(_Settings.CentralRealm, userId).ConfigureAwait(false);
+        var user = await _CentralIdp.GetUserAsync(_Settings.CentralRealm, centralUserId).ConfigureAwait(false);
 
         if (user.Attributes == null || !user.Attributes.TryGetValue(_Settings.MappedBpnAttribute, out var existingBpns))
         {
-            throw new KeycloakEntityNotFoundException($"attribute {_Settings.MappedBpnAttribute} not found in the mappers of user {userId}");
+            throw new KeycloakEntityNotFoundException($"attribute {_Settings.MappedBpnAttribute} not found in the mappers of user {centralUserId}");
         }
 
         user.Attributes[_Settings.MappedBpnAttribute] = existingBpns.Where(bpn => bpn != businessPartnerNumber);
 
-        await _CentralIdp.UpdateUserAsync(_Settings.CentralRealm, userId, user).ConfigureAwait(false);
+        await _CentralIdp.UpdateUserAsync(_Settings.CentralRealm, centralUserId, user).ConfigureAwait(false);
     }
 
     public async Task ResetSharedUserPasswordAsync(string realm, string userId)
@@ -160,8 +160,8 @@ public async Task ResetSharedUserPasswordAsync(string realm, string userId)
     public async Task<IEnumerable<string>> GetClientRoleMappingsForUserAsync(string userId, string clientId)
     {
         var idOfClient = await GetIdOfCentralClientAsync(clientId).ConfigureAwait(false);
-        return (await _CentralIdp.GetClientRoleMappingsForUserAsync(_Settings.CentralRealm, userId, idOfClient).ConfigureAwait(false))
-            .Where(r => r.Composite == true).Select(x => x.Name);
+        return (await _CentralIdp.GetClientRoleMappingsForUserAsync(_Settings.CentralRealm, userId, idOfClient).ConfigureAwait(false))?
+            .Where(r => r.Composite == true).Select(x => x.Name ?? throw new KeycloakInvalidResponseException("name of role is null")) ?? throw new KeycloakInvalidResponseException();
     }
 
     public async ValueTask<bool> IsCentralIdentityProviderEnabled(string alias)
@@ -170,22 +170,22 @@ public async ValueTask<bool> IsCentralIdentityProviderEnabled(string alias)
     }
 
     public async Task<string> GetCentralIdentityProviderDisplayName(string alias) =>
-        (await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false)).DisplayName;
+        (await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false)).DisplayName ?? throw new KeycloakInvalidResponseException("display_name of identityProvider is null");
 
     public async ValueTask<IdentityProviderConfigOidc> GetCentralIdentityProviderDataOIDCAsync(string alias)
     {
         var identityProvider = await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         var redirectUri = await GetCentralBrokerEndpointOIDCAsync(alias).ConfigureAwait(false);
         return new IdentityProviderConfigOidc(
-            identityProvider.DisplayName,
+            identityProvider.DisplayName ?? throw new KeycloakInvalidResponseException("display_name of identityProvider is null"),
             redirectUri,
-            identityProvider.Config.TokenUrl,
+            (identityProvider.Config ?? throw new KeycloakInvalidResponseException("config of identityProvider is null")).TokenUrl ?? throw new KeycloakInvalidResponseException("token_url of identityProvider is null"),
             identityProvider.Config.LogoutUrl,
-            identityProvider.Config.ClientId,
+            identityProvider.Config.ClientId ?? throw new KeycloakInvalidResponseException("client_id of identityProvider is null"),
             identityProvider.Config.ClientSecret,
             identityProvider.Enabled ?? false,
-            identityProvider.Config.AuthorizationUrl,
-            IdentityProviderClientAuthTypeToIamClientAuthMethod(identityProvider.Config.ClientAuthMethod),
+            identityProvider.Config.AuthorizationUrl ?? throw new KeycloakInvalidResponseException("authorization_url of identityProvider is null"),
+            IdentityProviderClientAuthTypeToIamClientAuthMethod(identityProvider.Config.ClientAuthMethod ?? throw new KeycloakInvalidResponseException("client_auth_method of identityProvider is null")),
             identityProvider.Config.ClientAssertionSigningAlg == null ? null : Enum.Parse<IamIdentityProviderSignatureAlgorithm>(identityProvider.Config.ClientAssertionSigningAlg));
     }
 
@@ -202,14 +202,14 @@ public async ValueTask UpdateSharedRealmTheme(string alias, string loginTheme)
     {
         var identityProvider = await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         var sharedKeycloak = await GetSharedKeycloakClient(alias).ConfigureAwait(false);
-        await UpdateSharedRealmAsync(sharedKeycloak, alias, identityProvider.DisplayName, loginTheme).ConfigureAwait(false);
+        await UpdateSharedRealmAsync(sharedKeycloak, alias, identityProvider.DisplayName ?? throw new KeycloakInvalidResponseException("display_name of identityProvider is null"), loginTheme).ConfigureAwait(false);
     }
 
     public async ValueTask SetSharedIdentityProviderStatusAsync(string alias, bool enabled)
     {
         var identityProvider = await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         identityProvider.Enabled = enabled;
-        identityProvider.Config.HideOnLoginPage = enabled ? "false" : "true";
+        (identityProvider.Config ?? throw new KeycloakInvalidResponseException("config of identityProvider is null")).HideOnLoginPage = enabled ? "false" : "true";
         var sharedKeycloak = await GetSharedKeycloakClient(alias).ConfigureAwait(false);
         await SetSharedRealmStatusAsync(sharedKeycloak, alias, enabled).ConfigureAwait(false);
         await UpdateCentralIdentityProviderAsync(alias, identityProvider).ConfigureAwait(false);
@@ -219,7 +219,7 @@ public async ValueTask SetCentralIdentityProviderStatusAsync(string alias, bool
     {
         var identityProvider = await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         identityProvider.Enabled = enabled;
-        identityProvider.Config.HideOnLoginPage = enabled ? "false" : "true";
+        (identityProvider.Config ?? throw new KeycloakInvalidResponseException("config of identityProvider is null")).HideOnLoginPage = enabled ? "false" : "true";
         await UpdateCentralIdentityProviderAsync(alias, identityProvider).ConfigureAwait(false);
     }
 
@@ -232,7 +232,7 @@ public ValueTask UpdateCentralIdentityProviderDataOIDCAsync(IdentityProviderEdit
                 case IamIdentityProviderClientAuthMethod.SECRET_BASIC:
                 case IamIdentityProviderClientAuthMethod.SECRET_POST:
                 case IamIdentityProviderClientAuthMethod.SECRET_JWT:
-                    throw new ArgumentException($"secret must not be null for clientAuthMethod {identityProviderConfigOidc.ClientAuthMethod.ToString()}");
+                    throw new ArgumentException($"secret must not be null for clientAuthMethod {identityProviderConfigOidc.ClientAuthMethod}");
                 default:
                     break;
             }
@@ -243,7 +243,7 @@ public ValueTask UpdateCentralIdentityProviderDataOIDCAsync(IdentityProviderEdit
             {
                 case IamIdentityProviderClientAuthMethod.SECRET_JWT:
                 case IamIdentityProviderClientAuthMethod.JWT:
-                    throw new ArgumentException($"signatureAlgorithm must not be null for clientAuthMethod {identityProviderConfigOidc.ClientAuthMethod.ToString()}");
+                    throw new ArgumentException($"signatureAlgorithm must not be null for clientAuthMethod {identityProviderConfigOidc.ClientAuthMethod}");
                 default:
                     break;
             }
@@ -256,7 +256,7 @@ private async ValueTask UpdateCentralIdentityProviderDataOIDCInternalAsync(Ident
         var (alias, displayName, metadataUrl, clientAuthMethod, clientId, secret, signatureAlgorithm) = identityProviderConfigOidc;
         var identityProvider = await SetIdentityProviderMetadataFromUrlAsync(await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false), metadataUrl, cancellationToken).ConfigureAwait(false);
         identityProvider.DisplayName = displayName;
-        identityProvider.Config.ClientAuthMethod = IamIdentityProviderClientAuthMethodToInternal(clientAuthMethod);
+        (identityProvider.Config ?? throw new KeycloakInvalidResponseException("config of identityProvider is null")).ClientAuthMethod = IamIdentityProviderClientAuthMethodToInternal(clientAuthMethod);
         identityProvider.Config.ClientId = clientId;
         identityProvider.Config.ClientSecret = secret;
         identityProvider.Config.ClientAssertionSigningAlg = signatureAlgorithm?.ToString();
@@ -268,12 +268,12 @@ public async ValueTask<IdentityProviderConfigSaml> GetCentralIdentityProviderDat
         var identityProvider = await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         var redirectUri = await GetCentralBrokerEndpointSAMLAsync(alias).ConfigureAwait(false);
         return new IdentityProviderConfigSaml(
-            identityProvider.DisplayName,
-            redirectUri,
-            identityProvider.Config.ClientId,
+            identityProvider.DisplayName ?? throw new KeycloakInvalidResponseException("display_name of identityProvider is null"),
+            redirectUri ?? throw new KeycloakInvalidResponseException("same endpoint of identityProvider is null"),
+            (identityProvider.Config ?? throw new KeycloakInvalidResponseException("config of identityProvider is null")).ClientId ?? throw new KeycloakInvalidResponseException("client_id of identityProvider is null"),
             identityProvider.Enabled ?? false,
-            identityProvider.Config.EntityId,
-            identityProvider.Config.SingleSignOnServiceUrl);
+            identityProvider.Config.EntityId ?? throw new KeycloakInvalidResponseException("entity_id of identityProvider is null"),
+            identityProvider.Config.SingleSignOnServiceUrl ?? throw new KeycloakInvalidResponseException("single_sign_on_service_url of identityProvider is null"));
     }
 
     public async ValueTask UpdateCentralIdentityProviderDataSAMLAsync(IdentityProviderEditableConfigSaml identityProviderEditableConfigSaml)
@@ -281,7 +281,7 @@ public async ValueTask UpdateCentralIdentityProviderDataSAMLAsync(IdentityProvid
         var (alias, displayName, entityId, singleSignOnServiceUrl) = identityProviderEditableConfigSaml;
         var identityProvider = await GetCentralIdentityProviderAsync(alias).ConfigureAwait(false);
         identityProvider.DisplayName = displayName;
-        identityProvider.Config.EntityId = entityId;
+        (identityProvider.Config ?? throw new KeycloakInvalidResponseException("config of identityProvider is null")).EntityId = entityId;
         identityProvider.Config.SingleSignOnServiceUrl = singleSignOnServiceUrl;
         await UpdateCentralIdentityProviderAsync(alias, identityProvider).ConfigureAwait(false);
     }
diff --git a/src/provisioning/Provisioning.Library/Service/UserProvisioningService.cs b/src/provisioning/Provisioning.Library/Service/UserProvisioningService.cs
index 392b039ef2..d314df35d1 100644
--- a/src/provisioning/Provisioning.Library/Service/UserProvisioningService.cs
+++ b/src/provisioning/Provisioning.Library/Service/UserProvisioningService.cs
@@ -255,15 +255,15 @@ private static string CreateNameString(string? firstName, string? lastName, stri
 
         if (lastName != null)
         {
-            sb.AppendFormat((firstName == null ? "{0}" : ", {0}"), lastName);
+            sb.AppendFormat(sb.Length == 0 ? "{0}" : ", {0}", lastName);
         }
 
         if (email != null)
         {
-            sb.AppendFormat((firstName == null && lastName == null) ? "{0}" : " ({0})", email);
+            sb.AppendFormat(sb.Length == 0 ? "{0}" : " ({0})", email);
         }
 
-        return firstName == null && lastName == null && email == null ? "Dear User" : sb.ToString();
+        return sb.Length == 0 ? "Dear User" : sb.ToString();
     }
 
     public Task<string> GetIdentityProviderDisplayName(string idpAlias) =>
@@ -315,7 +315,7 @@ public async Task AssignRolesToNewUserAsync(IUserRolesRepository userRolesReposi
                     userRolesRepository.CreateIdentityAssignedRole(userdata.CompanyUserId, roleId);
                 }
 
-                messages.AddRange(clientRoleNames[assigned.Client].Except(assigned.Roles).Select(roleName => $"clientId: {assigned.Client}, role: {roleName}"));
+                messages.AddRange(clientRoleNames[assigned.Client].Except(assigned.Roles).Select(roleName => $"clientId: {assigned.Client}, role: {roleName}, error: {assigned.Error?.Message}"));
             }
 
             if (messages.Any())
@@ -353,7 +353,7 @@ private static void ValidateRoleData(IEnumerable<UserRoleData> roleData, string
 
         if (invalid.Any())
         {
-            throw new ControllerArgumentException($"invalid roles: clientId: '{clientId}', roles: [{String.Join(", ", invalid)}]");
+            throw new ControllerArgumentException($"invalid roles: clientId: '{clientId}', roles: [{string.Join(", ", invalid)}]");
         }
     }
 }
diff --git a/src/registration/ApplicationActivation.Library/ApplicationActivationService.cs b/src/registration/ApplicationActivation.Library/ApplicationActivationService.cs
index cf21821206..4933370922 100644
--- a/src/registration/ApplicationActivation.Library/ApplicationActivationService.cs
+++ b/src/registration/ApplicationActivation.Library/ApplicationActivationService.cs
@@ -129,14 +129,17 @@ public ApplicationActivationService(
 
         if (assignedRoles != null)
         {
-            var unassignedClientRoles = _settings.ApplicationApprovalInitialRoles
+            _settings.ApplicationApprovalInitialRoles
                 .Select(initialClientRoles => (
-                    initialClientRoles.ClientId,
-                    Roles: initialClientRoles.UserRoleNames.Except(assignedRoles[initialClientRoles.ClientId])))
-                .Where(clientRoles => clientRoles.Roles.Any());
-
-            unassignedClientRoles.IfAny(unassigned =>
-                throw new UnexpectedConditionException($"inconsistent data, roles not assigned in keycloak: {string.Join(", ", unassigned.Select(clientRoles => $"client: {clientRoles.ClientId}, roles: [{string.Join(", ", clientRoles.Roles)}]"))}"));
+                    Initial: initialClientRoles,
+                    AssignedRoles: assignedRoles[initialClientRoles.ClientId]))
+                .Select(x => (
+                    x.Initial.ClientId,
+                    Unassigned: x.Initial.UserRoleNames.Except(x.AssignedRoles.Roles),
+                    x.AssignedRoles.Error))
+                .Where(clientRoles => clientRoles.Unassigned.Any())
+                .IfAny(unassigned =>
+                    throw new UnexpectedConditionException($"inconsistent data, roles not assigned in keycloak: {string.Join(", ", unassigned.Select(clientRoles => $"client: {clientRoles.ClientId}, roles: [{string.Join(", ", clientRoles.Unassigned)}], error: {clientRoles.Error}"))}"));
         }
 
         return new IApplicationChecklistService.WorkerChecklistProcessStepExecutionResult(
@@ -167,14 +170,14 @@ private bool InProcessingTime()
             now >= startTime && now <= endTime;
     }
 
-    private async Task<IDictionary<string, IEnumerable<string>>?> AssignRolesAndBpn(Guid applicationId, IUserRolesRepository userRolesRepository, IApplicationRepository applicationRepository, string businessPartnerNumber)
+    private async Task<IDictionary<string, (IEnumerable<string> Roles, Exception? Error)>?> AssignRolesAndBpn(Guid applicationId, IUserRolesRepository userRolesRepository, IApplicationRepository applicationRepository, string businessPartnerNumber)
     {
         var userBusinessPartnersRepository = _portalRepositories.GetInstance<IUserBusinessPartnerRepository>();
 
         var approvalInitialRoles = _settings.ApplicationApprovalInitialRoles;
         var initialRolesData = await GetRoleData(userRolesRepository, approvalInitialRoles).ConfigureAwait(false);
 
-        IDictionary<string, IEnumerable<string>>? assignedRoles = null;
+        IDictionary<string, (IEnumerable<string> Roles, Exception? Error)>? assignedRoles = null;
         var invitedUsersData = applicationRepository
             .GetInvitedUsersDataByApplicationIdUntrackedAsync(applicationId);
         await foreach (var userData in invitedUsersData.ConfigureAwait(false))
@@ -183,11 +186,11 @@ private bool InProcessingTime()
 
             assignedRoles = await _provisioningManager
                 .AssignClientRolesToCentralUserAsync(iamUserId, approvalInitialRoles.ToDictionary(x => x.ClientId, x => x.UserRoleNames))
-                .ToDictionaryAsync(assigned => assigned.Client, assigned => assigned.Roles)
+                .ToDictionaryAsync(assigned => assigned.Client, assigned => (assigned.Roles, assigned.Error))
                 .ConfigureAwait(false);
 
             foreach (var roleData in initialRolesData.Where(roleData => !userData.RoleIds.Contains(roleData.UserRoleId) &&
-                                                                        assignedRoles[roleData.ClientClientId].Contains(roleData.UserRoleText)))
+                                                                        assignedRoles[roleData.ClientClientId].Roles.Contains(roleData.UserRoleText)))
             {
                 userRolesRepository.CreateIdentityAssignedRole(userData.CompanyUserId, roleData.UserRoleId);
             }
diff --git a/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs b/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs
index b043825bb2..9304b32c40 100644
--- a/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs
+++ b/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 Microsoft and BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -126,23 +125,18 @@ private async Task<CompanyBpdmDetailData> GetCompanyBpdmDetailDataByBusinessPart
             physicalPostalAddress?.City ?? "",
             physicalPostalAddress?.Street?.Name ?? "",
             physicalPostalAddress?.AdministrativeAreaLevel1?.RegionCode,
-            null, // TODO clarify how to map from bpdm data
+            null,
             physicalPostalAddress?.Street?.HouseNumber,
             physicalPostalAddress?.PostalCode,
             portalIdentifiers.Select(identifier => new CompanyUniqueIdData(identifier.UniqueIdentifierId, identifier.Value))
         );
     }
 
-    private static IEnumerable<(BpdmIdentifierId BpdmIdentifierId, string Value)> ParseBpdmIdentifierDtos(IEnumerable<BpdmIdentifierDto> bpdmIdentifierDtos)
-    {
-        foreach (var identifier in bpdmIdentifierDtos)
-        {
-            if (Enum.TryParse<BpdmIdentifierId>(identifier.Type.TechnicalKey, out var bpdmIdentifierId))
-            {
-                yield return (bpdmIdentifierId, identifier.Value);
-            }
-        }
-    }
+    private static IEnumerable<(BpdmIdentifierId BpdmIdentifierId, string Value)> ParseBpdmIdentifierDtos(IEnumerable<BpdmIdentifierDto> bpdmIdentifierDtos) =>
+        bpdmIdentifierDtos
+            .Select(dto => (Valid: Enum.TryParse<BpdmIdentifierId>(dto.Type.TechnicalKey, out var bpdmIdentifierId), IdentifierId: bpdmIdentifierId, dto.Value))
+            .Where(x => x.Valid)
+            .Select(x => (x.IdentifierId, x.Value));
 
     public async Task UploadDocumentAsync(Guid applicationId, IFormFile document, DocumentTypeId documentTypeId, CancellationToken cancellationToken)
     {
@@ -220,15 +214,15 @@ string CreateNameString(string? firstName, string? lastName, string? email)
 
             if (lastName != null)
             {
-                sb.AppendFormat(firstName == null ? "{0}" : ", {0}", lastName);
+                sb.AppendFormat(sb.Length == 0 ? "{0}" : ", {0}", lastName);
             }
 
             if (email != null)
             {
-                sb.AppendFormat(firstName == null && lastName == null ? "{0}" : " ({0})", email);
+                sb.AppendFormat(sb.Length == 0 ? "{0}" : " ({0})", email);
             }
 
-            return firstName == null && lastName == null && email == null ? "unknown user" : sb.ToString();
+            return sb.Length == 0 ? "unknown user" : sb.ToString();
         }
 
         var data = await _portalRepositories.GetInstance<IApplicationRepository>().GetCompanyApplicationsDeclineData(_identityData.IdentityId, _settings.ApplicationDeclineStatusIds).ConfigureAwait(false);
diff --git a/src/registration/Registration.Service/BusinessLogic/UpdateApplicationSteps.cs b/src/registration/Registration.Service/BusinessLogic/UpdateApplicationSteps.cs
index 4cd323b0ea..1f0f71f265 100644
--- a/src/registration/Registration.Service/BusinessLogic/UpdateApplicationSteps.cs
+++ b/src/registration/Registration.Service/BusinessLogic/UpdateApplicationSteps.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 Microsoft and BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -20,7 +19,7 @@
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic;
 
-public enum UpdateApplicationSteps : int
+public enum UpdateApplicationSteps
 {
     CompanyWithAddress = 1,
     CompanyRoleAgreementConsents = 2,
diff --git a/src/registration/Registration.Service/Model/CompanyDetailData.cs b/src/registration/Registration.Service/Model/CompanyDetailData.cs
index 04c1349cc4..e272497d65 100644
--- a/src/registration/Registration.Service/Model/CompanyDetailData.cs
+++ b/src/registration/Registration.Service/Model/CompanyDetailData.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
index e65433409c..c33dc49fbe 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/CompanyDataBusinessLogicTests.cs
@@ -109,7 +109,7 @@ public async Task GetOwnCompanyDetailsAsync_ExpectedResults()
         // Arrange
         var companyAddressDetailData = _fixture.Create<CompanyAddressDetailData>();
         A.CallTo(() => _companyRepository.GetCompanyDetailsAsync(_identity.CompanyId))
-            .ReturnsLazily(() => companyAddressDetailData);
+            .Returns(companyAddressDetailData);
 
         // Act
         var result = await _sut.GetCompanyDetailsAsync();
@@ -124,7 +124,7 @@ public async Task GetOwnCompanyDetailsAsync_ThrowsConflictException()
     {
         // Arrange
         A.CallTo(() => _companyRepository.GetCompanyDetailsAsync(_identity.CompanyId))
-            .ReturnsLazily(() => (CompanyAddressDetailData?)null);
+            .Returns<CompanyAddressDetailData?>(null);
 
         // Act
         async Task Act() => await _sut.GetCompanyDetailsAsync();
@@ -392,8 +392,6 @@ public async Task CreateCompanyRoleAndConsentAgreementDetailsAsync_MissingAgreem
         var agreementId4 = _fixture.Create<Guid>();
         var agreementId5 = _fixture.Create<Guid>();
 
-        var utcNow = DateTimeOffset.UtcNow;
-
         var consentStatusDetails = new ConsentStatusDetails[] {
             new (_fixture.Create<Guid>(), agreementId1, ConsentStatusId.INACTIVE),
             new (_fixture.Create<Guid>(), agreementId5, ConsentStatusId.ACTIVE),
@@ -445,8 +443,6 @@ public async Task CreateCompanyRoleAndConsentAgreementDetailsAsync_ExtraAgreemen
         var agreementId4 = _fixture.Create<Guid>();
         var agreementId5 = _fixture.Create<Guid>();
 
-        var utcNow = DateTimeOffset.UtcNow;
-
         var consentStatusDetails = new ConsentStatusDetails[] {
             new (_fixture.Create<Guid>(), agreementId1, ConsentStatusId.INACTIVE),
             new (_fixture.Create<Guid>(), agreementId5, ConsentStatusId.ACTIVE),
@@ -526,7 +522,7 @@ public async Task CreateCompanyRoleAndConsentAgreementDetailsAsync_ThrowsConflic
         // Arrange
         var companyRoleConsentDetails = _fixture.CreateMany<CompanyRoleConsentDetails>(2);
         A.CallTo(() => _companyRepository.GetCompanyRolesDataAsync(A<Guid>._, A<IEnumerable<CompanyRoleId>>._))
-            .Returns(((bool, bool, IEnumerable<CompanyRoleId>?, IEnumerable<ConsentStatusDetails>?))default);
+            .Returns<(bool, bool, IEnumerable<CompanyRoleId>?, IEnumerable<ConsentStatusDetails>?)>(default);
 
         // Act
         async Task Act() => await _sut.CreateCompanyRoleAndConsentAgreementDetailsAsync(companyRoleConsentDetails).ConfigureAwait(false);
@@ -1229,7 +1225,7 @@ public async Task ApproveCredential_WithBpnNotSetActiveSsiDetail_ThrowsConflictE
         var alreadyActiveId = Guid.NewGuid();
         var approvalData = _fixture.Build<SsiApprovalData>()
             .With(x => x.Status, CompanySsiDetailStatusId.PENDING)
-            .With(x => x.Bpn, (string?)null)
+            .With(x => x.Bpn, default(string?))
             .With(x => x.CompanyName, "Test Company")
             .Create();
         A.CallTo(() => _companySsiDetailsRepository.GetSsiApprovalData(alreadyActiveId))
@@ -1256,7 +1252,7 @@ public async Task ApproveCredential_WithoutExternalDetailSet_ThrowsConflictExcep
             .With(x => x.Bpn, "test")
             .With(x => x.CompanyName, "Test Company")
             .With(x => x.Kind, VerifiedCredentialTypeKindId.USE_CASE)
-            .With(x => x.UseCaseDetailData, (UseCaseDetailData?)null)
+            .With(x => x.UseCaseDetailData, default(UseCaseDetailData?))
             .Create();
         A.CallTo(() => _companySsiDetailsRepository.GetSsiApprovalData(alreadyActiveId))
             .Returns(new ValueTuple<bool, SsiApprovalData>(true, approvalData));
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs
index 033b2ad05a..255ab3ae4c 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/ConnectorsBusinessLogicTests.cs
@@ -115,7 +115,7 @@ public async Task GetAllCompanyConnectorDatas_WithValidData_ReturnsExpected(int
         var data = _fixture.CreateMany<ConnectorData>(numberOfElements).ToImmutableArray();
 
         A.CallTo(() => _connectorsRepository.GetAllCompanyConnectorsForCompanyId(A<Guid>._))
-            .Returns((int skip, int take) => Task.FromResult((Pagination.Source<ConnectorData>?)new Pagination.Source<ConnectorData>(data.Length, data.Skip(skip).Take(take))));
+            .Returns((int skip, int take) => Task.FromResult<Pagination.Source<ConnectorData>?>(new(data.Length, data.Skip(skip).Take(take))));
 
         // Act
         var result = await _logic.GetAllCompanyConnectorDatas(page, size);
@@ -446,7 +446,7 @@ public async Task ProcessClearinghouseSelfDescription_WithValidData_CallsExpecte
         var connectorId = Guid.NewGuid();
         var data = new SelfDescriptionResponseData(connectorId, SelfDescriptionStatus.Confirm, null, "{ \"test\": true }");
         A.CallTo(() => _connectorsRepository.GetConnectorDataById(A<Guid>._))
-            .Returns((connectorId, (Guid?)null));
+            .Returns((connectorId, null));
 
         // Act
         await _logic.ProcessClearinghouseSelfDescription(data, CancellationToken.None).ConfigureAwait(false);
@@ -465,7 +465,7 @@ public async Task ProcessClearinghouseSelfDescription_WithNotExistingApplication
         var connectorId = Guid.NewGuid();
         var data = new SelfDescriptionResponseData(connectorId, SelfDescriptionStatus.Confirm, null, "{ \"test\": true }");
         A.CallTo(() => _connectorsRepository.GetConnectorDataById(A<Guid>._))
-            .Returns(((Guid, Guid?))default);
+            .Returns<(Guid, Guid?)>(default);
 
         // Act
         async Task Act() => await _logic.ProcessClearinghouseSelfDescription(data, CancellationToken.None).ConfigureAwait(false);
@@ -564,7 +564,7 @@ public async Task DeleteConnectorAsync_WithDocumentId_WithInactiveOrNoUser_Expec
             new ConnectorOfferSubscription(_fixture.Create<Guid>(), OfferSubscriptionStatusId.PENDING),
             new ConnectorOfferSubscription(_fixture.Create<Guid>(), OfferSubscriptionStatusId.PENDING),
         };
-        var userId = id == null ? (Guid?)null : new Guid(id);
+        var userId = id == null ? default(Guid?) : new Guid(id);
         A.CallTo(() => _connectorsRepository.GetConnectorDeleteDataAsync(A<Guid>._, _identity.CompanyId))
             .Returns(new DeleteConnectorData(true, selfDescriptionDocumentId, DocumentStatusId, ConnectorStatusId.ACTIVE, connectorOfferSubscriptions, statusId, userId));
 
@@ -701,7 +701,7 @@ public async Task DeleteConnectorAsync_ThrowsNotFoundException()
         // Arrange
         var connectorId = Guid.NewGuid();
         A.CallTo(() => _connectorsRepository.GetConnectorDeleteDataAsync(connectorId, _identity.CompanyId))
-            .Returns((DeleteConnectorData)default!);
+            .Returns(default(DeleteConnectorData));
 
         // Act
         async Task Act() => await _logic.DeleteConnectorAsync(connectorId).ConfigureAwait(false);
@@ -793,7 +793,7 @@ public async Task GetManagedConnectorForIamUserAsync_GetExpected(int page, int s
         var data = _fixture.CreateMany<ManagedConnectorData>(numberOfElements).ToImmutableArray();
 
         A.CallTo(() => _connectorsRepository.GetManagedConnectorsForCompany(A<Guid>._))
-            .Returns((int skip, int take) => Task.FromResult((Pagination.Source<ManagedConnectorData>?)new Pagination.Source<ManagedConnectorData>(data.Length, data.Skip(skip).Take(take))));
+            .Returns((int skip, int take) => Task.FromResult<Pagination.Source<ManagedConnectorData>?>(new(data.Length, data.Skip(skip).Take(take))));
 
         // Act
         var result = await _logic.GetManagedConnectorForCompany(page, size);
@@ -813,7 +813,7 @@ public async Task GetManagedConnectorForIamUserAsync_EmptyResult_GetExpected()
     {
         // Arrange
         A.CallTo(() => _connectorsRepository.GetManagedConnectorsForCompany(A<Guid>._))
-            .Returns((int _, int _) => Task.FromResult((Pagination.Source<ManagedConnectorData>?)null));
+            .Returns((int _, int _) => Task.FromResult<Pagination.Source<ManagedConnectorData>?>(null));
 
         // Act
         var result = await _logic.GetManagedConnectorForCompany(0, 10);
@@ -838,7 +838,7 @@ public async Task UpdateConnectorUrl_WithoutConnector_ThrowsNotFoundException()
         // Arrange
         var connectorId = Guid.NewGuid();
         A.CallTo(() => _connectorsRepository.GetConnectorUpdateInformation(connectorId, _identity.CompanyId))
-            .Returns((ConnectorUpdateInformation?)null);
+            .Returns<ConnectorUpdateInformation?>(null);
 
         // Act
         async Task Act() => await _logic.UpdateConnectorUrl(connectorId, new ConnectorUpdateRequest("https://test.de")).ConfigureAwait(false);
@@ -917,7 +917,7 @@ public async Task UpdateConnectorUrl_WithBpnNotSet_ThrowsConflictException()
             .With(x => x.IsHostCompany, true)
             .With(x => x.Status, ConnectorStatusId.ACTIVE)
             .With(x => x.Type, ConnectorTypeId.CONNECTOR_AS_A_SERVICE)
-            .With(x => x.Bpn, (string?)null)
+            .With(x => x.Bpn, default(string?))
             .Create();
         A.CallTo(() => _connectorsRepository.GetConnectorUpdateInformation(connectorId, _identity.CompanyId))
             .Returns(data);
@@ -945,7 +945,7 @@ public async Task UpdateConnectorUrl_WithCompanyBpnNotSet_ThrowsConflictExceptio
         A.CallTo(() => _connectorsRepository.GetConnectorUpdateInformation(connectorId, _identity.CompanyId))
             .Returns(data);
         A.CallTo(() => _userRepository.GetCompanyBpnForIamUserAsync(_identity.IdentityId))
-            .Returns((string?)null);
+            .Returns<string?>(null);
 
         // Act
         async Task Act() => await _logic.UpdateConnectorUrl(connectorId, new ConnectorUpdateRequest("https://new.de")).ConfigureAwait(false);
@@ -1090,7 +1090,7 @@ public async Task GetCompanyConnectorData_WithNotExisting_ThrowsNotFoundExceptio
         // Arrange
         var connectorId = Guid.NewGuid();
         A.CallTo(() => _connectorsRepository.GetConnectorByIdForCompany(connectorId, _identity.CompanyId))
-            .Returns(new ValueTuple<ConnectorData, bool>());
+            .Returns<(ConnectorData, bool)>(default);
 
         // Act
         async Task Act() => await _logic.GetCompanyConnectorData(connectorId).ConfigureAwait(false);
@@ -1158,7 +1158,7 @@ private void SetupRepositoryMethods()
         A.CallTo(() => _connectorsRepository.GetConnectorInformationByIdForIamUser(ExistingConnectorId, _identity.CompanyId))
             .Returns((_fixture.Create<ConnectorInformationData>(), true));
         A.CallTo(() => _connectorsRepository.GetConnectorInformationByIdForIamUser(A<Guid>.That.Not.Matches(x => x == ExistingConnectorId), _identity.CompanyId))
-            .Returns(((ConnectorInformationData, bool))default);
+            .Returns<(ConnectorInformationData, bool)>(default);
         A.CallTo(() => _connectorsRepository.GetConnectorInformationByIdForIamUser(ExistingConnectorId, A<Guid>.That.Not.Matches(x => x == _identity.CompanyId)))
             .Returns((_fixture.Create<ConnectorInformationData>(), false));
 
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/DocumentsBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/DocumentsBusinessLogicTests.cs
index e40189cfee..d41f9a51bd 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/DocumentsBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/DocumentsBusinessLogicTests.cs
@@ -172,7 +172,7 @@ public async Task GetSelfDescriptionDocumentAsync_WithValidData_ReturnsExpected(
         // Arrange
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentDataByIdAndTypeAsync(ValidDocumentId, DocumentTypeId.SELF_DESCRIPTION))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, MediaTypeId>(content, "test.json", MediaTypeId.JSON));
+            .Returns((content, "test.json", MediaTypeId.JSON));
         var sut = new DocumentsBusinessLogic(_portalRepositories, _identityService, _options);
 
         // Act
@@ -189,9 +189,8 @@ public async Task GetSelfDescriptionDocumentAsync_WithNotExistingDocument_Throws
     {
         // Arrange
         var documentId = Guid.NewGuid();
-        var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentDataByIdAndTypeAsync(documentId, DocumentTypeId.SELF_DESCRIPTION))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, MediaTypeId>());
+            .Returns<(byte[], string, MediaTypeId)>(default);
         var sut = new DocumentsBusinessLogic(_portalRepositories, _identityService, _options);
 
         // Act
@@ -211,7 +210,7 @@ public async Task GetFrameDocumentAsync_ReturnsExpectedResult()
         var documentId = Guid.NewGuid();
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentAsync(documentId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, bool, MediaTypeId>(content, "test.json", true, MediaTypeId.JSON));
+            .Returns((content, "test.json", true, MediaTypeId.JSON));
         var sut = new DocumentsBusinessLogic(_portalRepositories, _identityService, _options);
 
         //Act
@@ -230,7 +229,7 @@ public async Task GetFrameDocumentAsync_WithInvalidDocumentTypeId_ThrowsNotFound
         var documentId = Guid.NewGuid();
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentAsync(documentId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, bool, MediaTypeId>(content, "test.json", false, MediaTypeId.JSON));
+            .Returns((content, "test.json", false, MediaTypeId.JSON));
         var sut = new DocumentsBusinessLogic(_portalRepositories, _identityService, _options);
 
         //Act
@@ -247,7 +246,7 @@ public async Task GetFrameDocumentAsync_WithInvalidDocumentId_ThrowsNotFoundExce
         // Arrange
         var documentId = Guid.NewGuid();
         A.CallTo(() => _documentRepository.GetDocumentAsync(documentId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, bool, MediaTypeId>());
+            .Returns<(byte[], string, bool, MediaTypeId)>(default);
         var sut = new DocumentsBusinessLogic(_portalRepositories, _identityService, _options);
 
         //Act
@@ -265,18 +264,18 @@ private void SetupFakesForGetSeedData()
         A.CallTo(() => _documentRepository.GetDocumentSeedDataByIdAsync(A<Guid>.That.Matches(x => x == ValidDocumentId)))
             .Returns(_fixture.Create<DocumentSeedData>());
         A.CallTo(() => _documentRepository.GetDocumentSeedDataByIdAsync(A<Guid>.That.Not.Matches(x => x == ValidDocumentId)))
-            .Returns((DocumentSeedData?)null);
+            .Returns<DocumentSeedData?>(null);
     }
 
     private void SetupFakesForGetDocument()
     {
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentDataAndIsCompanyUserAsync(ValidDocumentId, _identity.CompanyId))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, MediaTypeId, bool>(content, "test.pdf", MediaTypeId.PDF, true));
+            .Returns((content, "test.pdf", MediaTypeId.PDF, true));
         A.CallTo(() => _documentRepository.GetDocumentDataAndIsCompanyUserAsync(A<Guid>.That.Not.Matches(x => x == ValidDocumentId), _identity.CompanyId))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, MediaTypeId, bool>());
+            .Returns<(byte[]?, string, MediaTypeId, bool)>(default);
         A.CallTo(() => _documentRepository.GetDocumentDataAndIsCompanyUserAsync(ValidDocumentId, A<Guid>.That.Not.Matches(x => x == _identity.CompanyId)))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, MediaTypeId, bool>(content, "test.pdf", MediaTypeId.PDF, false));
+            .Returns((content, "test.pdf", MediaTypeId.PDF, false));
     }
 
     #endregion
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs
index 649f602d86..22f507d308 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs
@@ -234,7 +234,7 @@ public async Task UploadOwnCompanyUsersIdentityProviderLinkDataAsync_EmailChange
 
         SetupFakes(users, lines);
 
-        var changedEmailResult = (string?)null;
+        var changedEmailResult = default(string?);
 
         A.CallTo(() => _userRepository.AttachAndModifyCompanyUser(A<Guid>._, null, A<Action<CompanyUser>>._))
             .Invokes(x =>
@@ -725,7 +725,7 @@ public async Task DeleteCompanyIdentityProviderAsync_WithNotExistingProvider_Thr
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetOwnCompanyIdentityProviderUpdateDataForDelete(A<Guid>._, A<Guid>._))
-            .Returns(default((bool, string?, IdentityProviderTypeId, IEnumerable<(Guid, IEnumerable<string>)>, string)));
+            .Returns<(bool, string?, IdentityProviderTypeId, IEnumerable<(Guid, IEnumerable<string>)>, string)>(default);
 
         // Act
         async Task Act() => await sut.DeleteCompanyIdentityProviderAsync(invalidId).ConfigureAwait(false);
@@ -894,14 +894,14 @@ public async Task DeleteCompanyIdentityProviderAsync_WithManagedIdp_ExecutesExpe
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetOwnCompanyIdentityProviderUpdateDataForDelete(A<Guid>._, A<Guid>._))
-            .Returns((true, "test", IdentityProviderTypeId.MANAGED, Enumerable.Repeat(new ValueTuple<Guid, IEnumerable<string>>(company.Id, Enumerable.Empty<string>()), 1), string.Empty));
+            .Returns((true, "test", IdentityProviderTypeId.MANAGED, Enumerable.Repeat((company.Id, Enumerable.Empty<string>()), 1), string.Empty));
         A.CallTo(() => _provisioningManager.IsCentralIdentityProviderEnabled("test"))
             .Returns(false);
-        A.CallTo(() => _provisioningManager.GetUserByUserName(identity.Id.ToString())).Returns((string?)keycloakUserId);
+        A.CallTo(() => _provisioningManager.GetUserByUserName(identity.Id.ToString())).Returns(keycloakUserId);
         A.CallTo(() => _roleBaseMailService.GetRoleData(_options.Value.DeleteIdpRoles)).Returns(new List<Guid> { role1, role2 });
         A.CallTo(() => _identityProviderRepository.GetManagedIdpLinkedData(identityProviderId, A<IEnumerable<Guid>>.That.Matches(x => x.Count() == 2 && x.Contains(role1) && x.Contains(role2)))).Returns(
-            new ValueTuple<Guid, CompanyStatusId, bool, IEnumerable<(Guid IdentityId, bool IsLinkedCompanyUser, (string? UserMail, string? FirstName, string? LastName) Userdata, bool IsInUserRoles, IEnumerable<Guid> UserRoleIds)>>[] {
-                new (company.Id, CompanyStatusId.ACTIVE, multipleIdps, Enumerable.Repeat((identity.Id, true, new ValueTuple<string?, string?, string?>("test@example.org", "Test", "User"), true, userRoleIds), 1))
+            new (Guid, CompanyStatusId, bool, IEnumerable<(Guid IdentityId, bool IsLinkedCompanyUser, (string? UserMail, string? FirstName, string? LastName) Userdata, bool IsInUserRoles, IEnumerable<Guid> UserRoleIds)>)[] {
+                new (company.Id, CompanyStatusId.ACTIVE, multipleIdps, Enumerable.Repeat<(Guid, bool, (string?, string?, string?), bool, IEnumerable<Guid>)>((identity.Id, true, ("test@example.org", "Test", "User"), true, userRoleIds), 1))
             }.ToAsyncEnumerable());
         A.CallTo(() => _companyRepository.AttachAndModifyCompany(company.Id, A<Action<Company>>._, A<Action<Company>>._))
             .Invokes((Guid _, Action<Company>? initialize, Action<Company> modify) =>
@@ -909,7 +909,7 @@ public async Task DeleteCompanyIdentityProviderAsync_WithManagedIdp_ExecutesExpe
                 initialize?.Invoke(company);
                 modify(company);
             });
-        A.CallTo(() => _userRepository.AttachAndModifyIdentities(A<IEnumerable<ValueTuple<Guid, Action<Identity>?, Action<Identity>>>>._))
+        A.CallTo(() => _userRepository.AttachAndModifyIdentities(A<IEnumerable<(Guid, Action<Identity>?, Action<Identity>)>>._))
             .Invokes((IEnumerable<(Guid IdentityId, Action<Identity>? Initialize, Action<Identity> Modify)> identityData) =>
             {
                 var initial = identityData.Select(x => (Identity: identity, x.Initialize, x.Modify)).ToList();
@@ -963,10 +963,10 @@ public async Task GetOwnCompanyIdentityProvidersAsync_WithValidId_ReturnsExpecte
             _logger);
         var oidcGuid = Guid.NewGuid();
         var samlGuid = Guid.NewGuid();
-        var oidc = (oidcGuid, IdentityProviderCategoryId.KEYCLOAK_OIDC, (string?)"oidc-alias", IdentityProviderTypeId.OWN, "http://metadata");
-        var saml = (samlGuid, IdentityProviderCategoryId.KEYCLOAK_SAML, (string?)"saml-alias", IdentityProviderTypeId.OWN, (string?)null);
+        var oidc = (oidcGuid, IdentityProviderCategoryId.KEYCLOAK_OIDC, "oidc-alias", IdentityProviderTypeId.OWN, "http://metadata");
+        var saml = (samlGuid, IdentityProviderCategoryId.KEYCLOAK_SAML, "saml-alias", IdentityProviderTypeId.OWN, default(string?));
         A.CallTo(() => _identityProviderRepository.GetCompanyIdentityProviderCategoryDataUntracked(A<Guid>._))
-            .Returns(new[] { oidc, saml }.ToAsyncEnumerable());
+            .Returns(new (Guid, IdentityProviderCategoryId, string?, IdentityProviderTypeId, string?)[] { oidc, saml }.ToAsyncEnumerable());
         A.CallTo(() => _provisioningManager.GetCentralIdentityProviderDataOIDCAsync("oidc-alias"))
             .Returns(_fixture.Build<IdentityProviderConfigOidc>().With(x => x.Enabled, true).With(x => x.DisplayName, "dis-oidc").Create());
         A.CallTo(() => _provisioningManager.GetIdentityProviderMappers("oidc-alias"))
@@ -1109,7 +1109,7 @@ public async Task GetOwnCompanyIdentityProviderAsync_WithValidOidc_CallsExpected
             x.TokenUrl == details.TokenUrl &&
             x.LogoutUrl == details.LogoutUrl &&
             x.ClientId == details.ClientId &&
-            x.HasClientSecret == true &&
+            x.HasClientSecret &&
             x.ClientAuthMethod == details.ClientAuthMethod &&
             x.SignatureAlgorithm == details.SignatureAlgorithm);
     }
@@ -1191,7 +1191,7 @@ public async Task SetOwnCompanyIdentityProviderStatusAsync_WithDifferentCompany_
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetOwnCompanyIdentityProviderStatusUpdateData(A<Guid>._, A<Guid>._, A<bool>._))
-            .Returns(default((bool, (string?, IdentityProviderCategoryId, IdentityProviderTypeId, string?), IEnumerable<(Guid, IEnumerable<string>)>, bool, string)));
+            .Returns<(bool, (string?, IdentityProviderCategoryId, IdentityProviderTypeId, string?), IEnumerable<(Guid, IEnumerable<string>)>?, bool, string)>(default);
 
         // Act
         async Task Act() => await sut.SetOwnCompanyIdentityProviderStatusAsync(identityProviderId, false).ConfigureAwait(false);
@@ -1486,7 +1486,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_WithInvalidDisplayName_T
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetOwnCompanyIdentityProviderUpdateData(A<Guid>._, A<Guid>._))
-            .Returns(default((bool, string?, IdentityProviderCategoryId, IdentityProviderTypeId, string?)));
+            .Returns<(bool, string?, IdentityProviderCategoryId, IdentityProviderTypeId, string?)>(default);
 
         // Act
         async Task Act() => await sut.UpdateOwnCompanyIdentityProviderAsync(identityProviderId, data, CancellationToken.None).ConfigureAwait(false);
@@ -1514,7 +1514,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_WithNotExistingIdp_Throw
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetOwnCompanyIdentityProviderUpdateData(A<Guid>._, A<Guid>._))
-            .Returns(default((bool, string?, IdentityProviderCategoryId, IdentityProviderTypeId, string?)));
+            .Returns<(bool, string?, IdentityProviderCategoryId, IdentityProviderTypeId, string?)>(default);
 
         // Act
         async Task Act() => await sut.UpdateOwnCompanyIdentityProviderAsync(identityProviderId, data, CancellationToken.None).ConfigureAwait(false);
@@ -1558,7 +1558,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_ForOidcWithOidcNull_Thro
         // Arrange
         var identityProviderId = Guid.NewGuid();
         var data = _fixture.Build<IdentityProviderEditableDetails>()
-            .With(x => x.Oidc, (IdentityProviderEditableDetailsOidc?)null)
+            .With(x => x.Oidc, default(IdentityProviderEditableDetailsOidc?))
             .With(x => x.DisplayName, "new-display-name")
             .Create();
         var sut = new IdentityProviderBusinessLogic(
@@ -1618,7 +1618,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_WithValidOidc_CallsExpec
         var identityProviderId = Guid.NewGuid();
         var data = _fixture.Build<IdentityProviderEditableDetails>()
             .With(x => x.Oidc, _fixture.Build<IdentityProviderEditableDetailsOidc>().With(x => x.Secret, "test").With(x => x.MetadataUrl, "http://new").Create())
-            .With(x => x.Saml, (IdentityProviderEditableDetailsSaml?)null)
+            .With(x => x.Saml, default(IdentityProviderEditableDetailsSaml?))
             .With(x => x.DisplayName, "new-display-name")
             .Create();
         var sut = new IdentityProviderBusinessLogic(
@@ -1671,7 +1671,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_ForSamlWithSamlNull_Thro
         // Arrange
         var identityProviderId = Guid.NewGuid();
         var data = _fixture.Build<IdentityProviderEditableDetails>()
-            .With(x => x.Saml, (IdentityProviderEditableDetailsSaml?)null)
+            .With(x => x.Saml, default(IdentityProviderEditableDetailsSaml?))
             .With(x => x.DisplayName, "new-display-name")
             .Create();
         var sut = new IdentityProviderBusinessLogic(
@@ -1730,7 +1730,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_WithValidSaml_CallsExpec
         // Arrange
         var identityProviderId = Guid.NewGuid();
         var data = _fixture.Build<IdentityProviderEditableDetails>()
-            .With(x => x.Oidc, (IdentityProviderEditableDetailsOidc?)null)
+            .With(x => x.Oidc, default(IdentityProviderEditableDetailsOidc?))
             .With(x => x.Saml, _fixture.Build<IdentityProviderEditableDetailsSaml>().With(x => x.SingleSignOnServiceUrl, "https://sso.com").Create())
             .With(x => x.DisplayName, "new-display-name")
             .Create();
@@ -1796,7 +1796,7 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_ForSharedWithSamlNotNull
         // Arrange
         var identityProviderId = Guid.NewGuid();
         var data = _fixture.Build<IdentityProviderEditableDetails>()
-            .With(x => x.Oidc, (IdentityProviderEditableDetailsOidc?)null)
+            .With(x => x.Oidc, default(IdentityProviderEditableDetailsOidc?))
             .With(x => x.Saml, _fixture.Create<IdentityProviderEditableDetailsSaml>())
             .With(x => x.DisplayName, "new-display-name")
             .Create();
@@ -1827,8 +1827,8 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_WithValidShared_CallsExp
         var identityProviderId = Guid.NewGuid();
         var data = _fixture.Build<IdentityProviderEditableDetails>()
             .With(x => x.DisplayName, "dis-shared")
-            .With(x => x.Oidc, (IdentityProviderEditableDetailsOidc?)null)
-            .With(x => x.Saml, (IdentityProviderEditableDetailsSaml?)null)
+            .With(x => x.Oidc, default(IdentityProviderEditableDetailsOidc?))
+            .With(x => x.Saml, default(IdentityProviderEditableDetailsSaml?))
             .Create();
         var sut = new IdentityProviderBusinessLogic(
             _portalRepositories,
@@ -1859,194 +1859,6 @@ public async Task UpdateOwnCompanyIdentityProviderAsync_WithValidShared_CallsExp
 
     #endregion
 
-    #region CreateOwnCompanyUserIdentityProviderLinkDataAsync
-
-    [Fact]
-    public async Task CreateOwnCompanyUserIdentityProviderLinkDataAsync_WithoutIamUserId_ThrowsNotFoundException()
-    {
-        // Arrange
-        var identityProviderId = Guid.NewGuid();
-        var companyUserId = Guid.NewGuid();
-        var data = _fixture.Build<UserIdentityProviderLinkData>()
-            .With(x => x.identityProviderId, identityProviderId)
-            .Create();
-        var sut = new IdentityProviderBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            _errorMessageService,
-            _roleBaseMailService,
-            _mailingService,
-            _options,
-            _logger);
-        A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns(((bool, string?, bool))default);
-
-        // Act
-        async Task Act() => await sut.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, data).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<NotFoundException>(Act);
-        ex.Message.Should().Be($"companyUserId {companyUserId} does not exist");
-    }
-
-    [Fact]
-    public async Task CreateOwnCompanyUserIdentityProviderLinkDataAsync_WithoutIamUserId_ThrowsUnexpectedConditionException()
-    {
-        // Arrange
-        var identityProviderId = Guid.NewGuid();
-        var companyUserId = Guid.NewGuid();
-        var data = _fixture.Build<UserIdentityProviderLinkData>()
-            .With(x => x.identityProviderId, identityProviderId)
-            .Create();
-        var sut = new IdentityProviderBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            _errorMessageService,
-            _roleBaseMailService,
-            _mailingService,
-            _options,
-            _logger);
-        A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns((true, "cl1", true));
-        A.CallTo(() => _provisioningManager.GetUserByUserName(companyUserId.ToString()))
-            .Returns((string?)null);
-
-        // Act
-        async Task Act() => await sut.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, data).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<UnexpectedConditionException>(Act);
-        ex.Message.Should().Be($"companyUserId {companyUserId} is not linked to keycloak");
-    }
-
-    [Fact]
-    public async Task CreateOwnCompanyUserIdentityProviderLinkDataAsync_WithoutAlias_ThrowsNotFoundException()
-    {
-        // Arrange
-        var identityProviderId = Guid.NewGuid();
-        var companyUserId = Guid.NewGuid();
-        var data = _fixture.Build<UserIdentityProviderLinkData>()
-            .With(x => x.identityProviderId, identityProviderId)
-            .Create();
-        var sut = new IdentityProviderBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            _errorMessageService,
-            _roleBaseMailService,
-            _mailingService,
-            _options,
-            _logger);
-        A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns((true, null, false));
-
-        // Act
-        async Task Act() => await sut.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, data).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<NotFoundException>(Act);
-        ex.Message.Should().Be($"identityProvider {identityProviderId} not found in company of user {companyUserId}");
-    }
-
-    [Fact]
-    public async Task CreateOwnCompanyUserIdentityProviderLinkDataAsync_WithoutSameCompany_ThrowsForbiddenException()
-    {
-        // Arrange
-        var identityProviderId = Guid.NewGuid();
-        var companyUserId = Guid.NewGuid();
-        var data = _fixture.Build<UserIdentityProviderLinkData>()
-            .With(x => x.identityProviderId, identityProviderId)
-            .Create();
-        var sut = new IdentityProviderBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            _errorMessageService,
-            _roleBaseMailService,
-            _mailingService,
-            _options,
-            _logger);
-        A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns((true, "cl1", false));
-
-        // Act
-        async Task Act() => await sut.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, data).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<ForbiddenException>(Act);
-        ex.Message.Should().Be($"identityProvider {identityProviderId} is not associated with company {_identity.CompanyId}");
-    }
-
-    [Fact]
-    public async Task CreateOwnCompanyUserIdentityProviderLinkDataAsync_WithKeycloakFailing_ThrowsForbiddenException()
-    {
-        // Arrange
-        var identityProviderId = Guid.NewGuid();
-        var iamUserId = _fixture.Create<string>();
-        var companyUserId = Guid.NewGuid();
-        var data = _fixture.Build<UserIdentityProviderLinkData>()
-            .With(x => x.identityProviderId, identityProviderId)
-            .Create();
-        var sut = new IdentityProviderBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            _errorMessageService,
-            _roleBaseMailService,
-            _mailingService,
-            _options,
-            _logger);
-        A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns((true, "cl1", true));
-        A.CallTo(() => _provisioningManager.GetUserByUserName(companyUserId.ToString())).Returns(iamUserId);
-        A.CallTo(() => _provisioningManager.AddProviderUserLinkToCentralUserAsync(iamUserId, A<IdentityProviderLink>._))
-            .Throws(new KeycloakEntityConflictException("test"));
-
-        // Act
-        async Task Act() => await sut.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, data).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<ConflictException>(Act);
-        ex.Message.Should().Be($"identityProviderLink for identityProvider {identityProviderId} already exists for user {companyUserId}");
-    }
-
-    [Fact]
-    public async Task CreateOwnCompanyUserIdentityProviderLinkDataAsync_WithValid_CallsExpected()
-    {
-        // Arrange
-        var identityProviderId = Guid.NewGuid();
-        var iamUserId = _fixture.Create<string>();
-        var companyUserId = Guid.NewGuid();
-        var data = _fixture.Build<UserIdentityProviderLinkData>()
-            .With(x => x.identityProviderId, identityProviderId)
-            .With(x => x.userName, "test-user")
-            .Create();
-        var sut = new IdentityProviderBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            _errorMessageService,
-            _roleBaseMailService,
-            _mailingService,
-            _options,
-            _logger);
-        A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns((true, "cl1", true));
-        A.CallTo(() => _provisioningManager.GetUserByUserName(companyUserId.ToString())).Returns(iamUserId);
-
-        // Act
-        var result = await sut.CreateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, data).ConfigureAwait(false);
-
-        // Assert
-        A.CallTo(() => _provisioningManager.AddProviderUserLinkToCentralUserAsync(iamUserId, A<IdentityProviderLink>._))
-            .MustHaveHappenedOnceExactly();
-        result.userName.Should().Be("test-user");
-    }
-
-    #endregion
-
     #region CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync
 
     [Fact]
@@ -2068,7 +1880,7 @@ public async Task CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync_With
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns(((bool, string?, bool))default);
+            .Returns<(bool, string?, bool)>(default);
 
         // Act
         async Task Act() => await sut.CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, identityProviderId, data).ConfigureAwait(false);
@@ -2099,7 +1911,7 @@ public async Task CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync_With
         A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
             .Returns((true, "cl1", true));
         A.CallTo(() => _provisioningManager.GetUserByUserName(companyUserId.ToString()))
-            .Returns((string?)null);
+            .Returns<string?>(null);
 
         // Act
         async Task Act() => await sut.CreateOrUpdateOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, identityProviderId, data).ConfigureAwait(false);
@@ -2222,7 +2034,7 @@ public async Task GetOwnCompanyUserIdentityProviderLinkDataAsync_WithoutIamUserI
             _options,
             _logger);
         A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
-            .Returns(((bool, string?, bool))default);
+            .Returns<(bool, string?, bool)>(default);
 
         // Act
         async Task Act() => await sut.GetOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, identityProviderId).ConfigureAwait(false);
@@ -2250,7 +2062,7 @@ public async Task GetOwnCompanyUserIdentityProviderLinkDataAsync_WithoutIamUserI
         A.CallTo(() => _identityProviderRepository.GetIamUserIsOwnCompanyIdentityProviderAliasAsync(companyUserId, identityProviderId, _identity.CompanyId))
             .Returns((true, "cl1", true));
         A.CallTo(() => _provisioningManager.GetUserByUserName(companyUserId.ToString()))
-            .Returns((string?)null);
+            .Returns<string?>(null);
 
         // Act
         async Task Act() => await sut.GetOwnCompanyUserIdentityProviderLinkDataAsync(companyUserId, identityProviderId).ConfigureAwait(false);
@@ -2448,7 +2260,6 @@ public async Task DeleteOwnCompanyUserIdentityProviderDataAsync_WithValid_CallsE
     public async Task GetOwnCompanyUsersIdentityProviderDataAsync_WithoutIdentityProviderIds_ThrowsControllerArgumentException()
     {
         // Arrange
-        var iamUserId = Guid.NewGuid();
         var identityProviderId = Guid.NewGuid();
         var companyUserId = Guid.NewGuid();
         var sut = new IdentityProviderBusinessLogic(
@@ -2682,7 +2493,7 @@ private void SetupCreateOwnCompanyIdentityProvider(IamIdentityProviderProtocol p
         A.CallTo(() => _companyRepository.CheckCompanyAndCompanyRolesAsync(_invalidCompanyId, A<IEnumerable<CompanyRoleId>>._))
             .Returns((true, "test", false));
         A.CallTo(() => _companyRepository.CheckCompanyAndCompanyRolesAsync(A<Guid>.That.Not.Matches(x => x == _identity.CompanyId || x == _invalidCompanyId), A<IEnumerable<CompanyRoleId>>._))
-            .Returns(((bool, string, bool))default);
+            .Returns<(bool, string, bool)>(default);
 
         if (idps != null)
         {
@@ -2762,8 +2573,8 @@ private void SetupFakes(IEnumerable<TestUserData> userData, IEnumerable<string>
 
         A.CallTo(() => _userRepository.GetCompanyUserAssignedIdentityProvider(A<Guid>._, A<Guid>._)).ReturnsLazily(
             (Guid companyUserId, Guid _) => _existingUserId == companyUserId ?
-                new ValueTuple<bool, string, string>(true, _userProviderId, _username) :
-                new ValueTuple<bool, string, string>());
+                (true, _userProviderId, _username) :
+                default((bool, string, string)));
         A.CallTo(() => _identityProviderRepository.GetCompanyIdentityProviderCategoryDataUntracked(A<Guid>.That.Not.IsEqualTo(_companyId))).Returns(
             Enumerable.Empty<(Guid, IdentityProviderCategoryId, string?, IdentityProviderTypeId, string?)>().ToAsyncEnumerable());
         A.CallTo(() => _identityProviderRepository.GetCompanyIdentityProviderCategoryDataUntracked(A<Guid>.That.IsEqualTo(_companyId))).Returns(
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs
index a3edc90b15..9359330e06 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/InvitationBusinessLogicTests.cs
@@ -321,7 +321,7 @@ private void SetupFakes()
         A.CallTo(() => _processLine(A<UserCreationRoleDataIdpInfo>._)).ReturnsLazily(
             (UserCreationRoleDataIdpInfo creationInfo) => _fixture.Build<(Guid CompanyUserId, string UserName, string? Password, Exception? Error)>()
                 .With(x => x.UserName, creationInfo.UserName)
-                .With(x => x.Error, (Exception?)null)
+                .With(x => x.Error, default(Exception?))
                 .Create());
     }
 
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
index a3cf3ce331..8c914e1a65 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
@@ -443,7 +443,7 @@ public async Task HandlePartnerRegistration_WithIdpNotSetAndOnlyOneIdp_CallsExpe
             "5",
             "00001",
             new[] { new CompanyUniqueIdData(UniqueIdentifierId.VAT_ID, "DE123456789") },
-            Enumerable.Range(1, 10).Select(_ => _fixture.Build<UserDetailData>().With(x => x.IdentityProviderId, (Guid?)null).WithEmailPattern(x => x.Email).Create()).ToImmutableArray(),
+            Enumerable.Range(1, 10).Select(_ => _fixture.Build<UserDetailData>().With(x => x.IdentityProviderId, default(Guid?)).WithEmailPattern(x => x.Email).Create()).ToImmutableArray(),
             new[] { CompanyRoleId.APP_PROVIDER, CompanyRoleId.SERVICE_PROVIDER }
         );
         A.CallTo(() => _companyRepository.CreateAddress(A<string>._, A<string>._, A<string>._, A<Action<Address>>._))
@@ -541,14 +541,15 @@ public async Task HandlePartnerRegistration_WithIdpNotSetAndOnlyOneIdp_CallsExpe
 
         A.CallTo(() => _userProvisioningService.GetOrCreateCompanyUser(A<IUserRepository>._, "test-alias", A<UserCreationRoleDataIdpInfo>._, newCompanyId, IdpId, Bpn))
             .MustHaveHappened(10, Times.Exactly);
-        A.CallTo(() => _identityProviderRepository.CreateCompanyIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(newCompanyId, IdpId) })))
+        var idpCreationData = new[] { (newCompanyId, IdpId) };
+        A.CallTo(() => _identityProviderRepository.CreateCompanyIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(idpCreationData)))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _portalRepositories.SaveAsync()).MustHaveHappenedOnceExactly();
     }
 
     [Theory]
     [InlineData(Bpn)]
-    [InlineData((string?)null)]
+    [InlineData(null)]
     public async Task HandlePartnerRegistration_WithValidData_CallsExpected(string? BusinessPartnerNumberl)
     {
         // Arrange
@@ -616,7 +617,7 @@ public async Task HandlePartnerRegistration_WithValidData_CallsExpected(string?
                 processes.Add(process);
                 return process;
             });
-        A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<ValueTuple<ProcessStepTypeId, ProcessStepStatusId, Guid>>>._))
+        A.CallTo(() => _processStepRepository.CreateProcessStepRange(A<IEnumerable<(ProcessStepTypeId, ProcessStepStatusId, Guid)>>._))
             .Invokes((IEnumerable<(ProcessStepTypeId ProcessStepTypeId, ProcessStepStatusId ProcessStepStatusId, Guid ProcessId)> processStepTypeStatus) =>
             {
                 processSteps.AddRange(processStepTypeStatus.Select(x => new ProcessStep(Guid.NewGuid(), x.ProcessStepTypeId, x.ProcessStepStatusId, x.ProcessId, DateTimeOffset.UtcNow)).ToList());
@@ -673,7 +674,8 @@ public async Task HandlePartnerRegistration_WithValidData_CallsExpected(string?
 
         A.CallTo(() => _userProvisioningService.GetOrCreateCompanyUser(A<IUserRepository>._, "test-alias", A<UserCreationRoleDataIdpInfo>._, newCompanyId, IdpId, BusinessPartnerNumberl))
             .MustHaveHappenedOnceExactly();
-        A.CallTo(() => _identityProviderRepository.CreateCompanyIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(newCompanyId, IdpId) })))
+        var idpCreationData = new[] { (newCompanyId, IdpId) };
+        A.CallTo(() => _identityProviderRepository.CreateCompanyIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(idpCreationData)))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _portalRepositories.SaveAsync()).MustHaveHappenedOnceExactly();
     }
@@ -715,9 +717,9 @@ private void SetupRepos()
         A.CallTo(() => _countryRepository.CheckCountryExistsByAlpha2CodeAsync(A<string>.That.Not.Matches(x => x == "XX")))
             .Returns(true);
         A.CallTo(() => _countryRepository.GetCountryAssignedIdentifiers("DE", A<IEnumerable<UniqueIdentifierId>>._))
-            .Returns(new ValueTuple<bool, IEnumerable<UniqueIdentifierId>>(true, new[] { UniqueIdentifierId.VAT_ID, UniqueIdentifierId.LEI_CODE, UniqueIdentifierId.EORI }));
+            .Returns((true, new[] { UniqueIdentifierId.VAT_ID, UniqueIdentifierId.LEI_CODE, UniqueIdentifierId.EORI }));
         A.CallTo(() => _countryRepository.GetCountryAssignedIdentifiers(A<string>.That.Not.Matches(x => x == "DE"), A<IEnumerable<UniqueIdentifierId>>._))
-            .Returns(new ValueTuple<bool, IEnumerable<UniqueIdentifierId>>(false, Enumerable.Empty<UniqueIdentifierId>()));
+            .Returns((false, Enumerable.Empty<UniqueIdentifierId>()));
 
         A.CallTo(() => _companyRepository.GetCompanyNameUntrackedAsync(A<Guid>.That.Matches(x => x == _identity.CompanyId || x == NoIdpCompanyId)))
             .Returns((true, "testCompany"));
@@ -725,19 +727,19 @@ private void SetupRepos()
             .Returns((false, ""));
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(_identity.CompanyId))
-            .Returns((IdpId, (string?)"test-alias"));
+            .Returns((IdpId, "test-alias"));
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(NoAliasIdpCompanyId))
-            .Returns((IdpId, (string?)null));
+            .Returns((IdpId, null));
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(NoIdpCompanyId))
-            .Returns(((Guid, string?))default);
+            .Returns<(Guid, string?)>(default);
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(MultiIdpCompanyId))
             .Throws(new InvalidOperationException("Sequence contains more than one element."));
 
         A.CallTo(() => _identityProviderRepository.GetManagedIdentityProviderAliasDataUntracked(A<Guid>.That.Matches(x => x == _identity.CompanyId || x == NoIdpCompanyId), A<IEnumerable<Guid>>._))
-            .Returns(new[] { (IdpId, (string?)"test-alias") }.ToAsyncEnumerable());
+            .Returns(new (Guid, string?)[] { (IdpId, "test-alias") }.ToAsyncEnumerable());
 
         A.CallTo(() => _userProvisioningService.GetRoleDatas(A<IEnumerable<UserRoleConfig>>._))
             .Returns(new[] { new UserRoleData(UserRoleId, "cl1", "Company Admin") }.ToAsyncEnumerable());
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/PartnerNetworkBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/PartnerNetworkBusinessLogicTests.cs
index 1409fecedf..a269cba28f 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/PartnerNetworkBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/PartnerNetworkBusinessLogicTests.cs
@@ -52,13 +52,13 @@ public async Task GetAllMemberCompaniesBPNAsync_ReturnsExpected()
         var bpnIds = _fixture.CreateMany<string>(3);
         A.CallTo(() => _companyRepository.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>>._))
             .Returns(_fixture.CreateMany<string>(2).ToAsyncEnumerable());
+        var uppercaseIds = bpnIds.Select(x => x.ToUpper());
 
         // Act
         var result = await _sut.GetAllMemberCompaniesBPNAsync(bpnIds).ToListAsync().ConfigureAwait(false);
 
         // Assert
         result.Should().NotBeNull().And.HaveCount(2);
-        A.CallTo(() => _companyRepository.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>>.That.IsSameAs(bpnIds))).MustHaveHappenedOnceExactly();
-
+        A.CallTo(() => _companyRepository.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>>.That.IsSameSequenceAs(uppercaseIds))).MustHaveHappenedOnceExactly();
     }
 }
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
index 4b1b5ee461..1597f3589c 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -210,16 +209,16 @@ public async Task GetCompanyWithAddressAsync_WithDefaultRequest_GetsExpectedResu
         // Arrange
         var applicationId = _fixture.Create<Guid>();
         var data = _fixture.Build<CompanyUserRoleWithAddress>()
-            .With(x => x.Shortname, (string?)null)
-            .With(x => x.BusinessPartnerNumber, (string?)null)
-            .With(x => x.City, (string?)null)
-            .With(x => x.StreetName, (string?)null)
-            .With(x => x.CountryAlpha2Code, (string?)null)
-            .With(x => x.Region, (string?)null)
-            .With(x => x.Streetadditional, (string?)null)
-            .With(x => x.Streetnumber, (string?)null)
-            .With(x => x.Zipcode, (string?)null)
-            .With(x => x.CountryDe, (string?)null)
+            .With(x => x.Shortname, default(string?))
+            .With(x => x.BusinessPartnerNumber, default(string?))
+            .With(x => x.City, default(string?))
+            .With(x => x.StreetName, default(string?))
+            .With(x => x.CountryAlpha2Code, default(string?))
+            .With(x => x.Region, default(string?))
+            .With(x => x.Streetadditional, default(string?))
+            .With(x => x.Streetnumber, default(string?))
+            .With(x => x.Zipcode, default(string?))
+            .With(x => x.CountryDe, default(string?))
             .With(x => x.InvitedCompanyUserData, _fixture.CreateMany<Guid>().Select(id => new InvitedCompanyUserData(id, null, null, null)))
             .Create();
         A.CallTo(() => _applicationRepository.GetCompanyUserRoleWithAddressUntrackedAsync(applicationId))
@@ -244,8 +243,8 @@ public async Task GetCompanyWithAddressAsync_WithDefaultRequest_GetsExpectedResu
             r.StreetNumber == "" &&
             r.ZipCode == ""
         );
-        result.InvitedUserData.Should().HaveSameCount(data.InvitedCompanyUserData);
-        result.InvitedUserData.Should().AllSatisfy(u => u.Should().Match<InvitedUserData>(u => u.FirstName == "" && u.LastName == "" && u.Email == ""));
+        result.InvitedUserData.Should().HaveSameCount(data.InvitedCompanyUserData)
+            .And.AllSatisfy(u => u.Should().Match<InvitedUserData>(u => u.FirstName == "" && u.LastName == "" && u.Email == ""));
     }
 
     #endregion
@@ -488,7 +487,7 @@ public async Task DeclineRegistrationVerification_WithApplicationNotFound_Throws
         // Arrange
         var applicationId = Guid.NewGuid();
         A.CallTo(() => _applicationRepository.GetCompanyIdNameForSubmittedApplication(applicationId))
-            .Returns(default((Guid, string, Guid?, IEnumerable<(Guid, string, IdentityProviderTypeId, IEnumerable<Guid>)>, IEnumerable<Guid>)));
+            .Returns<(Guid, string, Guid?, IEnumerable<(Guid, string, IdentityProviderTypeId, IEnumerable<Guid>)>, IEnumerable<Guid>)>(default);
         async Task Act() => await _logic.DeclineRegistrationVerification(applicationId, "test", CancellationToken.None).ConfigureAwait(false);
 
         // Act
@@ -552,9 +551,9 @@ public async Task DeclineRegistrationVerification_WithMultipleIdps_CallsExpected
         A.CallTo(() => _provisioningManager.DeleteSharedIdpRealmAsync("idp3")).MustNotHaveHappened();
         A.CallTo(() => _provisioningManager.DeleteCentralIdentityProviderAsync("idp3")).MustHaveHappenedOnceExactly();
 
-        A.CallTo(() => _userRepository.RemoveCompanyUserAssignedIdentityProviders(A<IEnumerable<ValueTuple<Guid, Guid>>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(user1, sharedIdpId) }))).MustHaveHappenedOnceExactly();
-        A.CallTo(() => _userRepository.RemoveCompanyUserAssignedIdentityProviders(A<IEnumerable<ValueTuple<Guid, Guid>>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(user2, managedIdpId) }))).MustHaveHappenedOnceExactly();
-        A.CallTo(() => _userRepository.RemoveCompanyUserAssignedIdentityProviders(A<IEnumerable<ValueTuple<Guid, Guid>>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(user3, ownIdpId) }))).MustHaveHappenedOnceExactly();
+        A.CallTo(() => _userRepository.RemoveCompanyUserAssignedIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(user1, sharedIdpId) }))).MustHaveHappenedOnceExactly();
+        A.CallTo(() => _userRepository.RemoveCompanyUserAssignedIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(user2, managedIdpId) }))).MustHaveHappenedOnceExactly();
+        A.CallTo(() => _userRepository.RemoveCompanyUserAssignedIdentityProviders(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(new[] { new ValueTuple<Guid, Guid>(user3, ownIdpId) }))).MustHaveHappenedOnceExactly();
     }
 
     #endregion
@@ -567,7 +566,7 @@ public async Task GetChecklistForApplicationAsync_WithNotExistingApplication_Thr
         // Arrange
         var applicationId = _fixture.Create<Guid>();
         A.CallTo(() => _applicationRepository.GetApplicationChecklistData(applicationId, A<IEnumerable<ProcessStepTypeId>>._))
-            .Returns(new ValueTuple<bool, IEnumerable<(ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId, string?)>, IEnumerable<ProcessStepTypeId>>());
+            .Returns<(bool, IEnumerable<(ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId, string?)>, IEnumerable<ProcessStepTypeId>)>(default);
 
         //Act
         async Task Act() => await _logic.GetChecklistForApplicationAsync(applicationId).ConfigureAwait(false);
@@ -582,7 +581,7 @@ public async Task GetChecklistForApplicationAsync_WithValidApplication_ReturnsEx
     {
         // Arrange
         var applicationId = _fixture.Create<Guid>();
-        var list = new ValueTuple<ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId, string?>[]
+        var list = new (ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId, string?)[]
         {
             new(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, ApplicationChecklistEntryStatusId.DONE, null),
             new(ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, ApplicationChecklistEntryStatusId.DONE, null),
@@ -595,7 +594,7 @@ public async Task GetChecklistForApplicationAsync_WithValidApplication_ReturnsEx
             ProcessStepTypeId.RETRIGGER_IDENTITY_WALLET
         };
         A.CallTo(() => _applicationRepository.GetApplicationChecklistData(applicationId, A<IEnumerable<ProcessStepTypeId>>._))
-            .Returns(new ValueTuple<bool, IEnumerable<(ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId, string?)>, IEnumerable<ProcessStepTypeId>>(true, list, processSteps));
+            .Returns((true, list, processSteps));
 
         //Act
         var result = await _logic.GetChecklistForApplicationAsync(applicationId).ConfigureAwait(false);
@@ -652,8 +651,7 @@ public async Task TriggerChecklistAsync_WithValidData_ReturnsExpected(Applicatio
             new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()),
             Guid.NewGuid(),
             typeId,
-            new Dictionary<ApplicationChecklistEntryTypeId, ValueTuple<ApplicationChecklistEntryStatusId, string?>>()
-                .ToImmutableDictionary(),
+            ImmutableDictionary.Create<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>(),
             Enumerable.Empty<ProcessStep>());
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(applicationId,
                 typeId,
@@ -713,7 +711,7 @@ public async Task ProcessClearinghouseSelfDescription_WithNotExistingApplication
         // Arrange
         var data = new SelfDescriptionResponseData(ApplicationId, SelfDescriptionStatus.Confirm, null, "{ \"test\": true }");
         A.CallTo(() => _applicationRepository.GetCompanyIdSubmissionStatusForApplication(ApplicationId))
-            .Returns(((bool, Guid, bool))default);
+            .Returns<(bool, Guid, bool)>(default);
 
         // Act
         async Task Act() => await _logic.ProcessClearinghouseSelfDescription(data, CancellationToken.None).ConfigureAwait(false);
@@ -791,7 +789,7 @@ public async Task GetDocumentAsync_WithValidData_ReturnsExpected()
         var documentId = Guid.NewGuid();
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentByIdAsync(documentId))
-            .ReturnsLazily(() => new Document(documentId, content, content, "test.pdf", MediaTypeId.JSON, DateTimeOffset.UtcNow, DocumentStatusId.LOCKED, DocumentTypeId.APP_CONTRACT));
+            .Returns(new Document(documentId, content, content, "test.pdf", MediaTypeId.JSON, DateTimeOffset.UtcNow, DocumentStatusId.LOCKED, DocumentTypeId.APP_CONTRACT));
 
         // Act
         var result = await _logic.GetDocumentAsync(documentId).ConfigureAwait(false);
@@ -807,7 +805,7 @@ public async Task GetDocumentAsync_WithNotExistingDocument_ThrowsNotFoundExcepti
         // Arrange
         var documentId = Guid.NewGuid();
         A.CallTo(() => _documentRepository.GetDocumentByIdAsync(documentId))
-            .ReturnsLazily(() => (Document?)null);
+            .Returns<Document?>(null);
 
         // Act
         async Task Act() => await _logic.GetDocumentAsync(documentId).ConfigureAwait(false);
@@ -833,37 +831,36 @@ private void SetupForUpdateCompanyBpn(ApplicationChecklistEntry? applicationChec
         }
 
         A.CallTo(() => _userRepository.GetBpnForIamUserUntrackedAsync(IdWithoutBpn, ValidBpn))
-            .ReturnsLazily(() => new (bool, bool, string?, Guid)[]
+            .Returns(new (bool, bool, string?, Guid)[]
             {
                 new (true, true, null, CompanyId)
             }.ToAsyncEnumerable());
         A.CallTo(() => _userRepository.GetBpnForIamUserUntrackedAsync(NotExistingApplicationId, ValidBpn))
-            .ReturnsLazily(() => new (bool, bool, string?, Guid)[]
+            .Returns(new (bool, bool, string?, Guid)[]
             {
                 new (false, true, ValidBpn, CompanyId)
             }.ToAsyncEnumerable());
         A.CallTo(() => _userRepository.GetBpnForIamUserUntrackedAsync(IdWithoutBpn, AlreadyTakenBpn))
-            .ReturnsLazily(() => new (bool, bool, string?, Guid)[]
+            .Returns(new (bool, bool, string?, Guid)[]
             {
                 new (true, true, ValidBpn, CompanyId),
                 new (false, true, AlreadyTakenBpn, Guid.NewGuid())
             }.ToAsyncEnumerable());
         A.CallTo(() => _userRepository.GetBpnForIamUserUntrackedAsync(ActiveApplicationCompanyId, ValidBpn))
-            .ReturnsLazily(() => new (bool, bool, string?, Guid)[]
+            .Returns(new (bool, bool, string?, Guid)[]
             {
-                new (true, false, ValidBpn, CompanyId)
+                (true, false, ValidBpn, CompanyId)
             }.ToAsyncEnumerable());
         A.CallTo(() => _userRepository.GetBpnForIamUserUntrackedAsync(IdWithBpn, ValidBpn))
-            .ReturnsLazily(() => new (bool, bool, string?, Guid)[]
+            .Returns(new (bool, bool, string?, Guid)[]
             {
-                new (true, true, ValidBpn, CompanyId)
+                (true, true, ValidBpn, CompanyId)
             }.ToAsyncEnumerable());
 
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithoutBpn, ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .ReturnsLazily(() => new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>
-            {
-                { ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new ValueTuple<ApplicationChecklistEntryStatusId, string?>(ApplicationChecklistEntryStatusId.DONE, null) }
-            }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, (ApplicationChecklistEntryStatusId.DONE, default(string?))) }),
+            Enumerable.Empty<ProcessStep>()));
     }
 
     private void SetupForApproveRegistrationVerification(ApplicationChecklistEntry applicationChecklistEntry)
@@ -875,15 +872,13 @@ private void SetupForApproveRegistrationVerification(ApplicationChecklistEntry a
             });
 
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithoutBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .ReturnsLazily(() => new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>
-            {
-                { ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, new ValueTuple<ApplicationChecklistEntryStatusId, string?>(ApplicationChecklistEntryStatusId.IN_PROGRESS, null) }
-            }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, (ApplicationChecklistEntryStatusId.IN_PROGRESS, default(string?))) }),
+            Enumerable.Empty<ProcessStep>()));
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .ReturnsLazily(() => new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>
-            {
-                { ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, new ValueTuple<ApplicationChecklistEntryStatusId, string?>(ApplicationChecklistEntryStatusId.DONE, null) }
-            }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, (ApplicationChecklistEntryStatusId.DONE, default(string?))) }),
+            Enumerable.Empty<ProcessStep>()));
     }
 
     private void SetupForDeclineRegistrationVerification(ApplicationChecklistEntry applicationChecklistEntry, CompanyApplication application, Company company, ApplicationChecklistEntryStatusId checklistStatusId, IdentityProviderTypeId idpTypeId)
@@ -895,15 +890,13 @@ private void SetupForDeclineRegistrationVerification(ApplicationChecklistEntry a
             });
 
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithoutBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .ReturnsLazily(() => new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>
-            {
-                { ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new ValueTuple<ApplicationChecklistEntryStatusId, string?>(checklistStatusId, null) }
-            }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, (checklistStatusId, default(string?))) }),
+            Enumerable.Empty<ProcessStep>()));
         A.CallTo(() => _checklistService.VerifyChecklistEntryAndProcessSteps(IdWithBpn, ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, A<IEnumerable<ApplicationChecklistEntryStatusId>>._, A<ProcessStepTypeId>._, A<IEnumerable<ApplicationChecklistEntryTypeId>?>._, A<IEnumerable<ProcessStepTypeId>?>._))
-            .ReturnsLazily(() => new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new Dictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>
-            {
-                { ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, new ValueTuple<ApplicationChecklistEntryStatusId, string?>(ApplicationChecklistEntryStatusId.DONE, null) }
-            }.ToImmutableDictionary(), Enumerable.Empty<ProcessStep>()));
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(IdWithoutBpn, new Process(Guid.NewGuid(), ProcessTypeId.APPLICATION_CHECKLIST, Guid.NewGuid()), Guid.NewGuid(), ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION,
+            ImmutableDictionary.CreateRange(new[] { KeyValuePair.Create(ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, (ApplicationChecklistEntryStatusId.DONE, default(string?))) }),
+            Enumerable.Empty<ProcessStep>()));
 
         A.CallTo(() => _applicationRepository.GetCompanyIdNameForSubmittedApplication(IdWithBpn))
             .Returns((CompanyId, CompanyName, ExistingExternalId, Enumerable.Repeat((IdpId, IamAliasId, idpTypeId, Enumerable.Repeat(UserId, 1)), 1), Enumerable.Repeat(UserId, 1)));
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs
index d89b681bf1..8767873e47 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs
@@ -20,6 +20,8 @@
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Encryption;
 using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
@@ -27,6 +29,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities;
+using System.Security.Cryptography;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.BusinessLogic;
 
@@ -36,10 +39,13 @@ public class RegistrationStatusBusinessLogicTest
 
     private readonly IPortalRepositories _portalRepositories;
     private readonly ICompanyRepository _companyRepository;
+    private readonly OnboardingServiceProviderSettings _options;
     private readonly IRegistrationStatusBusinessLogic _logic;
 
+    private readonly IFixture _fixture;
     public RegistrationStatusBusinessLogicTest()
     {
+        _fixture = new Fixture();
         _identity = A.Fake<IIdentityData>();
         var identityService = A.Fake<IIdentityService>();
         A.CallTo(() => _identity.IdentityId).Returns(Guid.NewGuid());
@@ -52,11 +58,16 @@ public RegistrationStatusBusinessLogicTest()
 
         A.CallTo(() => _portalRepositories.GetInstance<ICompanyRepository>()).Returns(_companyRepository);
 
-        var options = new OnboardingServiceProviderSettings
+        _options = new OnboardingServiceProviderSettings
         {
-            EncryptionKey = "mysmallkey1234551298765134567890"
+            EncryptionConfigs = new EncryptionModeConfig[]
+            {
+                new() { Index=0, EncryptionKey=Convert.ToHexString(_fixture.CreateMany<byte>(32).ToArray()), CipherMode=CipherMode.ECB, PaddingMode=PaddingMode.PKCS7 },
+                new() { Index=1, EncryptionKey=Convert.ToHexString(_fixture.CreateMany<byte>(32).ToArray()), CipherMode=CipherMode.CBC, PaddingMode=PaddingMode.PKCS7 },
+            },
+            EncrptionConfigIndex = 1
         };
-        _logic = new RegistrationStatusBusinessLogic(_portalRepositories, identityService, Options.Create(options));
+        _logic = new RegistrationStatusBusinessLogic(_portalRepositories, identityService, Options.Create(_options));
     }
 
     #region GetCallbackAddress
@@ -98,7 +109,7 @@ public async Task SetCallbackAddress_WithCompanyNotOsp_ReturnsExpectedCallbackUr
     {
         //Arrange
         A.CallTo(() => _companyRepository.GetCallbackEditData(A<Guid>._, A<CompanyRoleId>._))
-            .Returns(((bool, OspDetails?))default);
+            .Returns<(bool, OspDetails?)>(default);
 
         //Act
         async Task Act() => await _logic.SetCallbackAddress(new OnboardingServiceProviderCallbackRequestData("https://test.de", "https//auth.url", "test", "Sup3rS3cureTest!")).ConfigureAwait(false);
@@ -122,7 +133,7 @@ public async Task SetCallbackAddress_WithNonExistingOspData_InsertExpected()
         //Assert
         A.CallTo(() => _companyRepository.GetCallbackEditData(_identity.CompanyId, CompanyRoleId.ONBOARDING_SERVICE_PROVIDER))
             .MustHaveHappenedOnceExactly();
-        A.CallTo(() => _companyRepository.CreateOnboardingServiceProviderDetails(_identity.CompanyId, "https://test.de", "https://auth.url", "test", A<byte[]>._))
+        A.CallTo(() => _companyRepository.CreateOnboardingServiceProviderDetails(_identity.CompanyId, "https://test.de", "https://auth.url", "test", A<byte[]>._, A<byte[]>._, A<int>._))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _portalRepositories.SaveAsync())
             .MustHaveHappenedOnceExactly();
@@ -132,28 +143,52 @@ public async Task SetCallbackAddress_WithNonExistingOspData_InsertExpected()
     public async Task SetCallbackAddress_WithOspData_UpdatesEntry()
     {
         //Arrange
-        OnboardingServiceProviderDetail? osp = null;
+        OnboardingServiceProviderDetail? initial = null;
+        OnboardingServiceProviderDetail? updated = null;
+        var oldsecret = _fixture.CreateMany<byte>(32).ToArray();
+        var clientSecret = _fixture.Create<string>();
         A.CallTo(() => _companyRepository.GetCallbackEditData(A<Guid>._, A<CompanyRoleId>._))
-            .Returns((true, new OspDetails("https://test-old.de", "https://auth.url", "test", "test123"u8.ToArray())));
+            .Returns((true, new OspDetails("https://test-old.de", "https://auth.url", "test", oldsecret, null, 0)));
         A.CallTo(() => _companyRepository.AttachAndModifyOnboardingServiceProvider(A<Guid>._, A<Action<OnboardingServiceProviderDetail>>._, A<Action<OnboardingServiceProviderDetail>>._))
             .Invokes((Guid companyId, Action<OnboardingServiceProviderDetail>? initialize, Action<OnboardingServiceProviderDetail> setOptionalFields) =>
             {
-                osp = new OnboardingServiceProviderDetail(companyId, null!, null!, null!, null!);
-                initialize?.Invoke(osp);
-                setOptionalFields.Invoke(osp);
+                initial = new OnboardingServiceProviderDetail(companyId, null!, null!, null!, null!, null, default);
+                updated = new OnboardingServiceProviderDetail(companyId, null!, null!, null!, null!, null, default);
+                initialize?.Invoke(initial);
+                setOptionalFields.Invoke(updated);
             });
 
         //Act
-        await _logic.SetCallbackAddress(new OnboardingServiceProviderCallbackRequestData("https://test-new.de", "https//auth.url", "test", "Sup3rS3cureTest!")).ConfigureAwait(false);
+        await _logic.SetCallbackAddress(new OnboardingServiceProviderCallbackRequestData("https://test-new.de", "https//auth.url", "test", clientSecret)).ConfigureAwait(false);
+
+        updated.Should().NotBeNull();
 
         //Assert
-        osp.Should().NotBeNull().And.Match<OnboardingServiceProviderDetail>(x =>
+        initial.Should().NotBeNull().And.Match<OnboardingServiceProviderDetail>(x =>
+            x.CompanyId == _identity.CompanyId &&
+            x.CallbackUrl == "https://test-old.de" &&
+            x.ClientSecret.SequenceEqual(oldsecret) &&
+            x.EncryptionMode == 0);
+        updated.Should().NotBeNull().And.Match<OnboardingServiceProviderDetail>(x =>
             x.CompanyId == _identity.CompanyId &&
-            x.CallbackUrl == "https://test-new.de");
+            x.CallbackUrl == "https://test-new.de" &&
+            x.EncryptionMode == 1);
         A.CallTo(() => _companyRepository.GetCallbackEditData(_identity.CompanyId, CompanyRoleId.ONBOARDING_SERVICE_PROVIDER))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _portalRepositories.SaveAsync())
             .MustHaveHappenedOnceExactly();
+
+        var cryptoConfig = _options.EncryptionConfigs.ElementAtOrDefault(_options.EncrptionConfigIndex);
+        cryptoConfig.Should().NotBeNull()
+            .And.Match<EncryptionModeConfig>(x =>
+                x.Index == 1 &&
+                x.CipherMode == CipherMode.CBC &&
+                x.PaddingMode == PaddingMode.PKCS7
+            );
+
+        var result = CryptoHelper.Decrypt(updated!.ClientSecret, updated.InitializationVector, Convert.FromHexString(cryptoConfig!.EncryptionKey), cryptoConfig.CipherMode, cryptoConfig.PaddingMode);
+
+        result.Should().Be(clientSecret);
     }
 
     #endregion
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountBusinessLogicTests.cs
index e8be2613f1..6909f5e1e8 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/ServiceAccountBusinessLogicTests.cs
@@ -352,7 +352,7 @@ public async Task UpdateOwnCompanyServiceAccountDetailsAsync_WithNotExistingServ
         SetupUpdateOwnCompanyServiceAccountDetails();
         var invalidServiceAccountId = Guid.NewGuid();
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamClientIdAsync(invalidServiceAccountId, ValidCompanyId))
-            .Returns((CompanyServiceAccountWithRoleDataClientId?)null);
+            .Returns<CompanyServiceAccountWithRoleDataClientId?>(null);
         var data = new ServiceAccountEditableDetails(invalidServiceAccountId, "new name", "changed description", IamClientAuthMethod.SECRET);
         var sut = new ServiceAccountBusinessLogic(_provisioningManager, _portalRepositories, _options, null!, _identityService);
 
@@ -397,7 +397,7 @@ public async Task GetOwnCompanyServiceAccountsDataAsync_GetsExpectedData(UserSta
         // Arrange
         var data = _fixture.CreateMany<CompanyServiceAccountData>(15);
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountsUntracked(ValidCompanyId, null, null, userStatusId))
-            .Returns((int skip, int take) => Task.FromResult((Pagination.Source<CompanyServiceAccountData>?)new Pagination.Source<CompanyServiceAccountData>(data.Count(), data.Skip(skip).Take(take))));
+            .Returns((int skip, int take) => Task.FromResult<Pagination.Source<CompanyServiceAccountData>?>(new(data.Count(), data.Skip(skip).Take(take))));
 
         A.CallTo(() => _portalRepositories.GetInstance<IServiceAccountRepository>()).Returns(_serviceAccountRepository);
         var sut = new ServiceAccountBusinessLogic(_provisioningManager, _portalRepositories, _options, null!, _identityService);
@@ -497,7 +497,8 @@ public async Task DeleteOwnCompanyServiceAccountAsync_WithoutClient_CallsExpecte
         }
 
         identity.UserStatusId.Should().Be(UserStatusId.INACTIVE);
-        A.CallTo(() => _userRolesRepository.DeleteCompanyUserAssignedRoles(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(_userRoleIds.Select(userRoleId => new ValueTuple<Guid, Guid>(ValidServiceAccountId, userRoleId))))).MustHaveHappenedOnceExactly();
+        var validServiceAccountUserRoleIds = _userRoleIds.Select(userRoleId => (ValidServiceAccountId, userRoleId));
+        A.CallTo(() => _userRolesRepository.DeleteCompanyUserAssignedRoles(A<IEnumerable<(Guid, Guid)>>.That.IsSameSequenceAs(validServiceAccountUserRoleIds))).MustHaveHappenedOnceExactly();
     }
 
     #endregion
@@ -541,7 +542,7 @@ private void SetupCreateOwnCompanyServiceAccount()
         A.CallTo(() => _companyRepository.GetBpnAndTechnicalUserRoleIds(ValidCompanyId, ClientId))
             .Returns((ValidBpn, new[] { UserRoleId1, UserRoleId2 }));
         A.CallTo(() => _companyRepository.GetBpnAndTechnicalUserRoleIds(A<Guid>.That.Not.Matches(x => x == ValidCompanyId), ClientId))
-            .Returns(((string?, IEnumerable<Guid>))default);
+            .Returns<(string?, IEnumerable<Guid>)>(default);
 
         A.CallTo(() => _serviceAccountCreation.CreateServiceAccountAsync(A<ServiceAccountCreationInfo>._, A<Guid>.That.Matches(x => x == ValidCompanyId), A<IEnumerable<string>>._, CompanyServiceAccountTypeId.OWN, A<bool>._, true, null))
             .Returns((ClientId, new ServiceAccountData(ClientId, Guid.NewGuid().ToString(), new ClientAuthData(IamClientAuthMethod.SECRET)), Guid.NewGuid(), Enumerable.Empty<UserRoleData>()));
@@ -585,7 +586,7 @@ private void SetupUpdateOwnCompanyServiceAccountDetails()
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamClientIdAsync(ValidServiceAccountId, ValidCompanyId))
             .Returns(data);
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamClientIdAsync(ValidServiceAccountId, A<Guid>.That.Not.Matches(x => x == ValidCompanyId)))
-            .Returns((CompanyServiceAccountWithRoleDataClientId?)null);
+            .Returns<CompanyServiceAccountWithRoleDataClientId?>(null);
 
         A.CallTo(() => _provisioningManager.ResetCentralClientAuthDataAsync(A<string>._))
             .Returns(authData);
@@ -601,9 +602,9 @@ private void SetupGetOwnCompanyServiceAccount()
             .Returns(data);
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountDetailedDataUntrackedAsync(
                 A<Guid>.That.Not.Matches(x => x == ValidServiceAccountId), ValidCompanyId))
-            .Returns((CompanyServiceAccountDetailedData?)null);
+            .Returns<CompanyServiceAccountDetailedData?>(null);
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountDetailedDataUntrackedAsync(ValidServiceAccountId, A<Guid>.That.Not.Matches(x => x == ValidCompanyId)))
-            .Returns((CompanyServiceAccountDetailedData?)null);
+            .Returns<CompanyServiceAccountDetailedData?>(null);
     }
 
     private void SetupDeleteOwnCompanyServiceAccount(bool withServiceAccount, bool withClient, Connector? connector = null, Identity? identity = null)
@@ -611,7 +612,7 @@ private void SetupDeleteOwnCompanyServiceAccount(bool withServiceAccount, bool w
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamServiceAccountRolesAsync(ValidServiceAccountId, ValidCompanyId))
             .Returns((_userRoleIds, withServiceAccount ? ValidConnectorId : null, withClient ? ClientId : null, statusId: ConnectorStatusId.INACTIVE, OfferStatusId: OfferSubscriptionStatusId.PENDING));
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamServiceAccountRolesAsync(A<Guid>.That.Not.Matches(x => x == ValidServiceAccountId), A<Guid>._))
-            .Returns(((IEnumerable<Guid>, Guid?, string?, ConnectorStatusId?, OfferSubscriptionStatusId?))default);
+            .Returns<(IEnumerable<Guid>, Guid?, string?, ConnectorStatusId?, OfferSubscriptionStatusId?)>(default);
 
         if (identity != null)
         {
@@ -643,7 +644,7 @@ private void SetupDeleteOwnCompanyServiceAccountForInvalidConnectorStatus()
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamServiceAccountRolesAsync(ValidServiceAccountId, ValidCompanyId))
             .Returns((_userRoleIds, null, null, statusId: ConnectorStatusId.ACTIVE, OfferStatusId: OfferSubscriptionStatusId.PENDING));
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamServiceAccountRolesAsync(A<Guid>.That.Not.Matches(x => x == ValidServiceAccountId), A<Guid>._))
-            .Returns(((IEnumerable<Guid>, Guid?, string?, ConnectorStatusId?, OfferSubscriptionStatusId?))default);
+            .Returns<(IEnumerable<Guid>, Guid?, string?, ConnectorStatusId?, OfferSubscriptionStatusId?)>(default);
 
         A.CallTo(() => _portalRepositories.GetInstance<IServiceAccountRepository>()).Returns(_serviceAccountRepository);
         A.CallTo(() => _portalRepositories.GetInstance<IUserRolesRepository>()).Returns(_userRolesRepository);
@@ -654,7 +655,7 @@ private void SetupDeleteOwnCompanyServiceAccountForValidOfferSubscription()
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamServiceAccountRolesAsync(ValidServiceAccountId, ValidCompanyId))
             .Returns((_userRoleIds, null, null, statusId: ConnectorStatusId.INACTIVE, OfferSubscriptionStatusId.ACTIVE));
         A.CallTo(() => _serviceAccountRepository.GetOwnCompanyServiceAccountWithIamServiceAccountRolesAsync(A<Guid>.That.Not.Matches(x => x == ValidServiceAccountId), A<Guid>._))
-            .Returns(((IEnumerable<Guid>, Guid?, string?, ConnectorStatusId?, OfferSubscriptionStatusId))default);
+            .Returns<(IEnumerable<Guid>, Guid?, string?, ConnectorStatusId?, OfferSubscriptionStatusId?)>(default);
 
         A.CallTo(() => _portalRepositories.GetInstance<IServiceAccountRepository>()).Returns(_serviceAccountRepository);
         A.CallTo(() => _portalRepositories.GetInstance<IUserRolesRepository>()).Returns(_userRolesRepository);
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs
index 51f9f0e471..22bbe798e7 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/SubscriptionConfigurationBusinessLogicTests.cs
@@ -337,7 +337,7 @@ public async Task GetProviderCompanyDetailsAsync_WithInvalidServiceProvider_Thro
         //Arrange
         SetupProviderCompanyDetails();
         A.CallTo(() => _companyRepository.GetProviderCompanyDetailAsync(CompanyRoleId.SERVICE_PROVIDER, ExistingCompanyId))
-            .ReturnsLazily(() => (new ProviderDetailReturnData(Guid.NewGuid(), Guid.NewGuid(), "https://new-test-service.de"), false));
+            .Returns((new ProviderDetailReturnData(Guid.NewGuid(), Guid.NewGuid(), "https://new-test-service.de"), false));
 
         //Act
         async Task Action() => await _sut.GetProviderCompanyDetailsAsync().ConfigureAwait(false);
@@ -357,7 +357,7 @@ private void SetupProviderCompanyDetails()
         A.CallTo(() => _companyRepository.IsValidCompanyRoleOwner(A<Guid>.That.Matches(x => x == NoServiceProviderCompanyId), A<IEnumerable<CompanyRoleId>>._))
             .Returns((true, false));
         A.CallTo(() => _companyRepository.IsValidCompanyRoleOwner(A<Guid>.That.Not.Matches(x => x == ExistingCompanyId || x == NoServiceProviderCompanyId), A<IEnumerable<CompanyRoleId>>._))
-            .Returns(((bool, bool))default);
+            .Returns<(bool, bool)>(default);
 
         A.CallTo(() => _companyRepository.CreateProviderCompanyDetail(A<Guid>._, A<string>._, A<Action<ProviderCompanyDetail>?>._))
             .Invokes((Guid companyId, string dataUrl, Action<ProviderCompanyDetail>? setOptionalParameter) =>
@@ -368,12 +368,12 @@ private void SetupProviderCompanyDetails()
             });
 
         A.CallTo(() => _companyRepository.GetProviderCompanyDetailAsync(A<CompanyRoleId>.That.Matches(x => x == CompanyRoleId.SERVICE_PROVIDER), A<Guid>.That.Matches(x => x == ExistingCompanyId)))
-            .ReturnsLazily(() => (new ProviderDetailReturnData(Guid.NewGuid(), Guid.NewGuid(), "https://new-test-service.de"), true));
+            .Returns((new ProviderDetailReturnData(Guid.NewGuid(), Guid.NewGuid(), "https://new-test-service.de"), true));
         A.CallTo(() => _companyRepository.GetProviderCompanyDetailAsync(A<CompanyRoleId>.That.Matches(x => x == CompanyRoleId.SERVICE_PROVIDER), A<Guid>.That.Not.Matches(x => x == ExistingCompanyId)))
-            .ReturnsLazily(() => ((ProviderDetailReturnData, bool))default);
+            .Returns<(ProviderDetailReturnData, bool)>(default);
 
         A.CallTo(() => _companyRepository.GetProviderCompanyDetailsExistsForUser(A<Guid>.That.Matches(x => x == ExistingCompanyId)))
-            .ReturnsLazily(() => (Guid.NewGuid(), _fixture.Create<string>()));
+            .Returns((Guid.NewGuid(), _fixture.Create<string>()));
         A.CallTo(() => _companyRepository.GetProviderCompanyDetailsExistsForUser(A<Guid>.That.Not.Matches(x => x == ExistingCompanyId)))
             .Returns((Guid.Empty, null!));
     }
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs
index ac510e8b7a..da053f6fee 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs
@@ -174,9 +174,9 @@ public async Task TestUserCreationAllSuccess()
         A.CallTo(() => _mockLogger.Log(A<LogLevel>.That.IsEqualTo(LogLevel.Error), A<Exception?>._, A<string>._)).MustNotHaveHappened();
         A.CallTo(() => _mailingService.SendMails(A<string>._, A<IDictionary<string, string>>._, A<List<string>>._)).MustHaveHappenedANumberOfTimesMatching(times => times == userList.Count());
 
-        result.Should().NotBeNull();
-        result.Should().HaveSameCount(userList);
-        result.Should().Match(r => r.SequenceEqual(userList.Select(u => u.eMail)));
+        result.Should().NotBeNull()
+            .And.HaveSameCount(userList)
+            .And.ContainInOrder(userList.Select(u => u.eMail));
     }
 
     [Fact]
@@ -184,9 +184,9 @@ public async Task TestUserCreation_NoUserNameAndEmail_Throws()
     {
         SetupFakesForUserCreation(true);
 
-        var nullUserName = _fixture.Build<UserCreationInfo>().With(x => x.userName, (string?)null).Create();
-        var nullEmail = _fixture.Build<UserCreationInfo>().With(x => x.eMail, (string?)null).Create();
-        var nullUserNameEmail = _fixture.Build<UserCreationInfo>().With(x => x.eMail, (string?)null).With(x => x.userName, (string?)null).Create();
+        var nullUserName = _fixture.Build<UserCreationInfo>().With(x => x.userName, default(string?)).Create();
+        var nullEmail = _fixture.Build<UserCreationInfo>().With(x => x.eMail, default(string?)).Create();
+        var nullUserNameEmail = _fixture.Build<UserCreationInfo>().With(x => x.eMail, default(string?)).With(x => x.userName, default(string?)).Create();
 
         var userList = new[] {
             CreateUserCreationInfo(),
@@ -221,7 +221,7 @@ public async Task TestUserCreation_NoRoles_Throws()
         SetupFakesForUserCreation(true);
 
         var noRoles = _fixture.Build<UserCreationInfo>().With(x => x.Roles, Enumerable.Empty<string>()).Create();
-        var noRolesNoUserName = _fixture.Build<UserCreationInfo>().With(x => x.Roles, Enumerable.Empty<string>()).With(x => x.userName, (string?)null).Create();
+        var noRolesNoUserName = _fixture.Build<UserCreationInfo>().With(x => x.Roles, Enumerable.Empty<string>()).With(x => x.userName, default(string?)).Create();
 
         var userList = new[] {
             CreateUserCreationInfo(),
@@ -296,7 +296,6 @@ public async Task TestUserCreationCreationError()
         A.CallTo(() => _mockLogger.Log(A<LogLevel>.That.IsEqualTo(LogLevel.Error), A<Exception?>._, A<string>._)).MustHaveHappenedOnceExactly();
         A.CallTo(() => _mailingService.SendMails(A<string>._, A<IDictionary<string, string>>._, A<List<string>>._)).MustHaveHappenedANumberOfTimesMatching(times => times == 4);
 
-        result.Should().NotBeNull();
         result.Should().HaveCount(4);
     }
 
@@ -382,7 +381,6 @@ public async Task TestUserCreationSendMailError()
         A.CallTo(() => _mockLogger.Log(A<LogLevel>.That.IsEqualTo(LogLevel.Error), A<Exception?>._, A<string>._)).MustHaveHappenedOnceExactly();
         A.CallTo(() => _mailingService.SendMails(A<string>._, A<IDictionary<string, string>>._, A<List<string>>._)).MustHaveHappenedANumberOfTimesMatching(times => times == 5);
 
-        result.Should().NotBeNull();
         result.Should().HaveCount(5);
     }
 
@@ -582,7 +580,7 @@ public async Task TestDeleteOwnUserInvalidUserThrows()
         A.CallTo(() => _identityService.IdentityData).Returns(identity);
 
         A.CallTo(() => _userRepository.GetSharedIdentityProviderUserAccountDataUntrackedAsync(identity.IdentityId))
-            .Returns(((string?, CompanyUserAccountData))default!);
+            .Returns<(string?, CompanyUserAccountData)>(default);
 
         var sut = new UserBusinessLogic(
             _provisioningManager,
@@ -640,152 +638,6 @@ public async Task TestDeleteOwnUserInvalidCompanyUserThrows()
 
     #endregion
 
-    #region Modify UserRole Async
-
-    [Fact]
-    public async Task ModifyUserRoleAsync_WithTwoNewRoles_AddsTwoRolesToTheDatabase()
-    {
-        // Arrange
-        A.CallTo(() => _identity.IdentityId).Returns(_createdCentralUserId);
-        A.CallTo(() => _identity.CompanyId).Returns(_createdCentralCompanyId);
-        SetupFakesForUserRoleModification();
-
-        var sut = new UserRolesBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            Options.Create(_settings)
-        );
-
-        // Act
-        var userRoleInfo = new UserRoleInfo(_companyUserId, new[]
-        {
-            "Existing Role",
-            "Company Admin",
-            "Buyer",
-            "Supplier"
-        });
-        await sut.ModifyUserRoleAsync(_validOfferId, userRoleInfo).ConfigureAwait(false);
-
-        // Assert
-        _addedRoles.Should().HaveCount(2);
-    }
-
-    [Fact]
-    public async Task ModifyUserRoleAsync_WithOneRoleToDelete_DeletesTheRole()
-    {
-        // Arrange
-        A.CallTo(() => _identity.IdentityId).Returns(_adminUserId);
-        A.CallTo(() => _identity.CompanyId).Returns(_adminCompanyId);
-        SetupFakesForUserRoleModification();
-
-        var sut = new UserRolesBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            Options.Create(_settings)
-        );
-
-        // Act
-        var userRoleInfo = new UserRoleInfo(_companyUserId, new[]
-        {
-            "Company Admin"
-        });
-        await sut.ModifyUserRoleAsync(_validOfferId, userRoleInfo).ConfigureAwait(false);
-
-        // Assert
-        A.CallTo(() => _portalRepositories.RemoveRange(A<IEnumerable<IdentityAssignedRole>>.That.Matches(x => x.Count() == 1))).MustHaveHappenedOnceExactly();
-    }
-
-    [Fact]
-    public async Task ModifyUserRoleAsync_WithNotExistingRole_ThrowsException()
-    {
-        // Arrange
-        A.CallTo(() => _identity.IdentityId).Returns(_adminUserId);
-        A.CallTo(() => _identity.CompanyId).Returns(_adminCompanyId);
-        SetupFakesForUserRoleModification();
-
-        var sut = new UserRolesBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            Options.Create(_settings)
-        );
-
-        // Act
-        var userRoleInfo = new UserRoleInfo(_companyUserId, new[]
-        {
-            "NotExisting",
-            "Buyer"
-        });
-        async Task Action() => await sut.ModifyUserRoleAsync(_validOfferId, userRoleInfo).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<ControllerArgumentException>(Action);
-        ex.ParamName.Should().Be("roles");
-    }
-
-    [Fact]
-    public async Task ModifyUserRoleAsync_WithNotFoundCompanyUser_ThrowsException()
-    {
-        // Arrange
-        A.CallTo(() => _identity.IdentityId).Returns(_adminUserId);
-        A.CallTo(() => _identity.CompanyId).Returns(_adminCompanyId);
-        SetupFakesForUserRoleModification();
-
-        var sut = new UserRolesBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            Options.Create(_settings)
-        );
-
-        // Act
-        var userRoleInfo = new UserRoleInfo(Guid.NewGuid(), new[]
-        {
-            "Company Admin",
-            "Buyer",
-            "Supplier"
-        });
-        async Task Action() => await sut.ModifyUserRoleAsync(_validOfferId, userRoleInfo).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<ForbiddenException>(Action);
-        ex.Message.Should().Be($"CompanyUserId {userRoleInfo.CompanyUserId} is not associated with company {_adminCompanyId}");
-    }
-
-    [Fact]
-    public async Task ModifyUserRoleAsync_WithInvalidOfferId_ThrowsException()
-    {
-        // Arrange
-        A.CallTo(() => _identity.IdentityId).Returns(_adminUserId);
-        A.CallTo(() => _identity.CompanyId).Returns(_adminCompanyId);
-        SetupFakesForUserRoleModification();
-
-        var sut = new UserRolesBusinessLogic(
-            _portalRepositories,
-            _provisioningManager,
-            _identityService,
-            Options.Create(_settings)
-        );
-        var invalidAppId = Guid.NewGuid();
-
-        // Act
-        var userRoleInfo = new UserRoleInfo(_companyUserId, new[]
-        {
-            "Company Admin",
-            "Buyer",
-            "Supplier"
-        });
-        async Task Action() => await sut.ModifyUserRoleAsync(invalidAppId, userRoleInfo).ConfigureAwait(false);
-
-        // Assert
-        var ex = await Assert.ThrowsAsync<NotFoundException>(Action);
-        ex.Message.Should().StartWith("offerId");
-    }
-
-    #endregion
-
     #region ModifyCoreOfferUserRolesAsync
 
     [Fact]
@@ -820,9 +672,10 @@ public async Task ModifyCoreOfferUserRolesAsync_WithTwoNewRoles_AddsTwoRolesToTh
             x => x.UserRoleId == new Guid("9aae7a3b-b188-4a42-b46b-fb2ea5f47663"));
         _removedRoles.Should().ContainSingle().Which.Should().Match<IdentityAssignedRole>(
             x => x.UserRoleId == new Guid("9aae7a3b-b188-4a42-b46b-fb2ea5f47664"));
-        notifications.Should().ContainSingle();
-        notifications.Single().ReceiverUserId.Should().Be(_companyUserId);
-        notifications.Single().NotificationTypeId.Should().Be(NotificationTypeId.ROLE_UPDATE_CORE_OFFER);
+        notifications.Should().ContainSingle()
+            .Which.Should().Match<Notification>(x =>
+                x.ReceiverUserId == _companyUserId &&
+                x.NotificationTypeId == NotificationTypeId.ROLE_UPDATE_CORE_OFFER);
     }
 
     #endregion
@@ -857,9 +710,10 @@ public async Task ModifyAppUserRolesAsync_WithTwoNewRoles_AddsTwoRolesToTheDatab
 
         // Assert
         _addedRoles.Should().HaveCount(2);
-        notifications.Should().ContainSingle();
-        notifications.Single().ReceiverUserId.Should().Be(_companyUserId);
-        notifications.Single().NotificationTypeId.Should().Be(NotificationTypeId.ROLE_UPDATE_APP_OFFER);
+        notifications.Should().ContainSingle()
+            .Which.Should().Match<Notification>(x =>
+                x.ReceiverUserId == _companyUserId &&
+                x.NotificationTypeId == NotificationTypeId.ROLE_UPDATE_APP_OFFER);
     }
 
     [Fact]
@@ -895,7 +749,7 @@ public async Task ModifyAppUserRoleAsync_WithMultipleClients_AddsTwoRolesToTheDa
             });
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(A<string>.That.Matches(x => x == _iamUserId), A<IDictionary<string, IEnumerable<string>>>._))
-            .Returns(new[] { (Client: iamClientId, Roles: new[] { "Existing Role", "Supplier" }.AsEnumerable()), (Client: iamClientId1, Roles: new[] { "Existing Role", "Supplier" }.AsEnumerable()) }.ToAsyncEnumerable());
+            .Returns(new[] { (iamClientId, new[] { "Existing Role", "Supplier" }.AsEnumerable(), default(Exception?)), (iamClientId1, new[] { "Existing Role", "Supplier" }.AsEnumerable(), default(Exception?)) }.ToAsyncEnumerable());
 
         var sut = new UserRolesBusinessLogic(
             _portalRepositories,
@@ -944,7 +798,7 @@ public async Task ModifyAppUserRoleAsync_WithFailingAssignement_ThrowsServiceExc
             }.ToAsyncEnumerable());
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(A<string>.That.Matches(x => x == _iamUserId), A<IDictionary<string, IEnumerable<string>>>._))
-            .Returns(new[] { (Client: iamClientId, Roles: new[] { "Existing Role", "Supplier" }.AsEnumerable()), (Client: iamClientId1, Roles: new[] { "Existing Role" }.AsEnumerable()) }.ToAsyncEnumerable());
+            .Returns(new[] { (Client: iamClientId, Roles: new[] { "Existing Role", "Supplier" }.AsEnumerable(), Error: null), (Client: iamClientId1, Roles: new[] { "Existing Role" }.AsEnumerable(), Error: new Exception("some error")) }.ToAsyncEnumerable());
 
         var sut = new UserRolesBusinessLogic(
             _portalRepositories,
@@ -965,7 +819,7 @@ public async Task ModifyAppUserRoleAsync_WithFailingAssignement_ThrowsServiceExc
 
         // Assert
         var ex = await Assert.ThrowsAsync<ServiceException>(Act).ConfigureAwait(false);
-        ex.Message.Should().Be("The following roles could not be added to the clients: \n Client: Cl2-CX-Registration, Roles: Supplier");
+        ex.Message.Should().Be("The following roles could not be added to the clients: \n Client: Cl2-CX-Registration, Roles: Supplier, Error: some error");
     }
 
     [Fact]
@@ -993,9 +847,10 @@ public async Task ModifyAppUserRolesAsync_WithOneRoleToDelete_DeletesTheRole()
 
         // Assert
         A.CallTo(() => _portalRepositories.RemoveRange(A<IEnumerable<IdentityAssignedRole>>.That.Matches(x => x.Count() == 1))).MustHaveHappenedOnceExactly();
-        notifications.Should().ContainSingle();
-        notifications.Single().ReceiverUserId.Should().Be(_companyUserId);
-        notifications.Single().NotificationTypeId.Should().Be(NotificationTypeId.ROLE_UPDATE_APP_OFFER);
+        notifications.Should().ContainSingle()
+            .Which.Should().Match<Notification>(x =>
+                x.ReceiverUserId == _companyUserId &&
+                x.NotificationTypeId == NotificationTypeId.ROLE_UPDATE_APP_OFFER);
     }
 
     [Fact]
@@ -1163,7 +1018,7 @@ public async Task TestDeleteOwnCompanyUsersAsyncNoSharedIdpSuccess()
         SetupFakesForUserDeletion();
 
         A.CallTo(() => _identityProviderRepository.GetSharedIdentityProviderIamAliasDataUntrackedAsync(A<Guid>._))
-            .Returns((string?)null);
+            .Returns<string?>(null);
 
         var companyUserIds = _fixture.CreateMany<Guid>(5);
 
@@ -1258,7 +1113,7 @@ public async Task TestDeleteOwnCompanyUsersAsyncNoSharedIdpError()
         SetupFakesForUserDeletion();
 
         A.CallTo(() => _identityProviderRepository.GetSharedIdentityProviderIamAliasDataUntrackedAsync(A<Guid>._))
-            .Returns((string?)null);
+            .Returns<string?>(null);
 
         var invalidUserId = _fixture.Create<Guid>();
         var invalidIamUserId = _fixture.Create<string>();
@@ -1326,7 +1181,7 @@ public async Task GetOwnCompanyAppUsersAsync_ReturnsExpectedResult()
         A.CallTo(() => _identity.IdentityId).Returns(userId);
 
         A.CallTo(() => _userRepository.GetOwnCompanyAppUsersPaginationSourceAsync(A<Guid>._, A<Guid>._, A<IEnumerable<OfferSubscriptionStatusId>>._, A<IEnumerable<UserStatusId>>._, A<CompanyUserFilter>._))
-            .Returns((int skip, int take) => Task.FromResult((Pagination.Source<CompanyAppUserDetails>?)new Pagination.Source<CompanyAppUserDetails>(companyUsers.Count(), companyUsers.Skip(skip).Take(take))));
+            .Returns((int skip, int take) => Task.FromResult<Pagination.Source<CompanyAppUserDetails>?>(new(companyUsers.Count(), companyUsers.Skip(skip).Take(take))));
         var sut = new UserBusinessLogic(null!, null!, null!, _portalRepositories, _identityService, null!, null!, A.Fake<IOptions<UserSettings>>());
 
         // Act
@@ -1351,7 +1206,7 @@ public async Task GetOwnCompanyAppUsersAsync_SecondPage_ReturnsExpectedResult()
         A.CallTo(() => _identity.IdentityId).Returns(userId);
 
         A.CallTo(() => _userRepository.GetOwnCompanyAppUsersPaginationSourceAsync(A<Guid>._, A<Guid>._, A<IEnumerable<OfferSubscriptionStatusId>>._, A<IEnumerable<UserStatusId>>._, A<CompanyUserFilter>._))
-            .Returns((int skip, int take) => Task.FromResult((Pagination.Source<CompanyAppUserDetails>?)new Pagination.Source<CompanyAppUserDetails>(companyUsers.Count(), companyUsers.Skip(skip).Take(take))));
+            .Returns((int skip, int take) => Task.FromResult<Pagination.Source<CompanyAppUserDetails>?>(new(companyUsers.Count(), companyUsers.Skip(skip).Take(take))));
         var sut = new UserBusinessLogic(null!, null!, null!, _portalRepositories, _identityService, null!, null!, A.Fake<IOptions<UserSettings>>());
 
         // Act
@@ -1380,7 +1235,7 @@ public async Task GetOwnCompanyAppUsersAsync_WithNonExistingCompanyUser_ThrowsNo
         A.CallTo(() => _identity.IdentityId).Returns(_adminUserId);
         A.CallTo(() => _identity.CompanyId).Returns(_adminCompanyId);
         A.CallTo(() => _userBusinessPartnerRepository.GetOwnCompanyUserWithAssignedBusinessPartnerNumbersAsync(companyUserId, _adminCompanyId, businessPartnerNumber))
-            .Returns(((bool, bool, bool))default);
+            .Returns<(bool, bool, bool)>(default);
         A.CallTo(() => _portalRepositories.GetInstance<IUserBusinessPartnerRepository>()).Returns(_userBusinessPartnerRepository);
         var sut = new UserBusinessLogic(null!, null!, null!, _portalRepositories, _identityService, null!, null!, A.Fake<IOptions<UserSettings>>());
 
@@ -1422,7 +1277,7 @@ public async Task GetOwnCompanyAppUsersAsync_WithoutUserForBpn_ThrowsArgumentExc
         A.CallTo(() => _identity.IdentityId).Returns(_adminUserId);
         A.CallTo(() => _identity.CompanyId).Returns(_adminCompanyId);
         A.CallTo(() => _provisioningManager.GetUserByUserName(companyUserId.ToString()))
-            .Returns((string?)null);
+            .Returns<string?>(null);
         A.CallTo(() => _userBusinessPartnerRepository.GetOwnCompanyUserWithAssignedBusinessPartnerNumbersAsync(companyUserId, _adminCompanyId, businessPartnerNumber.ToUpper()))
             .Returns((true, true, true));
         A.CallTo(() => _portalRepositories.GetInstance<IUserBusinessPartnerRepository>()).Returns(_userBusinessPartnerRepository);
@@ -1508,13 +1363,14 @@ public async Task GetOwnUserDetails_ReturnsExpected()
         A.CallTo(() => _userRolesRepository.GetUserRoleIdsUntrackedAsync(A<IEnumerable<UserRoleConfig>>
             .That.IsSameSequenceAs(_options.Value.UserAdminRoles))).MustHaveHappenedOnceExactly();
         A.CallTo(() => _userRepository.GetUserDetailsUntrackedAsync(userId, A<IEnumerable<Guid>>.That.IsSameSequenceAs(userRoleIds))).MustHaveHappenedOnceExactly();
-        result.CompanyName.Should().Be(companyOwnUserDetails.CompanyName);
-        result.CreatedAt.Should().Be(companyOwnUserDetails.CreatedAt);
-        result.CompanyUserId.Should().Be(companyOwnUserDetails.CompanyUserId);
-        result.BusinessPartnerNumbers.Should().BeSameAs(companyOwnUserDetails.BusinessPartnerNumbers);
-        result.FirstName.Should().Be(companyOwnUserDetails.FirstName);
-        result.LastName.Should().Be(companyOwnUserDetails.LastName);
-        result.Email.Should().Be(companyOwnUserDetails.Email);
+        result.Should().Match<CompanyOwnUserDetails>(x =>
+            x.CompanyName == companyOwnUserDetails.CompanyName &&
+            x.CreatedAt == companyOwnUserDetails.CreatedAt &&
+            x.CompanyUserId == companyOwnUserDetails.CompanyUserId &&
+            x.BusinessPartnerNumbers.SequenceEqual(companyOwnUserDetails.BusinessPartnerNumbers) &&
+            x.FirstName == companyOwnUserDetails.FirstName &&
+            x.LastName == companyOwnUserDetails.LastName &&
+            x.Email == companyOwnUserDetails.Email);
     }
 
     [Fact]
@@ -1526,7 +1382,7 @@ public async Task GetOwnUserDetails_ThrowsNotFoundException()
         A.CallTo(() => _identity.IdentityId).Returns(userId);
         A.CallTo(() => _identity.CompanyId).Returns(companyId);
         A.CallTo(() => _userRepository.GetUserDetailsUntrackedAsync(userId, A<IEnumerable<Guid>>._))
-            .Returns((CompanyOwnUserTransferDetails)default!);
+            .Returns(default(CompanyOwnUserTransferDetails));
         var sut = new UserBusinessLogic(_provisioningManager, null!, null!, _portalRepositories, _identityService, null!, _logger, _options);
 
         // Act
@@ -1559,13 +1415,14 @@ public async Task GetOwnCompanyUserDetailsAsync_ReturnsExpected()
 
         // Assert
         A.CallTo(() => _userRepository.GetOwnCompanyUserDetailsUntrackedAsync(userId, companyId)).MustHaveHappenedOnceExactly();
-        result.CompanyName.Should().Be(companyOwnUserDetails.CompanyName);
-        result.CreatedAt.Should().Be(companyOwnUserDetails.CreatedAt);
-        result.CompanyUserId.Should().Be(companyOwnUserDetails.CompanyUserId);
-        result.BusinessPartnerNumbers.Should().BeSameAs(companyOwnUserDetails.BusinessPartnerNumbers);
-        result.FirstName.Should().Be(companyOwnUserDetails.FirstName);
-        result.LastName.Should().Be(companyOwnUserDetails.LastName);
-        result.Email.Should().Be(companyOwnUserDetails.Email);
+        result.Should().Match<CompanyUserDetailData>(x =>
+            x.CompanyName == companyOwnUserDetails.CompanyName &&
+            x.CreatedAt == companyOwnUserDetails.CreatedAt &&
+            x.CompanyUserId == companyOwnUserDetails.CompanyUserId &&
+            x.BusinessPartnerNumbers.SequenceEqual(companyOwnUserDetails.BusinessPartnerNumbers) &&
+            x.FirstName == companyOwnUserDetails.FirstName &&
+            x.LastName == companyOwnUserDetails.LastName &&
+            x.Email == companyOwnUserDetails.Email);
     }
 
     [Fact]
@@ -1576,7 +1433,7 @@ public async Task GetOwnCompanyUserDetailsAsync_ThrowsNotFoundException()
         var companyId = Guid.NewGuid();
         A.CallTo(() => _identity.CompanyId).Returns(companyId);
         A.CallTo(() => _userRepository.GetOwnCompanyUserDetailsUntrackedAsync(A<Guid>._, A<Guid>._))
-            .Returns((CompanyUserDetailTransferData)default!);
+            .Returns(default(CompanyUserDetailTransferData));
         var sut = new UserBusinessLogic(_provisioningManager, null!, null!, _portalRepositories, _identityService, null!, _logger, _options);
 
         // Act
@@ -1614,7 +1471,7 @@ private void SetupFakesForUserCreation(bool isBulkUserCreation)
         A.CallTo(() => _processLine(A<UserCreationRoleDataIdpInfo>._)).ReturnsLazily(
             (UserCreationRoleDataIdpInfo creationInfo) => _fixture.Build<(Guid CompanyUserId, string UserName, string? Password, Exception? Error)>()
                 .With(x => x.UserName, creationInfo.UserName)
-                .With(x => x.Error, (Exception?)null)
+                .With(x => x.Error, default(Exception?))
                 .Create());
     }
 
@@ -1632,7 +1489,7 @@ private void SetupFakesForUserDeletion()
                                 .Create()));
 
         A.CallTo(() => _identityProviderRepository.GetSharedIdentityProviderIamAliasDataUntrackedAsync(A<Guid>._))
-            .Returns((string?)null);
+            .Returns<string?>(null);
         A.CallTo(() => _identityProviderRepository.GetSharedIdentityProviderIamAliasDataUntrackedAsync(_companyId))
             .Returns(_identityProviderAlias);
 
@@ -1705,14 +1562,14 @@ private void SetupFakesForUserRoleModification(List<Notification>? notifications
             });
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(A<string>.That.Matches(x => x == _iamUserId), A<IDictionary<string, IEnumerable<string>>>._))
-            .Returns(new[] { (Client: iamClientId, Roles: new[] { "Existing Role", "Supplier" }.AsEnumerable()) }.ToAsyncEnumerable());
+            .Returns(new[] { (iamClientId, new[] { "Existing Role", "Supplier" }.AsEnumerable(), default(Exception?)) }.ToAsyncEnumerable());
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(A<string>.That.Matches(x => x == _createdCentralIamUserId), A<IDictionary<string, IEnumerable<string>>>._))
-            .Returns(new[] { (Client: iamClientId, Roles: new[] { "Company Admin" }.AsEnumerable()) }.ToAsyncEnumerable());
+            .Returns(new[] { (iamClientId, new[] { "Company Admin" }.AsEnumerable(), default(Exception?)) }.ToAsyncEnumerable());
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(
                 A<string>.That.Not.Matches(x => x == _createdCentralIamUserId || x == _iamUserId), A<IDictionary<string, IEnumerable<string>>>._))
-            .Returns(new[] { (Client: iamClientId, Roles: Enumerable.Empty<string>()) }.ToAsyncEnumerable());
+            .Returns(new (string, IEnumerable<string>, Exception?)[] { (iamClientId, Enumerable.Empty<string>(), new Exception("some error")) }.ToAsyncEnumerable());
 
         if (notifications != null)
         {
diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs
index 79037597a6..b2bfea7344 100644
--- a/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs
+++ b/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs
@@ -522,7 +522,7 @@ public async Task TestUserCreationSharedIdpCreationThrows()
     private void SetupFakes(IEnumerable<string> lines)
     {
         A.CallTo(() => _document.ContentType).Returns("text/csv");
-        A.CallTo(() => _document.OpenReadStream()).ReturnsLazily(() => new AsyncEnumerableStringStream(lines.ToAsyncEnumerable(), _encoding));
+        A.CallTo(() => _document.OpenReadStream()).Returns(new AsyncEnumerableStringStream(lines.ToAsyncEnumerable(), _encoding));
 
         A.CallTo(() => _options.Value).Returns(_settings);
 
@@ -543,7 +543,7 @@ private void SetupFakes(IEnumerable<string> lines)
         A.CallTo(() => _processLine(A<UserCreationRoleDataIdpInfo>._)).ReturnsLazily(
             (UserCreationRoleDataIdpInfo creationInfo) => _fixture.Build<(Guid CompanyUserId, string UserName, string? Password, Exception? Error)>()
                 .With(x => x.UserName, creationInfo.UserName)
-                .With(x => x.Error, (Exception?)null)
+                .With(x => x.Error, default(Exception?))
                 .Create());
     }
 
diff --git a/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs b/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs
index 5073c2c946..50a6cd1ae4 100644
--- a/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs
+++ b/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs
@@ -59,7 +59,7 @@ public async Task GetDocumentContentFileAsync_WithValidData_ReturnsOk()
             .Returns((fileName, content, contentType));
 
         //Act
-        await this._controller.GetDocumentContentFileAsync(id).ConfigureAwait(false);
+        await _controller.GetDocumentContentFileAsync(id).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetDocumentAsync(id)).MustHaveHappenedOnceExactly();
@@ -73,10 +73,10 @@ public async Task GetSelfDescriptionDocumentsAsync_WithValidData_ReturnsOk()
         var id = Guid.NewGuid();
         var content = Encoding.UTF8.GetBytes("This is just test content");
         A.CallTo(() => _logic.GetSelfDescriptionDocumentAsync(id))
-            .ReturnsLazily(() => (fileName, content, "application/json"));
+            .Returns((fileName, content, "application/json"));
 
         //Act
-        await this._controller.GetSelfDescriptionDocumentsAsync(id).ConfigureAwait(false);
+        await _controller.GetSelfDescriptionDocumentsAsync(id).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetSelfDescriptionDocumentAsync(id)).MustHaveHappenedOnceExactly();
@@ -89,10 +89,10 @@ public async Task GetDocumentSeedData_WithValidId_ReturnsData()
         var id = Guid.NewGuid();
         var documentData = _fixture.Create<DocumentSeedData>();
         A.CallTo(() => _logic.GetSeedData(id))
-            .ReturnsLazily(() => documentData);
+            .Returns(documentData);
 
         //Act
-        await this._controller.GetDocumentSeedData(id).ConfigureAwait(false);
+        await _controller.GetDocumentSeedData(id).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetSeedData(id)).MustHaveHappenedOnceExactly();
@@ -105,10 +105,10 @@ public async Task GetFrameDocumentAsync_WithValidData_ReturnsExpected()
         var documentId = _fixture.Create<Guid>();
         var content = new byte[7];
         A.CallTo(() => _logic.GetFrameDocumentAsync(documentId))
-            .ReturnsLazily(() => new ValueTuple<string, byte[]>("test.json", content));
+            .Returns(("test.json", content));
 
         //Act
-        var result = await this._controller.GetFrameDocumentAsync(documentId).ConfigureAwait(false);
+        var result = await _controller.GetFrameDocumentAsync(documentId).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _logic.GetFrameDocumentAsync(documentId)).MustHaveHappenedOnceExactly();
diff --git a/tests/administration/Administration.Service.Tests/Controllers/PartnerNetworkControllerTest.cs b/tests/administration/Administration.Service.Tests/Controllers/PartnerNetworkControllerTest.cs
index 40c09a11b8..43c65b1cd9 100644
--- a/tests/administration/Administration.Service.Tests/Controllers/PartnerNetworkControllerTest.cs
+++ b/tests/administration/Administration.Service.Tests/Controllers/PartnerNetworkControllerTest.cs
@@ -28,13 +28,16 @@ public class PartnerNetworkControllerTest
 
     private readonly IPartnerNetworkBusinessLogic _logic;
     private readonly PartnerNetworkController _controller;
-
-    // private readonly IAsyncEnumerable<string> companyBpns;
+    private readonly IFixture _fixture;
 
     public PartnerNetworkControllerTest()
     {
+        _fixture = new Fixture().Customize(new AutoFakeItEasyCustomization { ConfigureMembers = true });
+        _fixture.Behaviors.OfType<ThrowingRecursionBehavior>().ToList()
+        .ForEach(b => _fixture.Behaviors.Remove(b));
+        _fixture.Behaviors.Add(new OmitOnRecursionBehavior());
         _logic = A.Fake<IPartnerNetworkBusinessLogic>();
-        this._controller = new PartnerNetworkController(_logic);
+        _controller = new PartnerNetworkController(_logic);
     }
 
     [Theory]
@@ -44,16 +47,15 @@ public async Task GetAllMemberCompaniesBPN_Test(params string[]? bpnIds)
     {
         //Arrange
         var bpn = bpnIds == null ? null : bpnIds.ToList();
-        A.CallTo(() => _logic.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>>._));
+        var data = _fixture.CreateMany<string>(5);
+        A.CallTo(() => _logic.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>?>._)).Returns(data.ToAsyncEnumerable());
 
         //Act
-        var result = this._controller.GetAllMemberCompaniesBPNAsync(bpn);
+        var result = await _controller.GetAllMemberCompaniesBPNAsync(bpn).ToListAsync();
 
         //Assert
-        await foreach (var item in result)
-        {
-            A.CallTo(() => _logic.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>>.That.IsSameAs(bpn!))).MustHaveHappenedOnceExactly();
-            Assert.IsType<string>(result);
-        }
+        A.CallTo(() => _logic.GetAllMemberCompaniesBPNAsync(A<IEnumerable<string>?>.That.IsSameAs(bpn))).MustHaveHappenedOnceExactly();
+
+        result.Should().HaveSameCount(data).And.ContainInOrder(data);
     }
 }
diff --git a/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs b/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs
index 8b48502051..0a50b15a86 100644
--- a/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs
+++ b/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -63,7 +62,7 @@ public async Task GetCompanyApplicationDetailsAsync_ReturnsCompanyApplicationDet
                   .Returns(paginationResponse);
 
         //Act
-        var result = await this._controller.GetApplicationDetailsAsync(0, 15, null, null).ConfigureAwait(false);
+        var result = await _controller.GetApplicationDetailsAsync(0, 15, null, null).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetCompanyApplicationDetailsAsync(0, 15, null, null)).MustHaveHappenedOnceExactly();
@@ -78,10 +77,10 @@ public async Task GetCompanyWithAddressAsync_ReturnsExpectedResult()
         var applicationId = _fixture.Create<Guid>();
         var data = _fixture.Create<CompanyWithAddressData>();
         A.CallTo(() => _logic.GetCompanyWithAddressAsync(applicationId))
-            .ReturnsLazily(() => data);
+            .Returns(data);
 
         //Act
-        var result = await this._controller.GetCompanyWithAddressAsync(applicationId).ConfigureAwait(false);
+        var result = await _controller.GetCompanyWithAddressAsync(applicationId).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetCompanyWithAddressAsync(applicationId)).MustHaveHappenedOnceExactly();
@@ -95,7 +94,7 @@ public async Task ApproveApplication_ReturnsExpectedResult()
         var applicationId = _fixture.Create<Guid>();
 
         //Act
-        var result = await this._controller.ApproveApplication(applicationId).ConfigureAwait(false);
+        var result = await _controller.ApproveApplication(applicationId).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.ApproveRegistrationVerification(applicationId)).MustHaveHappenedOnceExactly();
@@ -109,7 +108,7 @@ public async Task DeclineApplication_ReturnsExpectedResult()
         var applicationId = _fixture.Create<Guid>();
 
         //Act
-        var result = await this._controller.DeclineApplication(applicationId, new RegistrationDeclineData("test"), CancellationToken.None).ConfigureAwait(false);
+        var result = await _controller.DeclineApplication(applicationId, new RegistrationDeclineData("test"), CancellationToken.None).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.DeclineRegistrationVerification(applicationId, "test", A<CancellationToken>._)).MustHaveHappenedOnceExactly();
@@ -120,16 +119,14 @@ public async Task DeclineApplication_ReturnsExpectedResult()
     public async Task ProcessClearinghouseResponse_ReturnsExpectedResult()
     {
         //Arrange
-        var bpn = _fixture.Create<string>();
         var data = _fixture.Create<ClearinghouseResponseData>();
-        A.CallTo(() => _logic.ProcessClearinghouseResponseAsync(data, A<CancellationToken>._))
-            .ReturnsLazily(() => Task.CompletedTask);
+        var cancellationToken = CancellationToken.None;
 
         //Act
-        var result = await this._controller.ProcessClearinghouseResponse(data, CancellationToken.None).ConfigureAwait(false);
+        var result = await _controller.ProcessClearinghouseResponse(data, cancellationToken).ConfigureAwait(false);
 
         //Assert
-        A.CallTo(() => _logic.ProcessClearinghouseResponseAsync(data, CancellationToken.None)).MustHaveHappenedOnceExactly();
+        A.CallTo(() => _logic.ProcessClearinghouseResponseAsync(data, cancellationToken)).MustHaveHappenedOnceExactly();
         Assert.IsType<NoContentResult>(result);
     }
 
@@ -150,10 +147,10 @@ public async Task GetChecklistForApplication_ReturnsExpectedResult()
             new(ApplicationChecklistEntryTypeId.CLEARING_HOUSE, ApplicationChecklistEntryStatusId.IN_PROGRESS, null, new List<ProcessStepTypeId>()),
         };
         A.CallTo(() => _logic.GetChecklistForApplicationAsync(applicationId))
-            .ReturnsLazily(() => list);
+            .Returns(list);
 
         //Act
-        var result = await this._controller.GetChecklistForApplication(applicationId).ConfigureAwait(false);
+        var result = await _controller.GetChecklistForApplication(applicationId).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetChecklistForApplicationAsync(applicationId)).MustHaveHappenedOnceExactly();
@@ -167,11 +164,9 @@ public async Task ReTriggerClearinghouse_ReturnsExpectedResult()
     {
         // Arrange
         var applicationId = _fixture.Create<Guid>();
-        A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, A<ApplicationChecklistEntryTypeId>._, A<ProcessStepTypeId>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         // Act
-        var result = await this._controller.RetriggerClearinghouseChecklist(applicationId).ConfigureAwait(false);
+        var result = await _controller.RetriggerClearinghouseChecklist(applicationId).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, ApplicationChecklistEntryTypeId.CLEARING_HOUSE, ProcessStepTypeId.RETRIGGER_CLEARING_HOUSE)).MustHaveHappenedOnceExactly();
@@ -183,11 +178,9 @@ public async Task OverrideClearinghouse_ReturnsExpectedResult()
     {
         // Arrange
         var applicationId = _fixture.Create<Guid>();
-        A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, A<ApplicationChecklistEntryTypeId>._, A<ProcessStepTypeId>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         // Act
-        var result = await this._controller.OverrideClearinghouseChecklist(applicationId).ConfigureAwait(false);
+        var result = await _controller.OverrideClearinghouseChecklist(applicationId).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, ApplicationChecklistEntryTypeId.CLEARING_HOUSE, ProcessStepTypeId.TRIGGER_OVERRIDE_CLEARING_HOUSE)).MustHaveHappenedOnceExactly();
@@ -199,11 +192,9 @@ public async Task TriggerIdentityWallet_ReturnsExpectedResult()
     {
         // Arrange
         var applicationId = _fixture.Create<Guid>();
-        A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, A<ApplicationChecklistEntryTypeId>._, A<ProcessStepTypeId>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         // Act
-        var result = await this._controller.TriggerIdentityWallet(applicationId);
+        var result = await _controller.TriggerIdentityWallet(applicationId);
 
         // Assert
         A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, ApplicationChecklistEntryTypeId.IDENTITY_WALLET, ProcessStepTypeId.RETRIGGER_IDENTITY_WALLET)).MustHaveHappenedOnceExactly();
@@ -215,11 +206,9 @@ public async Task TriggerSelfDescription_ReturnsExpectedResult()
     {
         // Arrange
         var applicationId = _fixture.Create<Guid>();
-        A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, A<ApplicationChecklistEntryTypeId>._, A<ProcessStepTypeId>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         // Act
-        var result = await this._controller.TriggerSelfDescription(applicationId);
+        var result = await _controller.TriggerSelfDescription(applicationId);
 
         // Assert
         A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP, ProcessStepTypeId.RETRIGGER_SELF_DESCRIPTION_LP)).MustHaveHappenedOnceExactly();
@@ -233,11 +222,9 @@ public async Task TriggerBpn_ReturnsExpectedResult(ProcessStepTypeId processStep
     {
         // Arrange
         var applicationId = _fixture.Create<Guid>();
-        A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, A<ApplicationChecklistEntryTypeId>._, A<ProcessStepTypeId>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         // Act
-        var result = await this._controller.TriggerBpn(applicationId, processStepTypeId);
+        var result = await _controller.TriggerBpn(applicationId, processStepTypeId);
 
         // Assert
         A.CallTo(() => _logic.TriggerChecklistAsync(applicationId, ApplicationChecklistEntryTypeId.BUSINESS_PARTNER_NUMBER, processStepTypeId)).MustHaveHappenedOnceExactly();
@@ -249,11 +236,9 @@ public async Task ProcessClearinghouseSelfDescription_ReturnsExpectedResult()
     {
         // Arrange
         var data = new SelfDescriptionResponseData(Guid.NewGuid(), SelfDescriptionStatus.Confirm, null, "{ \"test\": true }");
-        A.CallTo(() => _logic.ProcessClearinghouseSelfDescription(data, A<CancellationToken>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         // Act
-        var result = await this._controller.ProcessClearinghouseSelfDescription(data, CancellationToken.None);
+        var result = await _controller.ProcessClearinghouseSelfDescription(data, CancellationToken.None);
 
         // Assert
         A.CallTo(() => _logic.ProcessClearinghouseSelfDescription(data, A<CancellationToken>._)).MustHaveHappenedOnceExactly();
@@ -269,10 +254,10 @@ public async Task GetDocumentContentFileAsync_WithValidData_ReturnsOk()
         var id = Guid.NewGuid();
         var content = Encoding.UTF8.GetBytes("This is just test content");
         A.CallTo(() => _logic.GetDocumentAsync(id))
-            .ReturnsLazily(() => (fileName, content, contentType));
+            .Returns((fileName, content, contentType));
 
         //Act
-        await this._controller.GetDocumentContentFileAsync(id).ConfigureAwait(false);
+        await _controller.GetDocumentContentFileAsync(id).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _logic.GetDocumentAsync(id)).MustHaveHappenedOnceExactly();
diff --git a/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs b/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs
index 6e285ce71c..1098d812db 100644
--- a/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs
+++ b/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -21,7 +20,6 @@
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities;
 using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions;
@@ -30,7 +28,6 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.Contr
 
 public class UserControllerTest
 {
-    private static readonly Guid CompanyUserId = new("05455d3a-fc86-4f5a-a89a-ba964ead163d");
     private readonly IIdentityData _identity;
     private readonly IUserBusinessLogic _logic;
     private readonly IUserRolesBusinessLogic _rolesLogic;
@@ -51,23 +48,6 @@ public UserControllerTest()
         _controller.AddControllerContextWithClaim(_identity);
     }
 
-    [Fact]
-    public async Task ModifyUserRolesAsync_WithValidData_ReturnsExpectedResult()
-    {
-        //Arrange
-        var appId = new Guid("8d4bfde6-978f-4d82-86ce-8d90d52fbf3f");
-        var userRoleInfo = new UserRoleInfo(CompanyUserId, new[] { "Company Admin" });
-        A.CallTo(() => _rolesLogic.ModifyUserRoleAsync(A<Guid>._, A<UserRoleInfo>._))
-                  .Returns(Enumerable.Empty<UserRoleWithId>());
-
-        //Act
-        var result = await this._controller.ModifyUserRolesAsync(appId, userRoleInfo).ConfigureAwait(false);
-
-        //Assert
-        A.CallTo(() => _rolesLogic.ModifyUserRoleAsync(A<Guid>.That.Matches(x => x == appId), A<UserRoleInfo>.That.Matches(x => x.CompanyUserId == CompanyUserId && x.Roles.Count() == 1))).MustHaveHappenedOnceExactly();
-        result.Should().BeEmpty();
-    }
-
     [Fact]
     public async Task GetOwnUserDetails_ReturnsExpectedResult()
     {
@@ -77,7 +57,7 @@ public async Task GetOwnUserDetails_ReturnsExpectedResult()
             .Returns(data);
 
         // Act
-        var result = await this._controller.GetOwnUserDetails().ConfigureAwait(false);
+        var result = await _controller.GetOwnUserDetails().ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _logic.GetOwnUserDetails()).MustHaveHappenedOnceExactly();
diff --git a/tests/administration/Administration.Service.Tests/EndpointSetup/ConnectorsEndpoints.cs b/tests/administration/Administration.Service.Tests/EndpointSetup/ConnectorsEndpoints.cs
index 489515749e..be29fbcbac 100644
--- a/tests/administration/Administration.Service.Tests/EndpointSetup/ConnectorsEndpoints.cs
+++ b/tests/administration/Administration.Service.Tests/EndpointSetup/ConnectorsEndpoints.cs
@@ -30,12 +30,12 @@ public class ConnectorsEndpoints
 
     public ConnectorsEndpoints(HttpClient client)
     {
-        this._client = client;
+        _client = client;
     }
 
     public async Task<HttpResponseMessage> GetCompanyConnectorsForCurrentUserAsync()
     {
-        var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}");
+        return await _client.SendAsync(request);
     }
 }
diff --git a/tests/administration/Administration.Service.Tests/IntegrationTests/ConnectorsControllerIntegrationTests.cs b/tests/administration/Administration.Service.Tests/IntegrationTests/ConnectorsControllerIntegrationTests.cs
index f319837b10..6bb49c4a5b 100644
--- a/tests/administration/Administration.Service.Tests/IntegrationTests/ConnectorsControllerIntegrationTests.cs
+++ b/tests/administration/Administration.Service.Tests/IntegrationTests/ConnectorsControllerIntegrationTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -42,11 +41,11 @@ public ConnectorsControllerIntegrationTests(IntegrationTestFactory<ConnectorsCon
     public async Task GetCompanyConnectorsForCurrentUserAsync_WithTwoConnectors_ReturnsCorrectAmount()
     {
         // Arrange
-        var client = _factory.CreateClient();
+        using var client = _factory.CreateClient();
         var endpoint = new ConnectorsEndpoints(client);
 
         // Act
-        var response = await endpoint.GetCompanyConnectorsForCurrentUserAsync().ConfigureAwait(false);
+        using var response = await endpoint.GetCompanyConnectorsForCurrentUserAsync().ConfigureAwait(false);
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
diff --git a/tests/endtoend/AuthFlow/AuthFlow.cs b/tests/endtoend/AuthFlow/AuthFlow.cs
index b42052da9f..ccac532939 100644
--- a/tests/endtoend/AuthFlow/AuthFlow.cs
+++ b/tests/endtoend/AuthFlow/AuthFlow.cs
@@ -37,7 +37,7 @@ public class AuthFlow
     private readonly string _startCentralIdpEndpoint = "auth/realms/CX-Central/protocol/openid-connect/auth";
     private readonly string _companyCentralIdpEndpoint = "auth/realms/CX-Central/broker";
     private readonly string _tokenCentralIdpEndpoint = "auth/realms/CX-Central/protocol/openid-connect/token";
-    private static List<string>? _cookies;
+    private List<string>? _cookies;
 
     private readonly HttpClientHandler _httpClientHandler = new() { AllowAutoRedirect = false };
 
@@ -50,7 +50,7 @@ public AuthFlow(string companyName)
         _companyName = companyName;
     }
 
-    private List<CentralidpCompany> StartCentralIdp()
+    private async Task<List<CentralidpCompany>> StartCentralIdp()
     {
         var queryParams = new Dictionary<string, object>
         {
@@ -69,7 +69,7 @@ private List<CentralidpCompany> StartCentralIdp()
             .StatusCode(200)
             .Extract()
             .Response();
-        var htmlString = response.Content.ReadAsStringAsync().Result;
+        var htmlString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var doc = new HtmlDocument();
         doc.LoadHtml(htmlString);
         _cookies = response.Headers.GetValues("Set-Cookie").ToList();
@@ -86,7 +86,7 @@ private List<CentralidpCompany> StartCentralIdp()
 
     private async Task<string> GetCompanySharedIdpUrl(List<CentralidpCompany> companies)
     {
-        var company = companies.FirstOrDefault(c => c.Name.Equals(_companyName) | c.Alias.Equals(_companyName));
+        var company = companies.FirstOrDefault(c => c.Name.Equals(_companyName) || c.Alias.Equals(_companyName));
         if (company is null)
         {
             throw new Exception($"Authentication failed: Company {_companyName} was not found.");
@@ -100,16 +100,18 @@ private async Task<string> GetCompanySharedIdpUrl(List<CentralidpCompany> compan
         var sessionCode = regexSessionCode.Matches(companyUrl).First().Groups[1].Value;
         var companyNameInUrl = regexCompany.Matches(companyUrl).First().Groups[1].Value;
 
-        var uri = new UriBuilder($"{_baseCentralIdpUrl}/{_companyCentralIdpEndpoint}/{companyNameInUrl}/login");
-        uri.Query = $"client_id=Cl2-CX-Portal&tab_id={tabId}&session_code={sessionCode}";
-        var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
+        var uri = new UriBuilder($"{_baseCentralIdpUrl}/{_companyCentralIdpEndpoint}/{companyNameInUrl}/login")
+        {
+            Query = $"client_id=Cl2-CX-Portal&tab_id={tabId}&session_code={sessionCode}"
+        };
+        using var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
         request.Headers.Add("Accept", "*/*");
         request.Headers.Add("Host", _baseCentralIdpUrl.Replace("https://", ""));
         request.Headers.Add("Accept-Encoding", RequestHeaderAcceptEncoding);
         request.Headers.Add("Cookie",
             $"{_cookies?[0].Split(";")[0]}; {_cookies?[1].Split(";")[0]}; {_cookies?[2].Split(";")[0]}");
 
-        var response = await _client.SendAsync(request);
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
         var companySharedIdpUrl = response.Headers.Location?.AbsoluteUri;
         if (companySharedIdpUrl is null)
         {
@@ -122,13 +124,13 @@ private async Task<string> GetCompanySharedIdpUrl(List<CentralidpCompany> compan
     private async Task<string> GetAuthUrlFromSharedIdp(string sharedIdpUrl)
     {
         var uri = new UriBuilder($"{sharedIdpUrl}");
-        var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
+        using var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
         request.Headers.Add("Accept", RequestHeaderAccept);
         request.Headers.Add("Accept-Language", RequestHeaderAcceptLanguage);
         request.Headers.Add("Accept-Encoding", RequestHeaderAcceptEncoding);
 
-        var response = await _client.SendAsync(request);
-        var htmlString = response.Content.ReadAsStringAsync().Result;
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
+        var htmlString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var doc = new HtmlDocument();
         doc.LoadHtml(htmlString);
         var authUrl = doc.DocumentNode.Descendants("form").Single().Attributes.AttributesWithName("action").Single()
@@ -144,7 +146,7 @@ private async Task<string> GetAuthUrlFromSharedIdp(string sharedIdpUrl)
     private async Task<string> AuthenticateInSharedIdp(string sharedIdpUrl, string username, string password)
     {
         var uri = new UriBuilder($"{HttpUtility.HtmlDecode(sharedIdpUrl)}");
-        var request = new HttpRequestMessage(HttpMethod.Post, uri.Uri.AbsoluteUri);
+        using var request = new HttpRequestMessage(HttpMethod.Post, uri.Uri.AbsoluteUri);
         var formContent = new FormUrlEncodedContent(new[]
         {
             new KeyValuePair<string, string>("companyName", _companyName),
@@ -158,7 +160,7 @@ private async Task<string> AuthenticateInSharedIdp(string sharedIdpUrl, string u
         request.Headers.Add("Origin", "null");
         request.Content = formContent;
 
-        var response = await _client.SendAsync(request);
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
         var authCodeOrUpdatePasswordUrl = response.Headers.Location?.AbsoluteUri;
         if (authCodeOrUpdatePasswordUrl is null)
         {
@@ -171,14 +173,14 @@ private async Task<string> AuthenticateInSharedIdp(string sharedIdpUrl, string u
     private async Task<string> GetAuthCodeFromCentralIdp(string authCodeUrl)
     {
         var uri = new UriBuilder($"{HttpUtility.HtmlDecode(authCodeUrl)}");
-        var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
+        using var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
         request.Headers.Add("Accept", RequestHeaderAccept);
         request.Headers.Add("Accept-Language", RequestHeaderAcceptLanguage);
         request.Headers.Add("Accept-Encoding", RequestHeaderAcceptEncoding);
         request.Headers.Add("Cookie",
             $"{_cookies?[0].Split(";")[0]}; {_cookies?[1].Split(";")[0]}; {_cookies?[2].Split(";")[0]}");
 
-        var response = await _client.SendAsync(request);
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
         var tokenUri = new UriBuilder($"{HttpUtility.HtmlDecode(response.Headers.Location?.AbsoluteUri)}");
         var r = new Regex(@"code=([\S]*)", RegexOptions.IgnoreCase);
         return r.Matches(tokenUri.Uri.AbsoluteUri).First().Groups[1].Value;
@@ -187,15 +189,15 @@ private async Task<string> GetAuthCodeFromCentralIdp(string authCodeUrl)
     private async Task<string> GetUpdatePasswordUrl(string forwardUpdatePasswordUrl)
     {
         var uri = new UriBuilder($"{HttpUtility.HtmlDecode(forwardUpdatePasswordUrl)}");
-        var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
+        using var request = new HttpRequestMessage(HttpMethod.Get, uri.Uri.AbsoluteUri);
         request.Headers.Add("Accept", RequestHeaderAccept);
         request.Headers.Add("Accept-Language", RequestHeaderAcceptLanguage);
         request.Headers.Add("Accept-Encoding", RequestHeaderAcceptEncoding);
         request.Headers.Add("Cookie",
             $"{_cookies?[0].Split(";")[0]}; {_cookies?[1].Split(";")[0]}; {_cookies?[2].Split(";")[0]}");
 
-        var response = await _client.SendAsync(request);
-        var htmlString = response.Content.ReadAsStringAsync().Result;
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
+        var htmlString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var doc = new HtmlDocument();
         doc.LoadHtml(htmlString);
         var updatePasswordUrl = doc.DocumentNode.Descendants("form").Single().Attributes.AttributesWithName("action")
@@ -213,7 +215,7 @@ private async Task<string> UpdatePassword(string updatePasswordUrl, string usern
         string newPassword)
     {
         var uri = new UriBuilder($"{HttpUtility.HtmlDecode(updatePasswordUrl)}");
-        var request = new HttpRequestMessage(HttpMethod.Post, uri.Uri.AbsoluteUri);
+        using var request = new HttpRequestMessage(HttpMethod.Post, uri.Uri.AbsoluteUri);
         var formContent = new FormUrlEncodedContent(new[]
         {
             new KeyValuePair<string, string>("username", username),
@@ -227,7 +229,7 @@ private async Task<string> UpdatePassword(string updatePasswordUrl, string usern
         request.Headers.Add("Origin", "null");
         request.Content = formContent;
 
-        var response = await _client.SendAsync(request);
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
         var centralIdpUrl = response.Headers.Location?.AbsoluteUri;
         if (centralIdpUrl is null)
         {
@@ -239,7 +241,7 @@ private async Task<string> UpdatePassword(string updatePasswordUrl, string usern
 
     private async Task<string> GetTokenWithAuthCode(string authCode)
     {
-        var request = new HttpRequestMessage(HttpMethod.Post,
+        using var request = new HttpRequestMessage(HttpMethod.Post,
             $"{_baseCentralIdpUrl}/{_tokenCentralIdpEndpoint}");
         var formContent = new FormUrlEncodedContent(new[]
         {
@@ -255,8 +257,8 @@ private async Task<string> GetTokenWithAuthCode(string authCode)
         request.Headers.Add("Referer", TestResources.BasePortalUrl);
         request.Content = formContent;
 
-        var response = await _client.SendAsync(request);
-        var content = response.Content.ReadAsStringAsync().Result;
+        using var response = await _client.SendAsync(request).ConfigureAwait(false);
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var token = DataHandleHelper.DeserializeData<Token>(content)?.AccessToken;
         if (token is null)
         {
@@ -268,25 +270,25 @@ private async Task<string> GetTokenWithAuthCode(string authCode)
 
     public async Task<string> GetAccessToken(string username, string password)
     {
-        var companies = StartCentralIdp();
-        var sharedIdpCompanyUrl = await GetCompanySharedIdpUrl(companies);
-        var authUrlFromSharedIdp = await GetAuthUrlFromSharedIdp(sharedIdpCompanyUrl);
+        var companies = await StartCentralIdp().ConfigureAwait(false);
+        var sharedIdpCompanyUrl = await GetCompanySharedIdpUrl(companies).ConfigureAwait(false);
+        var authUrlFromSharedIdp = await GetAuthUrlFromSharedIdp(sharedIdpCompanyUrl).ConfigureAwait(false);
         var authenticateInCentralIdpUrl =
-            await AuthenticateInSharedIdp(authUrlFromSharedIdp, username, password);
-        var authCode = await GetAuthCodeFromCentralIdp(authenticateInCentralIdpUrl);
-        return await GetTokenWithAuthCode(authCode);
+            await AuthenticateInSharedIdp(authUrlFromSharedIdp, username, password).ConfigureAwait(false);
+        var authCode = await GetAuthCodeFromCentralIdp(authenticateInCentralIdpUrl).ConfigureAwait(false);
+        return await GetTokenWithAuthCode(authCode).ConfigureAwait(false);
     }
 
     public async Task<string> UpdatePasswordAndGetAccessToken(string username, string password, string newPassword)
     {
-        var companies = StartCentralIdp();
-        var sharedIdpCompanyUrl = await GetCompanySharedIdpUrl(companies);
-        var authUrlFromSharedIdp = await GetAuthUrlFromSharedIdp(sharedIdpCompanyUrl);
-        var forwardUpdatePasswordUrl = await AuthenticateInSharedIdp(authUrlFromSharedIdp, username, password);
-        var updatePasswordUrl = await GetUpdatePasswordUrl(forwardUpdatePasswordUrl);
+        var companies = await StartCentralIdp().ConfigureAwait(false);
+        var sharedIdpCompanyUrl = await GetCompanySharedIdpUrl(companies).ConfigureAwait(false);
+        var authUrlFromSharedIdp = await GetAuthUrlFromSharedIdp(sharedIdpCompanyUrl).ConfigureAwait(false);
+        var forwardUpdatePasswordUrl = await AuthenticateInSharedIdp(authUrlFromSharedIdp, username, password).ConfigureAwait(false);
+        var updatePasswordUrl = await GetUpdatePasswordUrl(forwardUpdatePasswordUrl).ConfigureAwait(false);
         var authenticateInCentralIdpUrl =
-            await UpdatePassword(updatePasswordUrl, username, password, newPassword);
-        var authCode = await GetAuthCodeFromCentralIdp(authenticateInCentralIdpUrl);
-        return await GetTokenWithAuthCode(authCode);
+            await UpdatePassword(updatePasswordUrl, username, password, newPassword).ConfigureAwait(false);
+        var authCode = await GetAuthCodeFromCentralIdp(authenticateInCentralIdpUrl).ConfigureAwait(false);
+        return await GetTokenWithAuthCode(authCode).ConfigureAwait(false);
     }
 }
diff --git a/tests/endtoend/AuthFlow/DevMailApiRequests.cs b/tests/endtoend/AuthFlow/DevMailApiRequests.cs
index 544c4c8fd3..5194a8bfda 100644
--- a/tests/endtoend/AuthFlow/DevMailApiRequests.cs
+++ b/tests/endtoend/AuthFlow/DevMailApiRequests.cs
@@ -31,16 +31,16 @@ public class DevMailApiRequests
 
     private DevMailboxData? _devMailboxData;
 
-    public string? FetchPassword()
+    public async Task<string?> FetchPassword()
     {
-        var emails = CheckMailbox();
+        var emails = await CheckMailbox().ConfigureAwait(false);
         var index = emails.Result.FindIndex(item => item.Value.Contains("Password required"));
         string? password = null;
 
         if (index < 0)
             throw new Exception("Authentication flow failed: email with password could not be found.");
         var byteArray = Encoding.ASCII.GetBytes(emails.Result[index].Value);
-        var stream = new MemoryStream(byteArray);
+        using var stream = new MemoryStream(byteArray);
         var message = MimeMessage.Load(stream);
 
         var doc = new HtmlDocument();
@@ -62,7 +62,7 @@ public class DevMailApiRequests
         return password;
     }
 
-    public DevMailboxData GenerateRandomEmailAddress()
+    public async Task<DevMailboxData> GenerateRandomEmailAddress()
     {
         const string Endpoint = "/mailbox";
         var data = Given()
@@ -74,7 +74,7 @@ public DevMailboxData GenerateRandomEmailAddress()
             .StatusCode(200)
             .Extract()
             .Response();
-        _devMailboxData = DataHandleHelper.DeserializeData<DevMailboxData>(data.Content.ReadAsStringAsync().Result);
+        _devMailboxData = DataHandleHelper.DeserializeData<DevMailboxData>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (_devMailboxData is null)
         {
             throw new Exception($"Could not get mail address from {Endpoint}, response was null/empty.");
@@ -82,7 +82,7 @@ public DevMailboxData GenerateRandomEmailAddress()
         return _devMailboxData;
     }
 
-    private DevMailboxContent CheckMailbox()
+    private async Task<DevMailboxContent> CheckMailbox()
     {
         var messageIds = GetMessageIds();
         var endpoint = $"/mailbox/{_devMailboxData?.Result.Name}/messages";
@@ -100,7 +100,7 @@ private DevMailboxContent CheckMailbox()
             .Extract()
             .Response();
 
-        var emails = DataHandleHelper.DeserializeData<DevMailboxContent>(data.Content.ReadAsStringAsync().Result);
+        var emails = DataHandleHelper.DeserializeData<DevMailboxContent>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (emails is null)
         {
             throw new Exception($"Could not mails from {endpoint}, response data was null.");
@@ -124,7 +124,7 @@ private void DeleteMailbox()
             .Body("$.result");
     }
 
-    private string[] GetMessageIds()
+    private async Task<string[]> GetMessageIds()
     {
         var endpoint = $"/mailbox/{_devMailboxData?.Result.Name}";
         var data = Given()
@@ -140,7 +140,7 @@ private string[] GetMessageIds()
             .Extract()
             .Response();
 
-        var messageIds = DataHandleHelper.DeserializeData<DevMailboxMessageIds>(data.Content.ReadAsStringAsync().Result);
+        var messageIds = DataHandleHelper.DeserializeData<DevMailboxMessageIds>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (messageIds is null)
         {
             throw new Exception($"Could not messageIds from {endpoint}, response data was null.");
diff --git a/tests/endtoend/AuthFlow/TempMailApiRequests.cs b/tests/endtoend/AuthFlow/TempMailApiRequests.cs
index e745df652d..07e4fc7a7f 100644
--- a/tests/endtoend/AuthFlow/TempMailApiRequests.cs
+++ b/tests/endtoend/AuthFlow/TempMailApiRequests.cs
@@ -33,9 +33,9 @@ public class TempMailApiRequests
 
     private readonly Secrets _secrets = new();
 
-    public string? FetchPassword()
+    public async Task<string?> FetchPassword()
     {
-        var passwordMessage = GetPasswordMessage();
+        var passwordMessage = await GetPasswordMessage().ConfigureAwait(false);
         string? password = null;
 
         if (passwordMessage == null)
@@ -59,9 +59,9 @@ public class TempMailApiRequests
         return password;
     }
 
-    private TempMailMessageData GetPasswordMessage()
+    private async Task<TempMailMessageData> GetPasswordMessage()
     {
-        var hashedEmailAddress = CreateMd5();
+        var hashedEmailAddress = await CreateMd5().ConfigureAwait(false);
         var endpoint = $"{EndPoint}/mail/id/{hashedEmailAddress}";
         var data = Given()
             .DisableSslCertificateValidation()
@@ -75,7 +75,7 @@ private TempMailMessageData GetPasswordMessage()
             .Extract()
             .Response();
         var messages =
-            DataHandleHelper.DeserializeData<List<TempMailMessageData>>(data.Content.ReadAsStringAsync().Result);
+            DataHandleHelper.DeserializeData<List<TempMailMessageData>>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (messages is null)
         {
             throw new Exception($"Could not get password message from {endpoint}, response was null/empty.");
@@ -84,7 +84,7 @@ private TempMailMessageData GetPasswordMessage()
         return passwordMessage;
     }
 
-    public string GetDomain()
+    public async Task<string> GetDomain()
     {
         var endpoint = $"{EndPoint}/domains";
         var response = Given()
@@ -99,7 +99,7 @@ public string GetDomain()
             .Extract()
             .Response();
 
-        var data = DataHandleHelper.DeserializeData<string[]>(response.Content.ReadAsStringAsync().Result);
+        var data = DataHandleHelper.DeserializeData<string[]>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (data is null || data.Length < 1)
         {
             throw new Exception($"Could not get domain from {endpoint}, response data was null.");
@@ -108,9 +108,9 @@ public string GetDomain()
     }
 
     //https://stackoverflow.com/questions/11454004/calculate-a-md5-hash-from-a-string
-    private string CreateMd5()
+    private async Task<string> CreateMd5()
     {
-        var emailAddress = ApiTestUsername + GetDomain();
+        var emailAddress = ApiTestUsername + await GetDomain().ConfigureAwait(false);
         using (var md5 = MD5.Create())
         {
             var inputBytes = Encoding.ASCII.GetBytes(emailAddress);
diff --git a/tests/endtoend/CreateAppScenario/CreateNewTestAppScenario.cs b/tests/endtoend/CreateAppScenario/CreateNewTestAppScenario.cs
index 61587ed8b0..442198b225 100644
--- a/tests/endtoend/CreateAppScenario/CreateNewTestAppScenario.cs
+++ b/tests/endtoend/CreateAppScenario/CreateNewTestAppScenario.cs
@@ -59,18 +59,18 @@ public async Task CreateAppRequest(TestDataModelCreateApp testEntry)
     {
         _portalUserToken = await new AuthFlow(_portalUserCompanyName).GetAccessToken(Secrets.PortalUserName,
             Secrets.PortalUserPassword);
-        var newAppRequest = GetAppRequestModel(testEntry.AppRequestModel);
+        var newAppRequest = await GetAppRequestModel(testEntry.AppRequestModel).ConfigureAwait(false);
 
-        var appId = CreateNewAppInStatusCreated(newAppRequest);
+        var appId = await CreateNewAppInStatusCreated(newAppRequest).ConfigureAwait(false);
         appId.Should().NotBeEmpty();
 
-        var appDetailWithStatus = GetAppDetailWithStatus(appId);
+        var appDetailWithStatus = await GetAppDetailWithStatus(appId).ConfigureAwait(false);
         ValidateStorageOfAppDetailData(newAppRequest, appDetailWithStatus).Should().BeTrue();
 
-        var agreementData = GetAgreementData();
+        var agreementData = await GetAgreementData().ConfigureAwait(false);
         var agreementDataIds = agreementData.Select(t => t.AgreementId).ToList();
 
-        var signedConsentStatusData = SignConsentAgreement(appId, agreementDataIds);
+        var signedConsentStatusData = await SignConsentAgreement(appId, agreementDataIds).ConfigureAwait(false);
 
         signedConsentStatusData.Should().AllSatisfy(x =>
         {
@@ -78,16 +78,16 @@ public async Task CreateAppRequest(TestDataModelCreateApp testEntry)
             agreementDataIds.Should().Contain(x.AgreementId);
         });
 
-        var uploadDocumentResult = UploadAppDocumentOrImage(appId, DocumentTypeId.CONFORMITY_APPROVAL_BUSINESS_APPS, testEntry.DocumentName);
+        var uploadDocumentResult = await UploadAppDocumentOrImage(appId, DocumentTypeId.CONFORMITY_APPROVAL_BUSINESS_APPS, testEntry.DocumentName).ConfigureAwait(false);
         uploadDocumentResult.Should().BeEmpty();
 
-        var uploadImageResult = UploadAppDocumentOrImage(appId, DocumentTypeId.APP_IMAGE, testEntry.ImageName);
+        var uploadImageResult = await UploadAppDocumentOrImage(appId, DocumentTypeId.APP_IMAGE, testEntry.ImageName).ConfigureAwait(false);
         uploadImageResult.Should().BeEmpty();
 
-        var uploadLeadImageResult = UploadAppDocumentOrImage(appId, DocumentTypeId.APP_LEADIMAGE, testEntry.ImageName);
+        var uploadLeadImageResult = await UploadAppDocumentOrImage(appId, DocumentTypeId.APP_LEADIMAGE, testEntry.ImageName).ConfigureAwait(false);
         uploadLeadImageResult.Should().BeEmpty();
 
-        var appRoleDatas = AddRoleAndRoleDescriptionForApp(appId, testEntry.AppUserRoles);
+        var appRoleDatas = await AddRoleAndRoleDescriptionForApp(appId, testEntry.AppUserRoles).ConfigureAwait(false);
         var appRoleDataNames = appRoleDatas.Select(data => data.RoleName);
 
         testEntry.AppUserRoles.Should().AllSatisfy(t =>
@@ -95,7 +95,7 @@ public async Task CreateAppRequest(TestDataModelCreateApp testEntry)
             appRoleDataNames.Should().Contain(t.Role);
         });
 
-        var technicalUserProfiles = GetTechnicalUserProfiles();
+        var technicalUserProfiles = await GetTechnicalUserProfiles().ConfigureAwait(false);
 
         var userRoleIds = technicalUserProfiles.Select(t => t.UserRoleId).ToList();
 
@@ -140,7 +140,7 @@ private static bool ValidateStorageOfAppDetailData(AppRequestModel newAppRequest
     #region Scenario functions
 
     //POST: /api/apps/appreleaseprocess/createapp
-    private string CreateNewAppInStatusCreated(AppRequestModel newAppRequest)
+    private async Task<string> CreateNewAppInStatusCreated(AppRequestModel newAppRequest)
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -156,18 +156,18 @@ private string CreateNewAppInStatusCreated(AppRequestModel newAppRequest)
             .Extract()
             .Response();
 
-        return response.Content.ReadAsStringAsync().Result.Replace("\"", "");
+        return (await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Replace("\"", "");
     }
 
-    private AppRequestModel GetAppRequestModel(AppRequestModel? testData)
+    private async Task<AppRequestModel> GetAppRequestModel(AppRequestModel? testData)
     {
         if (testData is null)
         {
             throw new Exception("No app request model in test data provided. Please check.");
         }
-        var privacyPolicies = GetAvailablePrivacyPolicies();
-        var languageTags = GetAppLanguageTags();
-        var useCases = GetUseCases();
+        var privacyPolicies = await GetAvailablePrivacyPolicies().ConfigureAwait(false);
+        var languageTags = await GetAppLanguageTags().ConfigureAwait(false);
+        var useCases = await GetUseCases().ConfigureAwait(false);
 
         if (languageTags.IsNullOrEmpty() || useCases.IsNullOrEmpty())
         {
@@ -192,7 +192,7 @@ private AppRequestModel GetAppRequestModel(AppRequestModel? testData)
     }
 
     //GET: /api/apps/appreleaseprocess/{appId}/appStatus
-    private AppProviderResponse? GetAppDetailWithStatus(string appId)
+    private async Task<AppProviderResponse?> GetAppDetailWithStatus(string appId)
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -206,12 +206,12 @@ private AppRequestModel GetAppRequestModel(AppRequestModel? testData)
             .StatusCode(200)
             .Extract()
             .Response();
-        return DataHandleHelper.DeserializeData<AppProviderResponse>(response.Content.ReadAsStringAsync().Result);
+        return DataHandleHelper.DeserializeData<AppProviderResponse>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
     }
 
     //POST: /api/apps/appreleaseprocess/consent/{appId}/agreementConsents - sign the agreements
 
-    private List<ConsentStatusData> SignConsentAgreement(string appId, List<Guid> consentAgreementIds)
+    private async Task<List<ConsentStatusData>> SignConsentAgreement(string appId, List<Guid> consentAgreementIds)
     {
         var agreementConsentStatuses = consentAgreementIds
             .Select(agr => new AgreementConsentStatus(agr, ConsentStatusId.ACTIVE)).ToList();
@@ -231,7 +231,7 @@ private List<ConsentStatusData> SignConsentAgreement(string appId, List<Guid> co
             .StatusCode(200)
             .Extract()
             .Response();
-        var signConsentAgreement = DataHandleHelper.DeserializeData<List<ConsentStatusData>>(response.Content.ReadAsStringAsync().Result);
+        var signConsentAgreement = DataHandleHelper.DeserializeData<List<ConsentStatusData>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (signConsentAgreement == null)
             throw new Exception($"Could not fetch consent status data from {endpoint}");
         return signConsentAgreement;
@@ -239,7 +239,7 @@ private List<ConsentStatusData> SignConsentAgreement(string appId, List<Guid> co
 
     //PUT: /api/apps/AppReleaseProcess/updateappdoc/{appId}/documentType/{documentType}/documents
 
-    private string UploadAppDocumentOrImage(string appId, DocumentTypeId documentType, string documentOrImageName)
+    private Task<string> UploadAppDocumentOrImage(string appId, DocumentTypeId documentType, string documentOrImageName)
     {
         documentOrImageName.Should().NotBeNullOrEmpty($"No document with type {documentType} provided, but required for tests case.");
 
@@ -257,12 +257,12 @@ private string UploadAppDocumentOrImage(string appId, DocumentTypeId documentTyp
             .StatusCode(204)
             .Extract()
             .Response();
-        return response.Content.ReadAsStringAsync().Result;
+        return response.Content.ReadAsStringAsync();
     }
 
     //POST: /api/apps/appreleaseprocess/{appId}/role
 
-    private List<AppRoleData> AddRoleAndRoleDescriptionForApp(string appId, List<AppUserRole> appUserRoles)
+    private async Task<List<AppRoleData>> AddRoleAndRoleDescriptionForApp(string appId, List<AppUserRole> appUserRoles)
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -277,7 +277,7 @@ private List<AppRoleData> AddRoleAndRoleDescriptionForApp(string appId, List<App
             .StatusCode(200)
             .Extract()
             .Response();
-        return DataHandleHelper.DeserializeData<List<AppRoleData>>(response.Content.ReadAsStringAsync().Result) ?? new List<AppRoleData>();
+        return DataHandleHelper.DeserializeData<List<AppRoleData>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)) ?? new List<AppRoleData>();
     }
 
     //PUT: /api/apps/appreleaseprocess/{appId}/technical-user-profiles - select the technical user profile - important keep the uuid of the technical user inside the request body empty
@@ -325,7 +325,7 @@ private void SubmitApp(string appId)
 
     //GET: /api/apps/appreleaseprocess/privacyPolicies - get a list of available privacyPolicies (needed for the POST call /createapp)
 
-    private PrivacyPolicyData GetAvailablePrivacyPolicies()
+    private async Task<PrivacyPolicyData> GetAvailablePrivacyPolicies()
     {
         var endpoint = $"{EndPoint}/appreleaseprocess/privacyPolicies";
         var response = Given()
@@ -340,7 +340,7 @@ private PrivacyPolicyData GetAvailablePrivacyPolicies()
             .StatusCode(200)
             .Extract()
             .Response();
-        var availablePrivacyPolicies = DataHandleHelper.DeserializeData<PrivacyPolicyData>(response.Content.ReadAsStringAsync().Result);
+        var availablePrivacyPolicies = DataHandleHelper.DeserializeData<PrivacyPolicyData>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (availablePrivacyPolicies is null)
         {
             throw new Exception($"Cannot create app request model as privacy policies cannot be fetched from {endpoint}.");
@@ -350,7 +350,7 @@ private PrivacyPolicyData GetAvailablePrivacyPolicies()
 
     //GET: /api/administration/staticdata/languagetags - get a list of available language tags (needed for the POST call /createapp)
 
-    private List<LanguageData> GetAppLanguageTags()
+    private async Task<List<LanguageData>> GetAppLanguageTags()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -365,11 +365,11 @@ private List<LanguageData> GetAppLanguageTags()
             .Extract()
             .Response();
 
-        return DataHandleHelper.DeserializeData<List<LanguageData>>(response.Content.ReadAsStringAsync().Result) ?? new List<LanguageData>();
+        return DataHandleHelper.DeserializeData<List<LanguageData>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)) ?? new List<LanguageData>();
     }
 
     //GET: /api/administration/staticdata/usecases - get a list of available language tags (needed for the POST call /createapp)
-    private List<UseCaseData> GetUseCases()
+    private async Task<List<UseCaseData>> GetUseCases()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -384,12 +384,12 @@ private List<UseCaseData> GetUseCases()
             .Extract()
             .Response();
 
-        return DataHandleHelper.DeserializeData<List<UseCaseData>>(response.Content.ReadAsStringAsync().Result) ?? new List<UseCaseData>();
+        return DataHandleHelper.DeserializeData<List<UseCaseData>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)) ?? new List<UseCaseData>();
     }
 
     //GET: /api/apps/appreleaseprocess/agreementData - get a list of agreements (need to get signed as part of the POST /agreementConsents call)
 
-    private List<AgreementDocumentData> GetAgreementData()
+    private async Task<List<AgreementDocumentData>> GetAgreementData()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -403,11 +403,11 @@ private List<AgreementDocumentData> GetAgreementData()
             .StatusCode(200)
             .Extract()
             .Response();
-        return DataHandleHelper.DeserializeData<List<AgreementDocumentData>>(response.Content.ReadAsStringAsync().Result) ?? new List<AgreementDocumentData>();
+        return DataHandleHelper.DeserializeData<List<AgreementDocumentData>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)) ?? new List<AgreementDocumentData>();
     }
 
     //GET: api/administration/serviceaccount/user/roles - get a list of technical user profiles (needed for the POST call /technical-user-profiles)
-    private List<UserRoleWithDescription> GetTechnicalUserProfiles()
+    private async Task<List<UserRoleWithDescription>> GetTechnicalUserProfiles()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -422,7 +422,7 @@ private List<UserRoleWithDescription> GetTechnicalUserProfiles()
             .Extract()
             .Response();
 
-        return DataHandleHelper.DeserializeData<List<UserRoleWithDescription>>(response.Content.ReadAsStringAsync().Result) ?? new List<UserRoleWithDescription>();
+        return DataHandleHelper.DeserializeData<List<UserRoleWithDescription>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)) ?? new List<UserRoleWithDescription>();
     }
 
     #endregion
diff --git a/tests/endtoend/InterfacePartnerHealthCheck/ClearinghouseEndToEndTests.cs b/tests/endtoend/InterfacePartnerHealthCheck/ClearinghouseEndToEndTests.cs
index 606f73cedf..a508177d4e 100644
--- a/tests/endtoend/InterfacePartnerHealthCheck/ClearinghouseEndToEndTests.cs
+++ b/tests/endtoend/InterfacePartnerHealthCheck/ClearinghouseEndToEndTests.cs
@@ -44,7 +44,7 @@ public ClearinghouseEndToEndTests(ITestOutputHelper output) : base(output)
     }
 
     [Fact]
-    public void ClearinghouseInterface_HealthCheck()
+    public async Task ClearinghouseInterface_HealthCheck()
     {
         ClearingHouseUserToken =
             TechTokenRetriever.GetToken(BaseTokenUrl,
@@ -80,6 +80,7 @@ public void ClearinghouseInterface_HealthCheck()
             .StatusCode(200)
             .Extract()
             .Response();
-        data.Content.ReadAsStringAsync().Result.Should().NotBeNullOrEmpty("Response should not be null or empty");
+        var result = await data.Content.ReadAsStringAsync().ConfigureAwait(false);
+        result.Should().NotBeNullOrEmpty("Response should not be null or empty");
     }
 }
diff --git a/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs b/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs
index 6818a267a7..be40e66cb2 100644
--- a/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs
+++ b/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs
@@ -35,31 +35,31 @@ public class WalletEndpointTests : EndToEndTestBase
         TestResources.BaseCentralIdpUrl + "/auth/realms/CX-Central/protocol/openid-connect/token";
 
     private const string WalletEndPoint = "/api/wallets";
-    private static string? InterfaceHealthCheckTechUserToken;
-    private static string? Bpn;
+    private readonly string InterfaceHealthCheckTechUserToken;
+    private string? Bpn;
 
     private static readonly Secrets Secrets = new();
 
     public WalletEndpointTests(ITestOutputHelper output) : base(output)
     {
+        InterfaceHealthCheckTechUserToken = TechTokenRetriever.GetToken(TokenUrl, Secrets.InterfaceHealthCheckTechClientId, Secrets.InterfaceHealthCheckTechClientSecret);
+        if (InterfaceHealthCheckTechUserToken.IsNullOrEmpty())
+            throw new Exception("Could not fetch token for interface partner health check");
     }
 
     [Fact]
-    public void WalletCreationInterface_CreateAndDuplicationCheck()
+    public async Task WalletCreationInterface_CreateAndDuplicationCheck()
     {
         Bpn = $"BPNLTEST{DateTime.Now:DDhhmmss}";
-        InterfaceHealthCheckTechUserToken = TechTokenRetriever.GetToken(TokenUrl, Secrets.InterfaceHealthCheckTechClientId, Secrets.InterfaceHealthCheckTechClientSecret);
-        if (InterfaceHealthCheckTechUserToken.IsNullOrEmpty())
-            throw new Exception("Could not fetch token for interface partner health check");
         GetListOfWallets();
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
         CreateWallet(201);
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
         CreateWallet(409);
     }
 
     //GET: /api/wallets
-    private static void GetListOfWallets()
+    private void GetListOfWallets()
     {
         Given()
              .DisableSslCertificateValidation()
@@ -74,7 +74,7 @@ private static void GetListOfWallets()
     }
 
     //POST: /api/wallets
-    private static void CreateWallet(int statusCode)
+    private void CreateWallet(int statusCode)
     {
         Given()
             .DisableSslCertificateValidation()
diff --git a/tests/endtoend/NotificationInitScenario/ModifyCoreUserRoleScenario.cs b/tests/endtoend/NotificationInitScenario/ModifyCoreUserRoleScenario.cs
index cfd1202c9c..ae4e601597 100644
--- a/tests/endtoend/NotificationInitScenario/ModifyCoreUserRoleScenario.cs
+++ b/tests/endtoend/NotificationInitScenario/ModifyCoreUserRoleScenario.cs
@@ -51,13 +51,13 @@ public ModifyCoreUserRoleScenario(ITestOutputHelper output) : base(output)
     public async Task Scenario_HappyPath_AssignAndUnassignCoreUserRoles()
     {
         await GetPortalUserToken();
-        _companyUserId = GetCompanyUserId();
+        _companyUserId = await GetCompanyUserId().ConfigureAwait(false);
 
         _portalUserToken = await new AuthFlow(_portalUserCompanyName).GetAccessToken(Secrets.PortalUserName,
             Secrets.PortalUserPassword);
 
-        var assignedRoles = GetUserAssignedRoles();
-        var roleToModify = GetRandomRoleToModify(assignedRoles);
+        var assignedRoles = await GetUserAssignedRoles().ConfigureAwait(false);
+        var roleToModify = await GetRandomRoleToModify(assignedRoles).ConfigureAwait(false);
 
         ModifyCoreUserRoles_AssignRole(assignedRoles, roleToModify);
         var notificationAddContent = GetNotificationCreated(NotificationTypeId.ROLE_UPDATE_CORE_OFFER);
@@ -82,11 +82,11 @@ private async Task GetPortalUserToken()
     }
 
     //GET: api/administration/user/owncompany/roles/coreoffers
-    private string GetRandomRoleToModify(List<string> assignedRoles)
+    private async Task<string> GetRandomRoleToModify(List<string> assignedRoles)
     {
         var newRoles = new List<string>();
 
-        var existingRoles = GetCoreOfferRolesNames();
+        var existingRoles = await GetCoreOfferRolesNames().ConfigureAwait(false);
         foreach (var t in existingRoles)
         {
             newRoles.AddRange(from t1 in assignedRoles where t != t1 select t);
@@ -95,7 +95,7 @@ private string GetRandomRoleToModify(List<string> assignedRoles)
         return newRoles.ElementAt(new Random().Next(0, newRoles.Count - 1));
     }
 
-    private List<string> GetCoreOfferRolesNames()
+    private async Task<List<string>> GetCoreOfferRolesNames()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -111,7 +111,7 @@ private List<string> GetCoreOfferRolesNames()
             .Extract()
             .Response();
 
-        var data = DataHandleHelper.DeserializeData<List<OfferRoleInfos>>(response.Content.ReadAsStringAsync().Result);
+        var data = DataHandleHelper.DeserializeData<List<OfferRoleInfos>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (data == null)
             throw new Exception("Cannot fetch core user roles");
         var roleNames = new List<string>();
@@ -168,7 +168,7 @@ private void ModifyCoreUserRoles_UnAssignRole(List<string> assignedRoles, string
     }
 
     //GET: api/administration/user/ownUser
-    private string GetCompanyUserId()
+    private async Task<string> GetCompanyUserId()
     {
         var endpoint = $"{AdminEndPoint}/user/ownUser";
         var response = Given()
@@ -185,7 +185,7 @@ private string GetCompanyUserId()
             .Extract()
             .Response();
 
-        var data = response.Content.ReadAsStringAsync().Result;
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var companyUserDetails = DataHandleHelper.DeserializeData<CompanyUserDetails>(data);
         if (companyUserDetails is null)
         {
@@ -204,7 +204,7 @@ private string GetCompanyUserId()
     }
 
     //GET: api/administration/user/owncompany/users/{_companyUserId}
-    private List<string> GetUserAssignedRoles()
+    private async Task<List<string>> GetUserAssignedRoles()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -219,7 +219,7 @@ private List<string> GetUserAssignedRoles()
             .And()
             .Extract()
             .Response();
-        var data = response.Content.ReadAsStringAsync().Result;
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var assignedRoles = DataHandleHelper.DeserializeData<CompanyUserDetails>(data)?.AssignedRoles.First().UserRoles
             .ToList();
         return assignedRoles ?? new List<string>();
@@ -252,6 +252,5 @@ private List<string> GetUserAssignedRoles()
         }
         data.First().TypeId.Should().Be(notificationTypeId);
         return DataHandleHelper.DeserializeData<NotificationContent>(content);
-
     }
 }
diff --git a/tests/endtoend/PortalHealthCheck/BaseDataLoadCheck.cs b/tests/endtoend/PortalHealthCheck/BaseDataLoadCheck.cs
index 24e67f8236..a5aeff0399 100644
--- a/tests/endtoend/PortalHealthCheck/BaseDataLoadCheck.cs
+++ b/tests/endtoend/PortalHealthCheck/BaseDataLoadCheck.cs
@@ -17,7 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Castle.Core.Internal;
 using FluentAssertions;
 using RestAssured.Response.Logging;
 using Xunit;
@@ -29,40 +28,38 @@ namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
 [Trait("Category", "PortalHC")]
 [TestCaseOrderer("Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests.AlphabeticalOrderer", "EndToEnd.Tests")]
 [Collection("PortalHC")]
-public class BaseDataLoadCheck : EndToEndTestBase
+public class BaseDataLoadCheck : EndToEndTestBase, IAsyncLifetime
 {
     private const string EndPoint = "/api/administration";
 
     private static readonly string BaseUrl = TestResources.BasePortalBackendUrl;
     private static readonly Secrets Secrets = new();
-    private static string? PortalUserToken;
     private static readonly string PortalUserCompanyName = TestResources.PortalUserCompanyName;
+    private string? _portalUserToken;
 
     public BaseDataLoadCheck(ITestOutputHelper output) : base(output)
     {
     }
 
-    [Fact]
-    public async Task GetAccessToken() // in order to just get token once, ensure that method name is alphabetically before other tests cases
+    public async Task InitializeAsync()
     {
-        PortalUserToken = await new AuthFlow(PortalUserCompanyName).GetAccessToken(Secrets.PortalUserName,
+        _portalUserToken = await new AuthFlow(PortalUserCompanyName).GetAccessToken(Secrets.PortalUserName,
             Secrets.PortalUserPassword);
-
-        PortalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
     }
 
+    public Task DisposeAsync() => Task.CompletedTask;
+
     // GET: /api/administration/staticdata/usecases
     [Fact]
     public async Task GetUseCaseData()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken();
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{BaseUrl}{EndPoint}/staticdata/usecases")
             .Then()
@@ -71,21 +68,22 @@ public async Task GetUseCaseData()
             .Extract()
             .Response();
 
-        response.Content.ReadAsStringAsync().Result.Should().NotBeNullOrEmpty("Error: Response body is null or empty");
+        var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+        result.Should().NotBeNullOrEmpty("Error: Response body is null or empty");
     }
 
     //     GET: /api/administration/staticdata/languagetags
     [Fact]
     public async Task GetAppLanguageTags()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken();
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{BaseUrl}{EndPoint}/staticdata/languagetags")
             .Then()
@@ -94,21 +92,21 @@ public async Task GetAppLanguageTags()
             .Extract()
             .Response();
 
-        response.Content.ReadAsStringAsync().Result.Should().NotBeNullOrEmpty("Response body is null or empty");
+        var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        result.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 
     //     GET: /api/administration/staticdata/licenseType
     [Fact]
     public async Task GetAllLicenseTypes()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken();
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{BaseUrl}{EndPoint}/staticdata/licenseType")
             .Then()
@@ -117,21 +115,21 @@ public async Task GetAllLicenseTypes()
             .Extract()
             .Response();
 
-        response.Content.ReadAsStringAsync().Result.Should().NotBeNullOrEmpty("Response body is null or empty");
+        var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        result.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 
     //     GET: api/administration/user/owncompany/users
     [Fact]
     public async Task GetCompanyUserData()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken();
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{BaseUrl}{EndPoint}/user/owncompany/users?page=0&size=5")
             .Then()
@@ -140,21 +138,21 @@ public async Task GetCompanyUserData()
             .Extract()
             .Response();
 
-        response.Content.ReadAsStringAsync().Result.Should().NotBeNullOrEmpty("Response body is null or empty");
+        var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        result.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 
     //     GET: api/administration/companydata/ownCompanyDetails
     [Fact]
     public async Task GetOwnCompanyDetails()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken();
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{BaseUrl}{EndPoint}/companydata/ownCompanyDetails")
             .Then()
@@ -163,6 +161,7 @@ public async Task GetOwnCompanyDetails()
             .Extract()
             .Response();
 
-        response.Content.ReadAsStringAsync().Result.Should().NotBeNullOrEmpty("Response body is null or empty");
+        var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        result.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 }
diff --git a/tests/endtoend/PortalHealthCheck/RegistrationHealthCheck.cs b/tests/endtoend/PortalHealthCheck/RegistrationHealthCheck.cs
index 2a64b6ed3b..9495a0bad2 100644
--- a/tests/endtoend/PortalHealthCheck/RegistrationHealthCheck.cs
+++ b/tests/endtoend/PortalHealthCheck/RegistrationHealthCheck.cs
@@ -17,7 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Castle.Core.Internal;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -28,12 +27,12 @@ namespace Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests;
 [Trait("Category", "PortalHC")]
 [TestCaseOrderer("Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests.AlphabeticalOrderer", "EndToEnd.Tests")]
 [Collection("PortalHC")]
-public class RegistrationHealthCheck : EndToEndTestBase
+public class RegistrationHealthCheck : EndToEndTestBase, IAsyncLifetime
 {
     private readonly string _baseUrl = TestResources.BasePortalBackendUrl;
     private readonly string _endPoint = "/api/registration";
     private readonly string _portalUserCompanyName = TestResources.PortalUserCompanyName;
-    private static string? PortalUserToken;
+    private string? _portalUserToken;
 
     private static readonly Secrets Secrets = new();
 
@@ -41,47 +40,45 @@ public RegistrationHealthCheck(ITestOutputHelper output) : base(output)
     {
     }
 
-    [Fact]
-    public async Task GetAccessToken() // in order to just get token once, ensure that method name is alphabetically before other tests cases
+    public async Task InitializeAsync()
     {
-        PortalUserToken = await new AuthFlow(_portalUserCompanyName).GetAccessToken(Secrets.PortalUserName,
+        _portalUserToken = await new AuthFlow(_portalUserCompanyName).GetAccessToken(Secrets.PortalUserName,
             Secrets.PortalUserPassword);
-
-        PortalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
     }
 
+    public Task DisposeAsync() => Task.CompletedTask;
+
     [Fact]
     public async Task GetCompanyRoles()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken().ConfigureAwait(false);
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{_baseUrl}{_endPoint}/company/companyRoles")
             .Then()
             .StatusCode(200)
             .Extract()
             .Response();
-        var data = response.Content.ReadAsStringAsync().Result;
+
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         data.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 
     [Fact]
     public async Task GetCompanyRoleAgreementData()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken().ConfigureAwait(false);
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{_baseUrl}{_endPoint}/companyRoleAgreementData")
             .Then()
@@ -89,48 +86,48 @@ public async Task GetCompanyRoleAgreementData()
             .Extract()
             .Response();
 
-        var data = response.Content.ReadAsStringAsync().Result;
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         data.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 
     [Fact]
     public async Task GetClientRolesComposite()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken().ConfigureAwait(false);
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{_baseUrl}{_endPoint}/rolesComposite")
             .Then()
             .StatusCode(200)
             .Extract()
             .Response();
-        var data = response.Content.ReadAsStringAsync().Result;
+
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         data.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 
     [Fact]
     public async Task GetApplicationsWithStatus()
     {
-        if (PortalUserToken.IsNullOrEmpty())
-            await GetAccessToken().ConfigureAwait(false);
+        _portalUserToken.Should().NotBeNullOrEmpty("Token for the portal user could not be fetched correctly");
 
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
                 "authorization",
-                $"Bearer {PortalUserToken}")
+                $"Bearer {_portalUserToken}")
             .When()
             .Get($"{_baseUrl}{_endPoint}/applications")
             .Then()
             .StatusCode(200)
             .Extract().Response();
-        var data = response.Content.ReadAsStringAsync().Result;
+
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         data.Should().NotBeNullOrEmpty("Response body is null or empty");
     }
 }
diff --git a/tests/endtoend/RegistrationScenarios/RegistrationEndpointHelper.cs b/tests/endtoend/RegistrationScenarios/RegistrationEndpointHelper.cs
index 29a0dd6dd3..d4119cfc5c 100644
--- a/tests/endtoend/RegistrationScenarios/RegistrationEndpointHelper.cs
+++ b/tests/endtoend/RegistrationScenarios/RegistrationEndpointHelper.cs
@@ -65,7 +65,7 @@ public static async Task<string> GetBpn()
                 .Extract()
                 .Response();
 
-        var bpdmLegalEntityDatas = DataHandleHelper.DeserializeData<BpdmPaginationContent>(data.Content.ReadAsStringAsync().Result);
+        var bpdmLegalEntityDatas = DataHandleHelper.DeserializeData<BpdmPaginationContent>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (bpdmLegalEntityDatas is null)
         {
             throw new Exception($"Could not get bpn from {endpoint} should not be null.");
@@ -75,7 +75,7 @@ public static async Task<string> GetBpn()
     }
 
     //GET /api/registration/legalEntityAddress/{bpn}
-    public static CompanyDetailData GetCompanyBpdmDetailData(string bpn)
+    public static async Task<CompanyDetailData> GetCompanyBpdmDetailData(string bpn)
     {
         // Given
         var endpoint = $"{EndPoint}/legalEntityAddress/{bpn}";
@@ -91,7 +91,7 @@ public static CompanyDetailData GetCompanyBpdmDetailData(string bpn)
             .And()
             .Extract()
             .Response();
-        var bpdmDetailData = DataHandleHelper.DeserializeData<CompanyDetailData>(data.Content.ReadAsStringAsync().Result);
+        var bpdmDetailData = DataHandleHelper.DeserializeData<CompanyDetailData>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (bpdmDetailData is null)
         {
             throw new Exception($"Could not get bpdm detail data from {endpoint} should not be null.");
@@ -100,7 +100,7 @@ public static CompanyDetailData GetCompanyBpdmDetailData(string bpn)
         return bpdmDetailData;
     }
 
-    public static CompanyDetailData GetCompanyDetailData()
+    public static async Task<CompanyDetailData> GetCompanyDetailData()
     {
         // Given
         var response = Given()
@@ -116,7 +116,7 @@ public static CompanyDetailData GetCompanyDetailData()
             .StatusCode(200)
             .Extract()
             .Response();
-        var data = response.Content.ReadAsStringAsync().Result;
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var companyDetailData = DataHandleHelper.DeserializeData<CompanyDetailData>(data);
         if (companyDetailData is null)
         {
@@ -126,18 +126,16 @@ public static CompanyDetailData GetCompanyDetailData()
         return companyDetailData;
     }
 
-    private static CompanyRoleAgreementConsents GetCompanyRolesAndConsentsForSelectedRoles(
+    private static async Task<CompanyRoleAgreementConsents> GetCompanyRolesAndConsentsForSelectedRoles(
         List<CompanyRoleId> companyRoleIds)
     {
-        var companyRoleAgreementData = GetCompanyRoleAgreementData();
+        var companyRoleAgreementData = await GetCompanyRoleAgreementData().ConfigureAwait(false);
         var selectedCompanyRoleIds = new List<CompanyRoleId>();
 
         var agreementConsentStatusList = new List<AgreementConsentStatus>();
 
-        foreach (var roleData in companyRoleAgreementData.CompanyRoleData)
+        foreach (var roleData in companyRoleAgreementData.CompanyRoleData.IntersectBy(companyRoleIds, x => x.CompanyRoleId))
         {
-            if (!companyRoleIds.Contains(roleData.CompanyRoleId))
-                continue;
             selectedCompanyRoleIds.Add(roleData.CompanyRoleId);
             agreementConsentStatusList.AddRange(
                 roleData.AgreementIds.Select(id => new AgreementConsentStatus(id, ConsentStatusId.ACTIVE)));
@@ -146,7 +144,7 @@ private static CompanyRoleAgreementConsents GetCompanyRolesAndConsentsForSelecte
         return new CompanyRoleAgreementConsents(selectedCompanyRoleIds, agreementConsentStatusList);
     }
 
-    private static void SetApplicationStatus(string applicationStatus)
+    private static async Task SetApplicationStatus(string applicationStatus)
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -163,11 +161,11 @@ private static void SetApplicationStatus(string applicationStatus)
             .Extract()
             .Response();
 
-        var status = DataHandleHelper.DeserializeData<int>(response.Content.ReadAsStringAsync().Result);
+        var status = DataHandleHelper.DeserializeData<int>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         status.Should().Be(1);
     }
 
-    private static string GetApplicationStatus()
+    private static async Task<string> GetApplicationStatus()
     {
         var endpoint = $"{EndPoint}/application/{_applicationId}/status";
         var data = Given()
@@ -183,7 +181,7 @@ private static string GetApplicationStatus()
             .StatusCode(200)
             .Extract()
             .Response();
-        var applicationStatus = DataHandleHelper.DeserializeData<string>(data.Content.ReadAsStringAsync().Result);
+        var applicationStatus = DataHandleHelper.DeserializeData<string>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (applicationStatus is null)
         {
             throw new Exception($"Could not get application status from {endpoint}, response was null/empty.");
@@ -191,7 +189,7 @@ private static string GetApplicationStatus()
         return applicationStatus;
     }
 
-    private static List<InvitedUser> GetInvitedUsers()
+    private static async Task<List<InvitedUser>> GetInvitedUsers()
     {
         var data = Given()
             .DisableSslCertificateValidation()
@@ -206,7 +204,7 @@ private static List<InvitedUser> GetInvitedUsers()
             .Extract()
             .Response();
 
-        var invitedUsers = DataHandleHelper.DeserializeData<List<InvitedUser>>(data.Content.ReadAsStringAsync().Result);
+        var invitedUsers = DataHandleHelper.DeserializeData<List<InvitedUser>>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         return invitedUsers ?? new List<InvitedUser>();
     }
 
@@ -218,14 +216,14 @@ private static List<InvitedUser> GetInvitedUsers()
         var tempMailApiRequests = new TempMailApiRequests();
         try
         {
-            var devUser = devMailApiRequests.GenerateRandomEmailAddress();
+            var devUser = await devMailApiRequests.GenerateRandomEmailAddress().ConfigureAwait(false);
             emailAddress = devUser.Result.Name + "@developermail.com";
         }
         catch (Exception)
         {
             try
             {
-                emailAddress = "apitestuser" + tempMailApiRequests.GetDomain();
+                emailAddress = "apitestuser" + await tempMailApiRequests.GetDomain().ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -234,14 +232,14 @@ private static List<InvitedUser> GetInvitedUsers()
         }
         finally
         {
-            Thread.Sleep(20000);
+            await Task.Delay(20000).ConfigureAwait(false);
             await ExecuteInvitation(emailAddress, userCompanyName);
 
-            Thread.Sleep(60000);
+            await Task.Delay(60000).ConfigureAwait(false);
 
             var currentPassword = emailAddress.Contains("developermail.com")
-                ? devMailApiRequests.FetchPassword()
-                : tempMailApiRequests.FetchPassword();
+                ? await devMailApiRequests.FetchPassword().ConfigureAwait(false)
+                : await tempMailApiRequests.FetchPassword().ConfigureAwait(false);
 
             if (currentPassword is null)
             {
@@ -258,15 +256,15 @@ private static List<InvitedUser> GetInvitedUsers()
 
     // POST /api/registration/application/{applicationId}/companyDetailsWithAddress
 
-    public static CompanyDetailData SetCompanyDetailData(CompanyDetailData? testCompanyDetailData)
+    public static async Task<CompanyDetailData> SetCompanyDetailData(CompanyDetailData? testCompanyDetailData)
     {
         if (testCompanyDetailData is null)
             throw new Exception("Company detail data expected but not provided");
-        var applicationStatus = GetApplicationStatus();
+        var applicationStatus = await GetApplicationStatus().ConfigureAwait(false);
         if (applicationStatus != CompanyApplicationStatusId.CREATED.ToString())
             throw new Exception("Application status is not fitting to the pre-requisite");
-        SetApplicationStatus(CompanyApplicationStatusId.ADD_COMPANY_DATA.ToString());
-        var companyDetailData = GetCompanyDetailData();
+        await SetApplicationStatus(CompanyApplicationStatusId.ADD_COMPANY_DATA.ToString()).ConfigureAwait(false);
+        var companyDetailData = await GetCompanyDetailData().ConfigureAwait(false);
 
         var newCompanyDetailData = testCompanyDetailData with
         {
@@ -288,19 +286,19 @@ public static CompanyDetailData SetCompanyDetailData(CompanyDetailData? testComp
             .Then()
             .Log(ResponseLogLevel.OnError)
             .StatusCode(200);
-        var storedCompanyDetailData = GetCompanyDetailData();
+        var storedCompanyDetailData = await GetCompanyDetailData().ConfigureAwait(false);
         if (!VerifyCompanyDetailDataStorage(storedCompanyDetailData, newCompanyDetailData))
             throw new Exception($"Company detail data was not stored correctly");
         return storedCompanyDetailData;
     }
 
-    public static void UpdateCompanyDetailData(CompanyDetailData updateCompanyDetailData)
+    public static async Task UpdateCompanyDetailData(CompanyDetailData updateCompanyDetailData)
     {
-        var actualStatus = GetApplicationStatus();
+        var actualStatus = await GetApplicationStatus().ConfigureAwait(false);
         if (actualStatus != CompanyApplicationStatusId.ADD_COMPANY_DATA.ToString() &&
             actualStatus != CompanyApplicationStatusId.SUBMITTED.ToString())
         {
-            var companyDetailData = GetCompanyDetailData();
+            var companyDetailData = await GetCompanyDetailData().ConfigureAwait(false);
 
             var newCompanyDetailData = updateCompanyDetailData with { CompanyId = companyDetailData.CompanyId };
             var body = DataHandleHelper.SerializeData(newCompanyDetailData);
@@ -317,7 +315,7 @@ public static void UpdateCompanyDetailData(CompanyDetailData updateCompanyDetail
                 .Then()
                 .Log(ResponseLogLevel.OnError)
                 .StatusCode(200);
-            var storedCompanyDetailData = GetCompanyDetailData();
+            var storedCompanyDetailData = await GetCompanyDetailData().ConfigureAwait(false);
             if (!VerifyCompanyDetailDataStorage(storedCompanyDetailData, newCompanyDetailData))
                 throw new Exception($"Company detail data was not updated correctly");
         }
@@ -329,16 +327,16 @@ public static void UpdateCompanyDetailData(CompanyDetailData updateCompanyDetail
 
     // POST /api/registration/application/{applicationId}/companyRoleAgreementConsents
 
-    public static string SubmitCompanyRoleConsentToAgreements(List<CompanyRoleId> companyRoles)
+    public static async Task<string> SubmitCompanyRoleConsentToAgreements(List<CompanyRoleId> companyRoles)
     {
-        if (GetApplicationStatus() != CompanyApplicationStatusId.INVITE_USER.ToString())
+        if ((await GetApplicationStatus().ConfigureAwait(false)) != CompanyApplicationStatusId.INVITE_USER.ToString())
             throw new Exception("Application status is not fitting to the pre-requisite");
         if (companyRoles.IsNullOrEmpty())
             throw new Exception("No company roles were found");
-        var companyRoleAgreementConsents = GetCompanyRolesAndConsentsForSelectedRoles(companyRoles);
+        var companyRoleAgreementConsents = await GetCompanyRolesAndConsentsForSelectedRoles(companyRoles).ConfigureAwait(false);
         var body = DataHandleHelper.SerializeData(companyRoleAgreementConsents);
 
-        SetApplicationStatus(CompanyApplicationStatusId.SELECT_COMPANY_ROLE.ToString());
+        await SetApplicationStatus(CompanyApplicationStatusId.SELECT_COMPANY_ROLE.ToString()).ConfigureAwait(false);
         var response = Given()
             .DisableSslCertificateValidation()
             .Header(
@@ -354,17 +352,17 @@ public static string SubmitCompanyRoleConsentToAgreements(List<CompanyRoleId> co
             .Extract()
             .Response();
 
-        var result = DataHandleHelper.DeserializeData<int>(response.Content.ReadAsStringAsync().Result).ToString();
+        var result = DataHandleHelper.DeserializeData<int>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).ToString();
         return result;
     }
 
     // POST /api/registration/application/{applicationId}/documentType/{documentTypeId}/documents
 
-    public static void UploadDocument_WithEmptyTitle(string? documentTypeId, string? documentName)
+    public static async Task UploadDocument_WithEmptyTitle(string? documentTypeId, string? documentName)
     {
         if (documentTypeId is null || documentName is null)
             throw new Exception("No document type id or name provided but expected");
-        if (GetApplicationStatus() != CompanyApplicationStatusId.UPLOAD_DOCUMENTS.ToString())
+        if ((await GetApplicationStatus().ConfigureAwait(false)) != CompanyApplicationStatusId.UPLOAD_DOCUMENTS.ToString())
             throw new Exception($"Application status is not fitting to the pre-requisite");
         var response = Given()
             .DisableSslCertificateValidation()
@@ -383,16 +381,16 @@ public static void UploadDocument_WithEmptyTitle(string? documentTypeId, string?
 
         if (response.StatusCode == HttpStatusCode.NoContent)
         {
-            SetApplicationStatus(CompanyApplicationStatusId.VERIFY.ToString());
+            await SetApplicationStatus(CompanyApplicationStatusId.VERIFY.ToString()).ConfigureAwait(false);
         }
     }
 
     // POST /api/registration/application/{applicationId}/submitRegistration
 
     //[Fact]
-    public static bool SubmitRegistration()
+    public static async Task<bool> SubmitRegistration()
     {
-        if (GetApplicationStatus() != CompanyApplicationStatusId.VERIFY.ToString())
+        if ((await GetApplicationStatus().ConfigureAwait(false)) != CompanyApplicationStatusId.VERIFY.ToString())
             throw new Exception($"Application status is not fitting to the pre-requisite");
         var data = Given()
             .DisableSslCertificateValidation()
@@ -410,13 +408,13 @@ public static bool SubmitRegistration()
             .Extract()
             .Response();
 
-        var status = DataHandleHelper.DeserializeData<bool>(data.Content.ReadAsStringAsync().Result);
+        var status = DataHandleHelper.DeserializeData<bool>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         return status;
     }
 
     // GET: api/administration/registration/applications?companyName={companyName}
 
-    public static CompanyApplicationDetails? GetApplicationDetails(string userCompanyName)
+    public static async Task<CompanyApplicationDetails?> GetApplicationDetails(string userCompanyName)
     {
         var endpoint = $"{AdminEndPoint}/registration/applications?companyName={userCompanyName}&page=0&size=4&companyApplicationStatus=Closed";
         var response = Given()
@@ -432,9 +430,8 @@ public static bool SubmitRegistration()
             .Extract()
             .Response();
 
-        var data = DataHandleHelper.DeserializeData<Pagination.Response<CompanyApplicationDetails>>(response.Content
-            .ReadAsStringAsync()
-            .Result);
+        var data = DataHandleHelper.DeserializeData<Pagination.Response<CompanyApplicationDetails>>(await response.Content
+            .ReadAsStringAsync().ConfigureAwait(false));
         if (data is null)
         {
             throw new Exception($"Could not application details of first application from {endpoint}, response was null/empty.");
@@ -443,7 +440,7 @@ public static bool SubmitRegistration()
     }
 
     // GET: api/administration/registration/application/{applicationId}/companyDetailsWithAddress
-    public static CompanyDetailData? GetCompanyWithAddress()
+    public static async Task<CompanyDetailData?> GetCompanyWithAddress()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -458,19 +455,19 @@ public static bool SubmitRegistration()
             .Extract()
             .Response();
 
-        var data = DataHandleHelper.DeserializeData<CompanyDetailData>(response.Content.ReadAsStringAsync().Result);
+        var data = DataHandleHelper.DeserializeData<CompanyDetailData>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         return data;
     }
 
-    public static void InviteNewUser()
+    public static async Task InviteNewUser()
     {
         var devMailApiRequests = new DevMailApiRequests();
-        var devUser = devMailApiRequests.GenerateRandomEmailAddress();
+        var devUser = await devMailApiRequests.GenerateRandomEmailAddress().ConfigureAwait(false);
         var emailAddress = devUser.Result.Name + "@developermail.com";
         var userCreationInfoWithMessage = new UserCreationInfoWithMessage("testuser2", emailAddress, "myFirstName",
             "myLastName", new[] { "Company Admin" }, "testMessage");
 
-        Thread.Sleep(20000);
+        await Task.Delay(20000).ConfigureAwait(false);
 
         Given()
             .DisableSslCertificateValidation()
@@ -485,16 +482,16 @@ public static void InviteNewUser()
             .Log(ResponseLogLevel.OnError)
             .StatusCode(200);
 
-        var invitedUsers = GetInvitedUsers();
+        var invitedUsers = await GetInvitedUsers().ConfigureAwait(false);
         invitedUsers.Count.Should().Be(2, "No invited users were found.");
 
         var newInvitedUser = invitedUsers.Find(u => u.EmailId!.Equals(userCreationInfoWithMessage.eMail));
         newInvitedUser?.InvitationStatus.Should().Be(InvitationStatusId.CREATED);
         newInvitedUser?.InvitedUserRoles.Should().BeEquivalentTo(userCreationInfoWithMessage.Roles);
 
-        Thread.Sleep(20000);
+        await Task.Delay(20000).ConfigureAwait(false);
 
-        var messageData = devMailApiRequests.FetchPassword();
+        var messageData = await devMailApiRequests.FetchPassword().ConfigureAwait(false);
         messageData.Should().NotBeNullOrEmpty();
     }
 
@@ -537,7 +534,7 @@ private static async Task ExecuteInvitation(string emailAddress, string userComp
         _userCompanyToken =
             await new AuthFlow(userCompanyName).UpdatePasswordAndGetAccessToken(emailAddress, currentPassword,
                 newPassword);
-        _applicationId = GetFirstApplicationId();
+        _applicationId = await GetFirstApplicationId().ConfigureAwait(false);
 
         return (_userCompanyToken, _applicationId);
     }
@@ -556,7 +553,7 @@ private static bool VerifyCompanyDetailDataStorage(CompanyDetailData storedData,
                storedData.ZipCode == postedData.ZipCode;
     }
 
-    private static string GetFirstApplicationId()
+    private static async Task<string> GetFirstApplicationId()
     {
         var endpoint = $"{EndPoint}/applications";
         var data = Given()
@@ -573,7 +570,7 @@ private static string GetFirstApplicationId()
             .Response();
 
         var applicationIds =
-            DataHandleHelper.DeserializeData<List<CompanyApplicationWithStatus>>(data.Content.ReadAsStringAsync().Result);
+            DataHandleHelper.DeserializeData<List<CompanyApplicationWithStatus>>(await data.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (applicationIds.IsNullOrEmpty())
         {
             throw new Exception($"Could not get first application id from {endpoint}, response was null/empty.");
@@ -582,7 +579,7 @@ private static string GetFirstApplicationId()
         return _applicationId;
     }
 
-    private static CompanyRoleAgreementData GetCompanyRoleAgreementData()
+    private static async Task<CompanyRoleAgreementData> GetCompanyRoleAgreementData()
     {
         var response = Given()
             .DisableSslCertificateValidation()
@@ -599,7 +596,7 @@ private static CompanyRoleAgreementData GetCompanyRoleAgreementData()
             .And()
             .Extract()
             .Response();
-        var data = response.Content.ReadAsStringAsync().Result;
+        var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
         var companyRoleAgreementData = DataHandleHelper.DeserializeData<CompanyRoleAgreementData>(data);
         if (companyRoleAgreementData is null)
         {
diff --git a/tests/endtoend/RegistrationScenarios/RegistrationScenarios.cs b/tests/endtoend/RegistrationScenarios/RegistrationScenarios.cs
index 113f3bda33..0d0c5158e2 100644
--- a/tests/endtoend/RegistrationScenarios/RegistrationScenarios.cs
+++ b/tests/endtoend/RegistrationScenarios/RegistrationScenarios.cs
@@ -44,33 +44,33 @@ public async Task CompanyRegistration_WithManualDataInput(TestDataRegistrationMo
         var userCompanyName = $"{testEntry.CompanyDetailData?.Name}_{now:s}";
         userCompanyName = userCompanyName.Replace(":", "").Replace("_", "");
 
-        var (companyToken, applicationId) = await RegistrationEndpointHelper.ExecuteInvitation(userCompanyName);
+        var (companyToken, applicationId) = await RegistrationEndpointHelper.ExecuteInvitation(userCompanyName).ConfigureAwait(false);
         companyToken.Should().NotBeNull();
         applicationId.Should().NotBeNull();
 
-        var companyDetailData = RegistrationEndpointHelper.SetCompanyDetailData(testEntry.CompanyDetailData);
+        var companyDetailData = await RegistrationEndpointHelper.SetCompanyDetailData(testEntry.CompanyDetailData).ConfigureAwait(false);
         companyDetailData.Name.Should().Be(userCompanyName);
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
 
         var roleSubmissionResult =
-            RegistrationEndpointHelper.SubmitCompanyRoleConsentToAgreements(testEntry.CompanyRoles);
+            await RegistrationEndpointHelper.SubmitCompanyRoleConsentToAgreements(testEntry.CompanyRoles).ConfigureAwait(false);
         int.Parse(roleSubmissionResult).Should().BeGreaterThan(0);
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
 
-        RegistrationEndpointHelper.UploadDocument_WithEmptyTitle(testEntry.DocumentTypeId, testEntry.DocumentName);
+        await RegistrationEndpointHelper.UploadDocument_WithEmptyTitle(testEntry.DocumentTypeId, testEntry.DocumentName).ConfigureAwait(false);
 
-        Thread.Sleep(3000);
-        var status = RegistrationEndpointHelper.SubmitRegistration();
+        await Task.Delay(3000).ConfigureAwait(false);
+        var status = await RegistrationEndpointHelper.SubmitRegistration().ConfigureAwait(false);
         status.Should().BeTrue();
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
 
-        var applicationDetails = RegistrationEndpointHelper.GetApplicationDetails(userCompanyName);
+        var applicationDetails = await RegistrationEndpointHelper.GetApplicationDetails(userCompanyName).ConfigureAwait(false);
         applicationDetails.Should().NotBeNull();
         applicationDetails!.CompanyApplicationStatusId.Should().Be(CompanyApplicationStatusId.SUBMITTED);
         applicationDetails.ApplicationId.ToString().Should().Be(applicationId);
 
-        Thread.Sleep(3000);
-        var storedCompanyDetailData = RegistrationEndpointHelper.GetCompanyWithAddress();
+        await Task.Delay(3000).ConfigureAwait(false);
+        var storedCompanyDetailData = await RegistrationEndpointHelper.GetCompanyWithAddress().ConfigureAwait(false);
         storedCompanyDetailData.Should().NotBeNull();
     }
 
@@ -87,9 +87,9 @@ public async Task CompanyRegistration_AddAndUpdateCompanyData(TestDataRegistrati
         var userCompanyName = $"{testEntry.CompanyDetailData.Name}_{now:s}";
         userCompanyName = userCompanyName.Replace(":", "").Replace("_", "");
         await RegistrationEndpointHelper.ExecuteInvitation(userCompanyName);
-        Thread.Sleep(3000);
-        RegistrationEndpointHelper.SetCompanyDetailData(testEntry.CompanyDetailData);
-        RegistrationEndpointHelper.UpdateCompanyDetailData(testEntry.UpdateCompanyDetailData);
+        await Task.Delay(3000).ConfigureAwait(false);
+        await RegistrationEndpointHelper.SetCompanyDetailData(testEntry.CompanyDetailData).ConfigureAwait(false);
+        await RegistrationEndpointHelper.UpdateCompanyDetailData(testEntry.UpdateCompanyDetailData).ConfigureAwait(false);
     }
 
     [Fact(DisplayName = "Company Registration with manual data input & additional user invite")]
@@ -99,16 +99,16 @@ public async Task CompanyRegistration_WithManualDataInputAndAdditionalUserInvite
         var userCompanyName = $"Test-Catena-X_{now:s}";
         userCompanyName = userCompanyName.Replace(":", "").Replace("_", "");
         await RegistrationEndpointHelper.ExecuteInvitation(userCompanyName);
-        Thread.Sleep(10000);
-        RegistrationEndpointHelper.InviteNewUser();
+        await Task.Delay(10000).ConfigureAwait(false);
+        await RegistrationEndpointHelper.InviteNewUser().ConfigureAwait(false);
     }
 
     [Theory(DisplayName = "Company Registration by BPN")]
     [MemberData(nameof(GetDataEntriesForRegistrationWithBpn))]
     public async Task CompanyRegistration_ByBpn(TestDataRegistrationModel testEntry)
     {
-        var bpn = RegistrationEndpointHelper.GetBpn().Result;
-        var bpdmCompanyDetailData = RegistrationEndpointHelper.GetCompanyBpdmDetailData(bpn);
+        var bpn = await RegistrationEndpointHelper.GetBpn().ConfigureAwait(false);
+        var bpdmCompanyDetailData = await RegistrationEndpointHelper.GetCompanyBpdmDetailData(bpn).ConfigureAwait(false);
 
         var now = DateTime.Now;
         var userCompanyName = bpdmCompanyDetailData.Name + $"{now:s}";
@@ -118,68 +118,44 @@ public async Task CompanyRegistration_ByBpn(TestDataRegistrationModel testEntry)
         companyToken.Should().NotBeNullOrEmpty();
         applicationId.Should().NotBeNullOrEmpty();
 
-        var companyDetailData = RegistrationEndpointHelper.SetCompanyDetailData(bpdmCompanyDetailData);
+        var companyDetailData = await RegistrationEndpointHelper.SetCompanyDetailData(bpdmCompanyDetailData).ConfigureAwait(false);
         companyDetailData.Name.Should().Be(userCompanyName);
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
 
         var roleSubmissionResult =
-            RegistrationEndpointHelper.SubmitCompanyRoleConsentToAgreements(testEntry.CompanyRoles);
+            await RegistrationEndpointHelper.SubmitCompanyRoleConsentToAgreements(testEntry.CompanyRoles).ConfigureAwait(false);
         int.Parse(roleSubmissionResult).Should().BeGreaterThan(0);
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
 
-        RegistrationEndpointHelper.UploadDocument_WithEmptyTitle(testEntry.DocumentTypeId, testEntry.DocumentName);
+        await RegistrationEndpointHelper.UploadDocument_WithEmptyTitle(testEntry.DocumentTypeId, testEntry.DocumentName).ConfigureAwait(false);
 
-        Thread.Sleep(3000);
-        var status = RegistrationEndpointHelper.SubmitRegistration();
+        await Task.Delay(3000).ConfigureAwait(false);
+        var status = await RegistrationEndpointHelper.SubmitRegistration().ConfigureAwait(false);
         status.Should().BeTrue();
-        Thread.Sleep(3000);
+        await Task.Delay(3000).ConfigureAwait(false);
 
-        var applicationDetails = RegistrationEndpointHelper.GetApplicationDetails(userCompanyName);
+        var applicationDetails = await RegistrationEndpointHelper.GetApplicationDetails(userCompanyName).ConfigureAwait(false);
         applicationDetails.Should().NotBeNull();
         applicationDetails?.CompanyApplicationStatusId.Should().Be(CompanyApplicationStatusId.SUBMITTED);
         applicationDetails?.ApplicationId.ToString().Should().Be(applicationId);
 
-        Thread.Sleep(3000);
-        var storedCompanyDetailData = RegistrationEndpointHelper.GetCompanyWithAddress();
+        await Task.Delay(3000).ConfigureAwait(false);
+        var storedCompanyDetailData = await RegistrationEndpointHelper.GetCompanyWithAddress().ConfigureAwait(false);
         storedCompanyDetailData.Should().NotBeNull();
     }
 
     public static IEnumerable<object[]> GetDataEntriesForUpdateCompanyDetailDataWithoutBpn
     {
-        get
-        {
-            var testDataEntries =
-                TestDataHelper.GetTestDataForRegistrationWithoutBpn("TestDataHappyPathUpdateCompanyDetailData.json");
-            foreach (var t in testDataEntries)
-            {
-                yield return new object[] { t };
-            }
-        }
+        get => TestDataHelper.GetTestDataForRegistrationWithoutBpn("TestDataHappyPathUpdateCompanyDetailData.json").Select(t => new object[] { t });
     }
 
     public static IEnumerable<object[]> GetDataEntriesForRegistrationWithoutBpn
     {
-        get
-        {
-            var testDataEntries =
-                TestDataHelper.GetTestDataForRegistrationWithoutBpn("TestDataHappyPathRegistrationWithoutBpn.json");
-            foreach (var t in testDataEntries)
-            {
-                yield return new object[] { t };
-            }
-        }
+        get => TestDataHelper.GetTestDataForRegistrationWithoutBpn("TestDataHappyPathRegistrationWithoutBpn.json").Select(t => new object[] { t });
     }
 
     public static IEnumerable<object[]> GetDataEntriesForRegistrationWithBpn
     {
-        get
-        {
-            var testDataEntries =
-                TestDataHelper.GetTestDataForRegistrationWithBpn("TestDataHappyPathRegistrationWithBpn.json");
-            foreach (var t in testDataEntries)
-            {
-                yield return new object[] { t };
-            }
-        }
+        get => TestDataHelper.GetTestDataForRegistrationWithBpn("TestDataHappyPathRegistrationWithBpn.json").Select(t => new object[] { t });
     }
 }
diff --git a/tests/endtoend/ServiceAccountCUDScenarios/AdministrationEndpointHelper.cs b/tests/endtoend/ServiceAccountCUDScenarios/AdministrationEndpointHelper.cs
index a9a5a9232c..6b2863e765 100644
--- a/tests/endtoend/ServiceAccountCUDScenarios/AdministrationEndpointHelper.cs
+++ b/tests/endtoend/ServiceAccountCUDScenarios/AdministrationEndpointHelper.cs
@@ -45,7 +45,7 @@ public static async Task<bool> GetOperatorToken()
     }
 
     //GET: api/administration/serviceaccount/owncompany/serviceaccounts
-    public static List<CompanyServiceAccountData> GetServiceAccounts()
+    public static async Task<List<CompanyServiceAccountData>> GetServiceAccounts()
     {
         var serviceAccounts = new List<CompanyServiceAccountData>();
 
@@ -80,9 +80,8 @@ public static List<CompanyServiceAccountData> GetServiceAccounts()
                 .StatusCode(200)
                 .Extract()
                 .Response();
-            var data = DataHandleHelper.DeserializeData<Pagination.Response<CompanyServiceAccountData>>(response.Content
-                .ReadAsStringAsync()
-                .Result);
+            var data = DataHandleHelper.DeserializeData<Pagination.Response<CompanyServiceAccountData>>(await response.Content
+                .ReadAsStringAsync().ConfigureAwait(false));
             if (data != null)
                 serviceAccounts.AddRange(data.Content);
         }
@@ -91,13 +90,13 @@ public static List<CompanyServiceAccountData> GetServiceAccounts()
     }
 
     //POST: api/administration/serviceaccount/owncompany/serviceaccounts - create a new service account
-    public static ServiceAccountDetails CreateNewServiceAccount(string[] permissions)
+    public static async Task<ServiceAccountDetails> CreateNewServiceAccount(string[] permissions)
     {
         var now = DateTime.Now;
         var techUserName = $"NewTechUserName_{now:s}";
 
         const string Description = "This is a new technical user created via test automation e2e tests";
-        var allServiceAccountsRoles = GetAllServiceAccountRoles();
+        var allServiceAccountsRoles = await GetAllServiceAccountRoles().ConfigureAwait(false);
         var userRoleIds = new List<Guid>();
 
         foreach (var p in permissions)
@@ -121,7 +120,7 @@ public static ServiceAccountDetails CreateNewServiceAccount(string[] permissions
             .Extract()
             .Response();
 
-        var serviceAccountDetails = DataHandleHelper.DeserializeData<ServiceAccountDetails>(response.Content.ReadAsStringAsync().Result);
+        var serviceAccountDetails = DataHandleHelper.DeserializeData<ServiceAccountDetails>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (serviceAccountDetails is null)
         {
             throw new Exception($"Could not create service account with {endpoint}, response was null/empty.");
@@ -130,7 +129,7 @@ public static ServiceAccountDetails CreateNewServiceAccount(string[] permissions
     }
 
     //DELETE: api/administration/serviceaccount/owncompany/serviceaccounts/{serviceAccountId}
-    public static bool DeleteServiceAccount(string serviceAccountId)
+    public static async Task<bool> DeleteServiceAccount(string serviceAccountId)
     {
         var data = Given()
             .DisableSslCertificateValidation()
@@ -144,14 +143,14 @@ public static bool DeleteServiceAccount(string serviceAccountId)
             .StatusCode(200)
             .Extract()
             .Response();
-        return !data.Content.ReadAsStringAsync().Result.Equals("0");
+        return !(await data.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("0");
     }
 
     //PUT: api/administration/serviceaccount/owncompany/serviceaccounts/{serviceAccountId} - update the previous created service account details by changing "name" and "description"
-    public static void UpdateServiceAccountDetailsById(string serviceAccountId, string newName,
+    public static async Task UpdateServiceAccountDetailsById(string serviceAccountId, string newName,
         string newDescription)
     {
-        var serviceAccountDetails = GetServiceAccountDetailsById(serviceAccountId);
+        var serviceAccountDetails = await GetServiceAccountDetailsById(serviceAccountId).ConfigureAwait(false);
         var updateServiceAccountEditableDetails =
             new ServiceAccountEditableDetails(serviceAccountDetails.ServiceAccountId, newName, newDescription,
                 serviceAccountDetails.IamClientAuthMethod);
@@ -169,7 +168,7 @@ public static void UpdateServiceAccountDetailsById(string serviceAccountId, stri
     }
 
     //POST: api/administration/serviceaccount/owncompany/serviceaccounts/{serviceAccountId}/resetCredentials - reset service account credentials
-    public static ServiceAccountDetails ResetServiceAccountCredentialsById(string serviceAccountId)
+    public static async Task<ServiceAccountDetails> ResetServiceAccountCredentialsById(string serviceAccountId)
     {
         var endpoint = $"{EndPoint}/serviceaccount/owncompany/serviceaccounts/{serviceAccountId}/resetCredentials";
         var response = Given()
@@ -185,7 +184,7 @@ public static ServiceAccountDetails ResetServiceAccountCredentialsById(string se
             .Extract()
             .Response();
 
-        var resetServiceAccountCredentialsById = DataHandleHelper.DeserializeData<ServiceAccountDetails>(response.Content.ReadAsStringAsync().Result);
+        var resetServiceAccountCredentialsById = DataHandleHelper.DeserializeData<ServiceAccountDetails>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (resetServiceAccountCredentialsById is null)
         {
             throw new Exception($"Could not reset service account credentials by id with {endpoint}, response was null/empty.");
@@ -194,7 +193,7 @@ public static ServiceAccountDetails ResetServiceAccountCredentialsById(string se
     }
 
     //GET: api/administration/serviceaccount/owncompany/serviceaccounts/{serviceAccountId}
-    public static ServiceAccountDetails GetServiceAccountDetailsById(string serviceAccountId)
+    public static async Task<ServiceAccountDetails> GetServiceAccountDetailsById(string serviceAccountId)
     {
         var endpoint = $"{EndPoint}/serviceaccount/owncompany/serviceaccounts/{serviceAccountId}";
         var response = Given()
@@ -209,12 +208,11 @@ public static ServiceAccountDetails GetServiceAccountDetailsById(string serviceA
             .StatusCode(200)
             .Extract()
             .Response();
-        return DataHandleHelper.DeserializeData<ServiceAccountDetails>(response.Content.ReadAsStringAsync()
-            .Result) ?? throw new Exception($"Could not get service account details by id from {endpoint}, response was null/empty.");
+        return DataHandleHelper.DeserializeData<ServiceAccountDetails>(await response.Content.ReadAsStringAsync().ConfigureAwait(false)) ?? throw new Exception($"Could not get service account details by id from {endpoint}, response was null/empty.");
     }
 
     //GET: api/administration/serviceaccount/user/roles
-    private static List<UserRoleWithDescription> GetAllServiceAccountRoles()
+    private static async Task<List<UserRoleWithDescription>> GetAllServiceAccountRoles()
     {
         var endpoint = $"{EndPoint}/serviceaccount/user/roles";
         var response = Given()
@@ -229,8 +227,7 @@ private static List<UserRoleWithDescription> GetAllServiceAccountRoles()
             .StatusCode(200)
             .Extract()
             .Response();
-        var userRoleWithDescriptions = DataHandleHelper.DeserializeData<List<UserRoleWithDescription>>(response.Content.ReadAsStringAsync()
-            .Result);
+        var userRoleWithDescriptions = DataHandleHelper.DeserializeData<List<UserRoleWithDescription>>(await response.Content.ReadAsStringAsync().ConfigureAwait(false));
         if (userRoleWithDescriptions is null)
         {
             throw new Exception($"Could not get service account roles from {endpoint}, response was null/empty.");
diff --git a/tests/endtoend/ServiceAccountCUDScenarios/ServiceAccountCUDScenarios.cs b/tests/endtoend/ServiceAccountCUDScenarios/ServiceAccountCUDScenarios.cs
index 5a44c659d0..10ddb8579b 100644
--- a/tests/endtoend/ServiceAccountCUDScenarios/ServiceAccountCUDScenarios.cs
+++ b/tests/endtoend/ServiceAccountCUDScenarios/ServiceAccountCUDScenarios.cs
@@ -49,7 +49,7 @@ public async Task ServiceAccount_Creation(string[] permissions)
         // get a snapshot of current existing service accounts
         try
         {
-            existingServiceAccounts = AdministrationEndpointHelper.GetServiceAccounts();
+            existingServiceAccounts = await AdministrationEndpointHelper.GetServiceAccounts().ConfigureAwait(false);
         }
         catch (Exception)
         {
@@ -58,12 +58,12 @@ public async Task ServiceAccount_Creation(string[] permissions)
         finally
         {
             //create a new service account
-            var newServiceAccount = AdministrationEndpointHelper.CreateNewServiceAccount(permissions);
+            var newServiceAccount = await AdministrationEndpointHelper.CreateNewServiceAccount(permissions).ConfigureAwait(false);
 
             try
             {
                 //check if the new service account is added (validation against the previous taken snapshot)
-                var updatedServiceAccounts = AdministrationEndpointHelper.GetServiceAccounts();
+                var updatedServiceAccounts = await AdministrationEndpointHelper.GetServiceAccounts().ConfigureAwait(false);
 
                 if (!existingServiceAccounts.IsNullOrEmpty())
                 {
@@ -89,8 +89,9 @@ public async Task ServiceAccount_Creation(string[] permissions)
 
                 var jwtSecurityToken = new JwtSecurityTokenHandler().ReadJwtToken(token);
                 jwtSecurityToken.Payload.Should().ContainKey("bpn", "Attribute BPN in user token was not found");
-                AdministrationEndpointHelper.DeleteServiceAccount(
-                        newServiceAccount.ServiceAccountId.ToString()).Should().BeTrue("Created service account could not be deleted");
+                var result = await AdministrationEndpointHelper.DeleteServiceAccount(
+                        newServiceAccount.ServiceAccountId.ToString()).ConfigureAwait(false);
+                result.Should().BeTrue("Created service account could not be deleted");
             }
         }
     }
@@ -103,21 +104,22 @@ public async Task ServiceAccount_DataUpdate(string[] permissions)
         await AdministrationEndpointHelper.GetOperatorToken().ConfigureAwait(false);
 
         //create a new service account
-        var newServiceAccount = AdministrationEndpointHelper.CreateNewServiceAccount(permissions);
+        var newServiceAccount = await AdministrationEndpointHelper.CreateNewServiceAccount(permissions).ConfigureAwait(false);
 
         //update the previous created service account details by changing "name" and "description"
         var now = DateTime.Now;
         var newTechUserName = $"UpdatedTechUserName_{now:s}";
         var newDescription = "This is an updated description for a technical user via test automation e2e tests";
-        AdministrationEndpointHelper.UpdateServiceAccountDetailsById(newServiceAccount.ServiceAccountId.ToString(),
-            newTechUserName, newDescription);
+        await AdministrationEndpointHelper.UpdateServiceAccountDetailsById(newServiceAccount.ServiceAccountId.ToString(),
+            newTechUserName, newDescription).ConfigureAwait(false);
 
         //check if the change of the serviceAccount got successfully saved
-        var updatedServiceAccount = AdministrationEndpointHelper.GetServiceAccountDetailsById(newServiceAccount.ServiceAccountId.ToString());
+        var updatedServiceAccount = await AdministrationEndpointHelper.GetServiceAccountDetailsById(newServiceAccount.ServiceAccountId.ToString()).ConfigureAwait(false);
 
         updatedServiceAccount.Name.Should().Be(newTechUserName, "Updated technical user name was not stored correctly.");
         updatedServiceAccount.Description.Should().Be(newDescription, "Updated description of service account was not stored correctly");
-        AdministrationEndpointHelper.DeleteServiceAccount(updatedServiceAccount.ServiceAccountId.ToString()).Should().BeTrue("Created service account could not be deleted.");
+        var result = await AdministrationEndpointHelper.DeleteServiceAccount(updatedServiceAccount.ServiceAccountId.ToString()).ConfigureAwait(false);
+        result.Should().BeTrue("Created service account could not be deleted.");
     }
 
     //Scenario - Create a new service account and update the credentials
@@ -129,12 +131,12 @@ public async Task ServiceAccount_CredentialRefresh(string[] permissions)
 
         // create a new service account
         var newServiceAccount =
-            AdministrationEndpointHelper.CreateNewServiceAccount(permissions);
+            await AdministrationEndpointHelper.CreateNewServiceAccount(permissions).ConfigureAwait(false);
 
         //reset service account credentials
         var updatedServiceAccount =
-            AdministrationEndpointHelper.ResetServiceAccountCredentialsById(
-                newServiceAccount.ServiceAccountId.ToString());
+            await AdministrationEndpointHelper.ResetServiceAccountCredentialsById(
+                newServiceAccount.ServiceAccountId.ToString()).ConfigureAwait(false);
         updatedServiceAccount.Should().NotBeNull();
 
         //check if the resetup of the credentials was successful
@@ -144,7 +146,8 @@ public async Task ServiceAccount_CredentialRefresh(string[] permissions)
         var token = TechTokenRetriever.GetToken(TokenUrl, updatedServiceAccount.ClientId, updatedServiceAccount.Secret);
 
         token.Should().NotBeNullOrEmpty("Token for new technical user could not be fetched correctly");
-        AdministrationEndpointHelper.DeleteServiceAccount(updatedServiceAccount.ServiceAccountId.ToString()).Should().BeTrue("Created service account could not be deleted");
+        var result = await AdministrationEndpointHelper.DeleteServiceAccount(updatedServiceAccount.ServiceAccountId.ToString()).ConfigureAwait(false);
+        result.Should().BeTrue("Created service account could not be deleted");
     }
 
     //Scenario - Create and delete a new service account
@@ -156,20 +159,20 @@ public async Task ServiceAccount_Deletion(string[] permissions)
 
         // create a new service account
         var newServiceAccount =
-            AdministrationEndpointHelper.CreateNewServiceAccount(permissions);
+            await AdministrationEndpointHelper.CreateNewServiceAccount(permissions).ConfigureAwait(false);
 
         //  check if the new service account is available
-        var existingServiceAccounts = AdministrationEndpointHelper.GetServiceAccounts();
+        var existingServiceAccounts = await AdministrationEndpointHelper.GetServiceAccounts().ConfigureAwait(false);
 
         var checkAccountIsAvailable =
             existingServiceAccounts.Where(t => t.ServiceAccountId == newServiceAccount.ServiceAccountId);
         checkAccountIsAvailable.Should().NotBeNullOrEmpty();
 
         //delete the created service account
-        AdministrationEndpointHelper.DeleteServiceAccount(newServiceAccount.ServiceAccountId.ToString());
+        await AdministrationEndpointHelper.DeleteServiceAccount(newServiceAccount.ServiceAccountId.ToString()).ConfigureAwait(false);
 
         //check the endpoint, the deleted service account should not be available anymore
-        var updatedServiceAccounts = AdministrationEndpointHelper.GetServiceAccounts();
+        var updatedServiceAccounts = await AdministrationEndpointHelper.GetServiceAccounts().ConfigureAwait(false);
 
         var checkAccountDeleted =
             updatedServiceAccounts.Where(t => t.ServiceAccountId == newServiceAccount.ServiceAccountId);
diff --git a/tests/endtoend/TestDataHelper.cs b/tests/endtoend/TestDataHelper.cs
index 414fad9e00..2944d5a236 100644
--- a/tests/endtoend/TestDataHelper.cs
+++ b/tests/endtoend/TestDataHelper.cs
@@ -43,7 +43,7 @@ public static List<string[]> GetTestDataForServiceAccountCUDScenarios(string fil
             "ServiceAccountsCUDScenarios" + Path.DirectorySeparatorChar + fileName);
 
         var jsonData = File.ReadAllText(filePath);
-        var testData = JsonSerializer.Deserialize<List<Dictionary<string, Object>>>(jsonData);
+        var testData = JsonSerializer.Deserialize<List<Dictionary<string, object>>>(jsonData);
         if (testData.IsNullOrEmpty())
             throw new Exception("Incorrect format of test data for service account scenarios");
         var testDataSet = FetchTestData(testData!);
@@ -55,23 +55,23 @@ public static List<TestDataModelCreateApp> GetTestDataForCreateApp(string fileNa
         var filePath = Path.Combine(GetTestDataDirectory(), "CreateAppScenario" + Path.DirectorySeparatorChar + fileName);
 
         var jsonData = File.ReadAllText(filePath);
-        var testData = JsonSerializer.Deserialize<List<Dictionary<string, Object>>>(jsonData);
+        var testData = JsonSerializer.Deserialize<List<Dictionary<string, object>>>(jsonData);
         if (testData.IsNullOrEmpty())
             throw new Exception("Incorrect format of test data for service account scenarios");
         var testDataSet = FetchTestDataForCreateApp(testData!);
         return testDataSet;
     }
 
-    private static List<TestDataModelCreateApp> FetchTestDataForCreateApp(List<Dictionary<string, Object>> testData)
+    private static List<TestDataModelCreateApp> FetchTestDataForCreateApp(List<Dictionary<string, object>> testData)
     {
         var testDataSet = new List<TestDataModelCreateApp>();
-        foreach (var unused in testData)
+        foreach (var data in testData)
         {
             List<AppUserRole>? appUserRoles = null;
             AppRequestModel? appRequestModel = null;
             string? documentName = null;
             string? imageName = null;
-            foreach (var pair in testData.SelectMany(o => o))
+            foreach (var pair in data)
             {
                 var jsonString = pair.Value.ToString();
                 switch (pair.Key)
@@ -83,33 +83,19 @@ private static List<TestDataModelCreateApp> FetchTestDataForCreateApp(List<Dicti
                         appUserRoles = DataHandleHelper.DeserializeData<List<AppUserRole>>(jsonString ?? "[]");
                         break;
                     case "documentName":
-                        if (!jsonString.IsNullOrEmpty())
-                        {
-                            documentName = GetTestDataDirectory() + Path.DirectorySeparatorChar + "CreateAppScenario" +
-                                           Path.DirectorySeparatorChar + pair.Value;
-                        }
-                        else
-                        {
-                            documentName = "";
-                        }
-
+                        documentName = jsonString.IsNullOrEmpty()
+                            ? ""
+                            : GetTestDataDirectory() + Path.DirectorySeparatorChar + "CreateAppScenario" + Path.DirectorySeparatorChar + pair.Value;
                         break;
                     case "imageName":
-                        if (!jsonString.IsNullOrEmpty())
-                        {
-                            imageName = GetTestDataDirectory() + Path.DirectorySeparatorChar + "CreateAppScenario" +
-                                        Path.DirectorySeparatorChar + pair.Value;
-                        }
-                        else
-                        {
-                            imageName = "";
-                        }
-
+                        imageName = jsonString.IsNullOrEmpty()
+                            ? ""
+                            : GetTestDataDirectory() + Path.DirectorySeparatorChar + "CreateAppScenario" + Path.DirectorySeparatorChar + pair.Value;
                         break;
                 }
             }
 
-            testDataSet.Add(new TestDataModelCreateApp(appRequestModel, appUserRoles!, documentName!, imageName!));
+            testDataSet.Add(new TestDataModelCreateApp(appRequestModel, appUserRoles ?? throw new Exception("invalid testdata, appUserRoles must not be null"), documentName ?? throw new Exception("invalid testdata, documentName must not be null"), imageName ?? throw new Exception("invalid testdata, imageName must not be null")));
         }
 
         return testDataSet;
@@ -121,7 +107,7 @@ public static List<TestDataRegistrationModel> GetTestDataForRegistrationWithoutB
             "RegistrationScenarios" + Path.DirectorySeparatorChar + fileName);
 
         var jsonData = File.ReadAllText(filePath);
-        var testData = DataHandleHelper.DeserializeData<List<Dictionary<string, Object>>>(jsonData);
+        var testData = DataHandleHelper.DeserializeData<List<Dictionary<string, object>>>(jsonData);
         if (testData.IsNullOrEmpty())
         {
             throw new Exception($"Could not get testdata from {fileName}, maybe empty.");
@@ -137,7 +123,7 @@ public static List<TestDataRegistrationModel> GetTestDataForRegistrationWithBpn(
             "RegistrationScenarios" + Path.DirectorySeparatorChar + fileName);
 
         var jsonData = File.ReadAllText(filePath);
-        var testData = DataHandleHelper.DeserializeData<List<Dictionary<string, Object>>>(jsonData);
+        var testData = DataHandleHelper.DeserializeData<List<Dictionary<string, object>>>(jsonData);
         if (testData.IsNullOrEmpty())
         {
             throw new Exception($"Could not get testdata from {fileName}, maybe empty.");
@@ -147,7 +133,7 @@ public static List<TestDataRegistrationModel> GetTestDataForRegistrationWithBpn(
         return testDataSet;
     }
 
-    private static List<string[]> FetchTestData(List<Dictionary<string, Object>> testData)
+    private static List<string[]> FetchTestData(List<Dictionary<string, object>> testData)
     {
         var testDataSet = new List<string[]>();
         foreach (var pair in testData.SelectMany(obj => obj))
@@ -167,7 +153,7 @@ private static List<string[]> FetchTestData(List<Dictionary<string, Object>> tes
     }
 
     private static List<TestDataRegistrationModel> FetchTestDataForRegistrationScenarios(
-        List<Dictionary<string, Object>> testData)
+        List<Dictionary<string, object>> testData)
     {
         var testDataSet = new List<TestDataRegistrationModel>();
         foreach (var obj in testData)
diff --git a/tests/endtoend/TestResources.cs b/tests/endtoend/TestResources.cs
index 512c120185..245b1a93f9 100644
--- a/tests/endtoend/TestResources.cs
+++ b/tests/endtoend/TestResources.cs
@@ -44,17 +44,17 @@ static TestResources()
             .AddJsonFile(configPath)
             .AddEnvironmentVariables()
             .Build();
-        Env = configuration["ENVIRONMENT"];
-        NotificationOfferId = configuration["NOTIFICATION_OFFER_ID"];
-        PortalUserCompanyName = configuration["PORTAL_USER_COMPANY_NAME"];
-        BasePortalUrl = configuration["BASE_PORTAL_URL"].Replace("{Env}", Env);
-        BaseCentralIdpUrl = configuration["BASE_CENTRAL_IDP_URL"].Replace("{Env}", Env);
-        BasePortalBackendUrl = configuration["BASE_PORTAL_BACKEND_URL"].Replace("{Env}", Env);
-        BpdmUrl = configuration["BPDM_URL"].Replace("{Env}", Env);
-        ClearingHouseUrl = configuration["CLEARING_HOUSE_URL"];
-        ClearingHouseTokenUrl = configuration["CLEARING_HOUSE_TOKEN_URL"];
-        SdFactoryBaseUrl = configuration["SD_FACTORY_BASE_URL"].Replace("{Env}", Env);
-        WalletBaseUrl = configuration["WALLET_BASE_URL"].Replace("{Env}", Env);
+        Env = configuration["ENVIRONMENT"] ?? throw new Exception("ENVIRONMENT is not defined in configuration");
+        NotificationOfferId = configuration["NOTIFICATION_OFFER_ID"] ?? throw new Exception("NOTIFICATION_OFFER_ID is not defined in configuration");
+        PortalUserCompanyName = configuration["PORTAL_USER_COMPANY_NAME"] ?? throw new Exception("PORTAL_USER_COMPANY_NAME is not defined in configuration");
+        BasePortalUrl = (configuration["BASE_PORTAL_URL"] ?? throw new Exception("BASE_PORTAL_URL is not defined in configuration")).Replace("{Env}", Env);
+        BaseCentralIdpUrl = (configuration["BASE_CENTRAL_IDP_URL"] ?? throw new Exception(" is not defined in configuration")).Replace("{Env}", Env);
+        BasePortalBackendUrl = (configuration["BASE_PORTAL_BACKEND_URL"] ?? throw new Exception("BASE_PORTAL_BACKEND_URL is not defined in configuration")).Replace("{Env}", Env);
+        BpdmUrl = (configuration["BPDM_URL"] ?? throw new Exception("BPDM_URL is not defined in configuration")).Replace("{Env}", Env);
+        ClearingHouseUrl = configuration["CLEARING_HOUSE_URL"] ?? throw new Exception("CLEARING_HOUSE_URL is not defined in configuration");
+        ClearingHouseTokenUrl = configuration["CLEARING_HOUSE_TOKEN_URL"] ?? throw new Exception("CLEARING_HOUSE_TOKEN_URL is not defined in configuration");
+        SdFactoryBaseUrl = (configuration["SD_FACTORY_BASE_URL"] ?? throw new Exception("SD_FACTORY_BASE_URL is not defined in configuration")).Replace("{Env}", Env);
+        WalletBaseUrl = (configuration["WALLET_BASE_URL"] ?? throw new Exception("WALLET_BASE_URL is not defined in configuration")).Replace("{Env}", Env);
     }
 
     public static string GetSourceFilePathName([CallerFilePath] string? callerFilePath = null) => callerFilePath ?? "";
diff --git a/tests/externalsystems/Bpdm.Library/BPNAccessTest.cs b/tests/externalsystems/Bpdm.Library/BPNAccessTest.cs
index 8bf2795cf2..259605d02d 100644
--- a/tests/externalsystems/Bpdm.Library/BPNAccessTest.cs
+++ b/tests/externalsystems/Bpdm.Library/BPNAccessTest.cs
@@ -114,11 +114,12 @@ public async Task FetchLegalEntityByBpn_Success_ReturnsExpected()
             }
         }";
 
-        ConfigureHttpClientFactoryFixture(new HttpResponseMessage
+        using var responseMessage = new HttpResponseMessage
         {
             StatusCode = HttpStatusCode.OK,
             Content = new StringContent(json)
-        }, requestMessage => request = requestMessage);
+        };
+        ConfigureHttpClientFactoryFixture(responseMessage, requestMessage => request = requestMessage);
 
         var businessPartnerNumber = _fixture.Create<string>();
         var sut = _fixture.Create<BpnAccess>();
@@ -143,11 +144,12 @@ public async Task FetchLegalEntityByBpn_InvalidJsonResponse_Throws()
     {
         //Arrange
         var json = _fixture.Create<string>();
-        ConfigureHttpClientFactoryFixture(new HttpResponseMessage
+        using var responseMessage = new HttpResponseMessage
         {
             StatusCode = HttpStatusCode.OK,
             Content = new StringContent(json)
-        });
+        };
+        ConfigureHttpClientFactoryFixture(responseMessage);
 
         var sut = _fixture.Create<BpnAccess>();
 
@@ -166,11 +168,12 @@ public async Task FetchLegalEntityByBpn_EmptyResponse_Throws()
     {
         //Arrange
         const string json = "";
-        ConfigureHttpClientFactoryFixture(new HttpResponseMessage
+        using var responseMessage = new HttpResponseMessage
         {
             StatusCode = HttpStatusCode.OK,
             Content = new StringContent(json)
-        });
+        };
+        ConfigureHttpClientFactoryFixture(responseMessage);
 
         var sut = _fixture.Create<BpnAccess>();
 
@@ -188,10 +191,11 @@ public async Task FetchLegalEntityByBpn_EmptyResponse_Throws()
     public async Task FetchLegalEntityByBpn_NoContentResponse_Throws()
     {
         //Arrange
-        ConfigureHttpClientFactoryFixture(new HttpResponseMessage
+        using var responseMessage = new HttpResponseMessage
         {
             StatusCode = HttpStatusCode.OK,
-        });
+        };
+        ConfigureHttpClientFactoryFixture(responseMessage);
 
         var sut = _fixture.Create<BpnAccess>();
 
@@ -210,11 +214,12 @@ public async Task FetchLegalEntityByBpn_InvalidJsonType_Throws()
     {
         //Arrange
         const string json = "{\"some\": [{\"other\": \"json\"}]}";
-        ConfigureHttpClientFactoryFixture(new HttpResponseMessage
+        using var responseMessage = new HttpResponseMessage
         {
             StatusCode = HttpStatusCode.OK,
             Content = new StringContent(json)
-        });
+        };
+        ConfigureHttpClientFactoryFixture(responseMessage);
 
         var sut = _fixture.Create<BpnAccess>();
 
@@ -233,11 +238,12 @@ public async Task FetchLegalEntityByBpn_UnsuccessfulCall_Throws()
     {
         //Arrange
         var json = _fixture.Create<string>();
-        ConfigureHttpClientFactoryFixture(new HttpResponseMessage
+        using var responseMessage = new HttpResponseMessage
         {
             StatusCode = HttpStatusCode.BadRequest,
             Content = new StringContent(json)
-        });
+        };
+        ConfigureHttpClientFactoryFixture(responseMessage);
 
         var sut = _fixture.Create<BpnAccess>();
 
diff --git a/tests/externalsystems/Bpdm.Library/BpdmBusinessLogicTests.cs b/tests/externalsystems/Bpdm.Library/BpdmBusinessLogicTests.cs
index b660d2452d..087059f215 100644
--- a/tests/externalsystems/Bpdm.Library/BpdmBusinessLogicTests.cs
+++ b/tests/externalsystems/Bpdm.Library/BpdmBusinessLogicTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -88,10 +87,10 @@ public async Task PushLegalEntity_WithoutBpdmData_ThrowsUnexpectedConditionExcep
             .Returns((ValidCompanyId, null!));
 
         // Act
-        async Task Act() => await _logic.PushLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.PushLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<UnexpectedConditionException>(Act);
+        var ex = await Assert.ThrowsAsync<UnexpectedConditionException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be("BpdmData should never be null here");
     }
 
@@ -111,10 +110,10 @@ public async Task PushLegalEntity_WithoutExistingApplication_ThrowsNotFoundExcep
         SetupFakesForTrigger();
 
         // Act
-        async Task Act() => await _logic.PushLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.PushLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<NotFoundException>(Act);
+        var ex = await Assert.ThrowsAsync<NotFoundException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be($"Application {applicationId} does not exists.");
     }
 
@@ -131,13 +130,13 @@ public async Task PushLegalEntity_WithBpn_ThrowsConflictException()
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(IdWithoutZipCode, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithoutZipCode)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, "Test", null!, null!, "Test", "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, "Test", null!, null!, "Test", "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
 
         // Act
-        async Task Act() => await _logic.PushLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.PushLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ConflictException>(Act);
+        var ex = await Assert.ThrowsAsync<ConflictException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be("BusinessPartnerNumber is already set");
     }
 
@@ -154,13 +153,13 @@ public async Task PushLegalEntity_WithoutAlpha2Code_ThrowsConflictException()
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(IdWithoutZipCode, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithoutZipCode)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, null!, null!, "Test", "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, null!, null!, "Test", "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
 
         // Act
-        async Task Act() => await _logic.PushLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.PushLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ConflictException>(Act);
+        var ex = await Assert.ThrowsAsync<ConflictException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be("Alpha2Code must not be empty");
     }
 
@@ -177,13 +176,13 @@ public async Task PushLegalEntity_WithoutCity_ThrowsConflictException()
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(IdWithoutZipCode, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithoutZipCode)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, null, "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, null, "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
 
         // Act
-        async Task Act() => await _logic.PushLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.PushLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ConflictException>(Act);
+        var ex = await Assert.ThrowsAsync<ConflictException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be("City must not be empty");
     }
 
@@ -200,13 +199,13 @@ public async Task PushLegalEntity_WithoutStreetName_ThrowsConflictException()
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(IdWithoutZipCode, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithoutZipCode)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, "TEST", null, null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, "TEST", null, null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
 
         // Act
-        async Task Act() => await _logic.PushLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.PushLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ConflictException>(Act);
+        var ex = await Assert.ThrowsAsync<ConflictException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be("StreetName must not be empty");
     }
 
@@ -257,10 +256,10 @@ public async Task HandlePullLegalEntity_WithoutExistingApplication_ThrowsUnexpec
         SetupForHandlePullLegalEntity();
 
         // Act
-        async Task Act() => await _logic.HandlePullLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.HandlePullLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<UnexpectedConditionException>(Act);
+        var ex = await Assert.ThrowsAsync<UnexpectedConditionException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be($"CompanyApplication {applicationId} does not exist");
     }
 
@@ -278,10 +277,10 @@ public async Task HandlePullLegalEntity_WithoutLegalEntity_ThrowsConflictExcepti
         SetupForHandlePullLegalEntity();
 
         // Act
-        async Task Act() => await _logic.HandlePullLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.HandlePullLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ServiceException>(Act);
+        var ex = await Assert.ThrowsAsync<ServiceException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be($"not found");
     }
 
@@ -316,9 +315,6 @@ public async Task HandlePullLegalEntity_WithSharingStateError_ThrowsServiceExcep
         {
             BusinessPartnerNumber = "1"
         };
-        var checklistEntry = _fixture.Build<ApplicationChecklistEntry>()
-            .With(x => x.ApplicationChecklistEntryStatusId,
-                ApplicationChecklistEntryStatusId.TO_DO).Create();
         var checklist = new Dictionary<ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId>
             {
                 {ApplicationChecklistEntryTypeId.REGISTRATION_VERIFICATION, ApplicationChecklistEntryStatusId.DONE},
@@ -329,10 +325,10 @@ public async Task HandlePullLegalEntity_WithSharingStateError_ThrowsServiceExcep
         SetupForHandlePullLegalEntity(company);
 
         // Act
-        async Task Act() => await _logic.HandlePullLegalEntity(context, CancellationToken.None).ConfigureAwait(false);
+        Task Act() => _logic.HandlePullLegalEntity(context, CancellationToken.None);
 
         // Assert
-        var ex = await Assert.ThrowsAsync<ServiceException>(Act);
+        var ex = await Assert.ThrowsAsync<ServiceException>(Act).ConfigureAwait(false);
         ex.Message.Should().Be($"ErrorCode: Code 43, ErrorMessage: This is a test sharing state error");
     }
 
@@ -473,17 +469,17 @@ private void SetupFakesForTrigger()
             .With(x => x.Alpha2Code, "DE")
             .With(x => x.City, "Test")
             .With(x => x.StreetName, "test")
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .Create();
 
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithBpn)))
             .Returns((ValidCompanyId, validData));
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithStateCreated)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, "Test", "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, "Test", "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithoutZipCode)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, null!, null!, "Test", "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, null!, null!, "Test", "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Not.Matches(x => x == IdWithStateCreated || x == IdWithBpn || x == IdWithoutZipCode)))
-            .Returns(new ValueTuple<Guid, BpdmData>());
+            .Returns<(Guid, BpdmData)>(default);
 
         A.CallTo(() => _bpdmService.PutInputLegalEntity(
                 A<BpdmTransferData>.That.Matches(x => x.CompanyName == ValidCompanyName && x.ZipCode == "50668"),
@@ -499,22 +495,22 @@ private void SetupForHandlePullLegalEntity(Company? company = null)
             .With(x => x.Alpha2Code, "DE")
             .With(x => x.City, "Test")
             .With(x => x.StreetName, "test")
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .Create();
 
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithBpn || x == IdWithSharingError || x == IdWithSharingPending || x == IdWithoutSharingProcessStarted)))
             .Returns((ValidCompanyId, validData));
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithStateCreated)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, "Test", "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, "DE", null!, "Test", "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Matches(x => x == IdWithoutZipCode)))
-            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, null!, null!, "Test", "test", null!, null!, new List<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
+            .Returns((ValidCompanyId, new BpdmData(ValidCompanyName, null!, null!, null!, null!, "Test", "test", null!, null!, Enumerable.Empty<(BpdmIdentifierId UniqueIdentifierId, string Value)>())));
         A.CallTo(() => _applicationRepository.GetBpdmDataForApplicationAsync(A<Guid>.That.Not.Matches(x => x == IdWithStateCreated || x == IdWithBpn || x == IdWithoutZipCode || x == IdWithSharingError || x == IdWithSharingPending || x == IdWithoutSharingProcessStarted)))
-            .Returns(new ValueTuple<Guid, BpdmData>());
+            .Returns<(Guid, BpdmData)>(default);
 
         A.CallTo(() => _bpdmService.FetchInputLegalEntity(A<string>.That.Matches(x => x == IdWithStateCreated.ToString()), A<CancellationToken>._))
             .ThrowsAsync(new ServiceException("not found", System.Net.HttpStatusCode.NotFound));
         A.CallTo(() => _bpdmService.FetchInputLegalEntity(A<string>.That.Matches(x => x == IdWithoutZipCode.ToString()), A<CancellationToken>._))
-            .Returns(_fixture.Build<BpdmLegalEntityOutputData>().With(x => x.LegalEntity, (BpdmLegelEntityData?)null).Create());
+            .Returns(_fixture.Build<BpdmLegalEntityOutputData>().With(x => x.LegalEntity, default(BpdmLegelEntityData?)).Create());
         A.CallTo(() => _bpdmService.FetchInputLegalEntity(A<string>.That.Matches(x => x == IdWithBpn.ToString()), A<CancellationToken>._))
             .Returns(_fixture.Build<BpdmLegalEntityOutputData>().With(x => x.LegalEntity, new BpdmLegelEntityData("CAXSDUMMYCATENAZZ", null, null, null, Enumerable.Empty<BpdmProfileClassification>())).Create());
         A.CallTo(() => _bpdmService.GetSharingState(A<Guid>.That.Matches(x => x == IdWithBpn || x == IdWithStateCreated || x == IdWithoutZipCode || x == IdWithoutSharingProcessStarted), A<CancellationToken>._))
@@ -536,7 +532,7 @@ private void SetupForHandlePullLegalEntity(Company? company = null)
                 .Create());
         A.CallTo(() => _bpdmService.GetSharingState(IdWithoutSharingProcessStarted, A<CancellationToken>._))
             .Returns(_fixture.Build<BpdmSharingState>()
-                .With(x => x.SharingProcessStarted, (DateTimeOffset?)null)
+                .With(x => x.SharingProcessStarted, default(DateTimeOffset?))
                 .Create());
 
         if (company != null)
diff --git a/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs b/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs
index 28aa0c0aae..c3af724463 100644
--- a/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs
+++ b/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -67,7 +66,7 @@ public async Task PutInputLegalEntity_WithValidData_DoesNotThrowException()
         var data = _fixture.Create<BpdmTransferData>();
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -88,7 +87,7 @@ public async Task PutInputLegalEntity_WithInvalidData_ThrowsServiceException()
         // Arrange
         var data = _fixture.Create<BpdmTransferData>();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -113,7 +112,7 @@ public async Task SetSharingStateToReady_WithValidData_DoesNotThrowException()
         // Arrange
         var externalId = Guid.NewGuid().ToString();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -134,7 +133,7 @@ public async Task SetSharingStateToReady_WithInvalidData_ThrowsServiceException(
         // Arrange
         var externalId = Guid.NewGuid().ToString();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -225,7 +224,7 @@ public async Task FetchInputLegalEntity_WithValidResult_ReturnsExpected()
         var httpMessageHandlerMock = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
             new StringContent(json));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -245,11 +244,12 @@ public async Task FetchInputLegalEntity_WithValidResult_ReturnsExpected()
     public async Task FetchInputLegalEntity_WithEmtpyObjectResult_ThrowsServiceException()
     {
         // Arrange
+        using var stringContent = new StringContent("{}");
         var httpMessageHandlerMock = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
-            new StringContent("{}"));
+            stringContent);
 
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com"),
         };
@@ -269,11 +269,12 @@ public async Task FetchInputLegalEntity_WithEmtpyObjectResult_ThrowsServiceExcep
     public async Task FetchInputLegalEntity_WithEmtpyResult_ThrowsServiceException()
     {
         // Arrange
+        using var stringContent = new StringContent("");
         var httpMessageHandlerMock = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
-            new StringContent(""));
+            stringContent);
 
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com"),
         };
@@ -294,7 +295,7 @@ public async Task FetchInputLegalEntity_WithNotFoundResult_ReturnsNull()
     {
         // Arrange
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.NotFound);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -314,7 +315,7 @@ public async Task FetchInputLegalEntity_WithInvalidData_ThrowsServiceException()
     {
         // Arrange
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -359,7 +360,7 @@ public async Task GetSharingState_WithValidResult_ReturnsExpected()
         var httpMessageHandlerMock = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
             new StringContent(json));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -384,11 +385,12 @@ public async Task GetSharingState_WithEmtpyObjectResult_ThrowsServiceException()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
+        using var stringContent = new StringContent("{}");
         var httpMessageHandlerMock = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
-            new StringContent("{}"));
+            stringContent);
 
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com"),
         };
@@ -409,11 +411,12 @@ public async Task GetSharingState_WithEmtpyResult_ThrowsServiceException()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
+        using var stringContent = new StringContent("");
         var httpMessageHandlerMock = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
-            new StringContent(""));
+            stringContent);
 
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com"),
         };
@@ -435,7 +438,7 @@ public async Task GetSharingState_WithNotFoundResult_ReturnsNull()
         // Arrange
         var applicationId = Guid.NewGuid();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.NotFound);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -456,7 +459,7 @@ public async Task GetSharingState_WithInvalidData_ThrowsServiceException()
         // Arrange
         var applicationId = Guid.NewGuid();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
diff --git a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs
index 6d3053f27c..1dc34f82b1 100644
--- a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs
+++ b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseBusinessLogicTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -223,7 +222,7 @@ public async Task ProcessClearinghouseResponseAsync_WithConfirmation_UpdatesEntr
         var entry = new ApplicationChecklistEntry(IdWithBpn, ApplicationChecklistEntryTypeId.IDENTITY_WALLET, ApplicationChecklistEntryStatusId.TO_DO, DateTimeOffset.UtcNow);
         var data = _fixture.Build<ClearinghouseResponseData>()
             .With(x => x.Status, ClearinghouseResponseStatus.CONFIRM)
-            .With(x => x.Message, (string?)null)
+            .With(x => x.Message, default(string?))
             .Create();
         SetupForProcessClearinghouseResponse(entry);
 
@@ -265,14 +264,14 @@ public async Task ProcessClearinghouseResponseAsync_WithDecline_UpdatesEntry()
     private void SetupForHandleStartClearingHouse()
     {
         A.CallTo(() => _custodianBusinessLogic.GetWalletByBpnAsync(A<Guid>.That.Matches(x => x == IdWithoutBpn || x == IdWithBpn || x == IdWithApplicationCreated), A<CancellationToken>._))
-            .ReturnsLazily(() => new WalletData("Name", ValidBpn, ValidDid, DateTime.UtcNow, false, null));
+            .Returns(new WalletData("Name", ValidBpn, ValidDid, DateTime.UtcNow, false, null));
         A.CallTo(() => _custodianBusinessLogic.GetWalletByBpnAsync(IdWithCustodianUnavailable, A<CancellationToken>._))
-            .ReturnsLazily(() => (WalletData?)null);
+            .Returns<WalletData?>(null);
         A.CallTo(() => _custodianBusinessLogic.GetWalletByBpnAsync(A<Guid>.That.Not.Matches(x => x == IdWithoutBpn || x == IdWithBpn || x == IdWithApplicationCreated || x == IdWithCustodianUnavailable), A<CancellationToken>._))
-            .ReturnsLazily(() => new WalletData("Name", ValidBpn, null, DateTime.UtcNow, false, null));
+            .Returns(new WalletData("Name", ValidBpn, null, DateTime.UtcNow, false, null));
 
         var participantDetailsWithoutBpn = _fixture.Build<ParticipantDetails>()
-            .With(x => x.Bpn, (string?)null)
+            .With(x => x.Bpn, default(string?))
             .Create();
         var clearinghouseDataWithoutBpn = _fixture.Build<ClearinghouseData>()
             .With(x => x.ApplicationStatusId, CompanyApplicationStatusId.SUBMITTED)
@@ -290,13 +289,13 @@ private void SetupForHandleStartClearingHouse()
             .Create();
 
         A.CallTo(() => _applicationRepository.GetClearinghouseDataForApplicationId(IdWithoutBpn))
-            .ReturnsLazily(() => clearinghouseDataWithoutBpn);
+            .Returns(clearinghouseDataWithoutBpn);
         A.CallTo(() => _applicationRepository.GetClearinghouseDataForApplicationId(IdWithBpn))
-            .ReturnsLazily(() => clearinghouseData);
+            .Returns(clearinghouseData);
         A.CallTo(() => _applicationRepository.GetClearinghouseDataForApplicationId(IdWithApplicationCreated))
-            .ReturnsLazily(() => chDataWithApplicationCreated);
+            .Returns(chDataWithApplicationCreated);
         A.CallTo(() => _applicationRepository.GetClearinghouseDataForApplicationId(A<Guid>.That.Not.Matches(x => x == IdWithoutBpn || x == IdWithBpn || x == IdWithApplicationCreated || x == IdWithCustodianUnavailable)))
-            .ReturnsLazily(() => (ClearinghouseData?)null);
+            .Returns<ClearinghouseData?>(null);
     }
 
     private void SetupForProcessClearinghouseResponse(ApplicationChecklistEntry applicationChecklistEntry)
diff --git a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs
index 36c5a7eceb..d059ad198c 100644
--- a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs
+++ b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -69,7 +68,7 @@ public async Task TriggerCompanyDataPost_WithValidData_DoesNotThrowException()
         var data = _fixture.Create<ClearinghouseTransferData>();
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -89,7 +88,7 @@ public async Task TriggerCompanyDataPost_WithInvalidData_ThrowsServiceException(
         // Arrange
         var data = _fixture.Create<ClearinghouseTransferData>();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -111,7 +110,7 @@ public async Task TriggerCompanyDataPost_WitException_ThrowsServiceException()
         var data = _fixture.Create<ClearinghouseTransferData>();
         var error = new Exception("random exception");
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest, null, error);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -131,8 +130,9 @@ public async Task TriggerCompanyDataPost_WitErrorContent_LogsContent()
     {
         // Arrange
         var data = _fixture.Create<ClearinghouseTransferData>();
-        var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest, new StringContent("{ \"message\": \"Framework test!\" }"));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var stringContent = new StringContent("{ \"message\": \"Framework test!\" }");
+        var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest, stringContent);
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
diff --git a/tests/externalsystems/Custodian.Library.Tests/CustodianBusinessLogicTests.cs b/tests/externalsystems/Custodian.Library.Tests/CustodianBusinessLogicTests.cs
index edbafc207f..c05c8ef2e4 100644
--- a/tests/externalsystems/Custodian.Library.Tests/CustodianBusinessLogicTests.cs
+++ b/tests/externalsystems/Custodian.Library.Tests/CustodianBusinessLogicTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -70,7 +69,7 @@ public async Task GetWalletByBpnAsync_WithoutBpn_ThrowsConflictException()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        A.CallTo(() => _applicationRepository.GetBpnForApplicationIdAsync(applicationId)).ReturnsLazily(() => (string?)null);
+        A.CallTo(() => _applicationRepository.GetBpnForApplicationIdAsync(applicationId)).Returns<string?>(null);
 
         // Act
         async Task Act() => await _logic.GetWalletByBpnAsync(applicationId, CancellationToken.None).ConfigureAwait(false);
@@ -85,7 +84,7 @@ public async Task GetWalletByBpnAsync_WithValidData_CallsExpected()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        A.CallTo(() => _applicationRepository.GetBpnForApplicationIdAsync(applicationId)).ReturnsLazily(() => ValidBpn);
+        A.CallTo(() => _applicationRepository.GetBpnForApplicationIdAsync(applicationId)).Returns(ValidBpn);
 
         // Act
         await _logic.GetWalletByBpnAsync(applicationId, CancellationToken.None).ConfigureAwait(false);
@@ -271,10 +270,10 @@ private void SetupForCreateWallet()
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsForCreateWalletAsync(IdWithBpn))
             .Returns((CompanyId, ValidCompanyName, ValidBpn));
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsForCreateWalletAsync(A<Guid>.That.Not.Matches(x => x == IdWithBpn || x == IdWithoutBpn)))
-            .Returns(((Guid, string, string?))default);
+            .Returns<(Guid, string, string?)>(default);
 
         A.CallTo(() => _custodianService.CreateWalletAsync(ValidBpn, ValidCompanyName, CancellationToken.None))
-            .ReturnsLazily(() => "It worked.");
+            .Returns("It worked.");
     }
 
     #endregion
diff --git a/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs b/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs
index 409e27150c..65ed560c1c 100644
--- a/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs
+++ b/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -84,7 +83,7 @@ public async Task CreateWallet_WithValidData_DoesNotThrowException()
         var data = JsonSerializer.Serialize(new WalletCreationResponse(did), JsonOptions);
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK, data.ToFormContent("application/json"));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -115,7 +114,7 @@ public async Task CreateWallet_WithConflict_ThrowsServiceExceptionWithErrorConte
         var httpMessageHandlerMock = content == null
             ? new HttpMessageHandlerMock(statusCode, null, null, isRequiredUri)
             : new HttpMessageHandlerMock(statusCode, new StringContent(content), null, isRequiredUri);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -140,7 +139,7 @@ public async Task CreateWallet_withSuccessStatusCode_JsonException()
         var content = "this is no json data";
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK, new StringContent(content));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -172,7 +171,7 @@ public async Task GetWalletByBpnAsync_WithValidData_ReturnsWallets()
                 false,
                 null));
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK, data.ToFormContent("application/vc+ld+json"));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -194,14 +193,8 @@ public async Task GetWalletByBpnAsync_WithWalletDataNull_ThrowsServiceException(
     {
         // Arrange
         const string validBpn = "BPNL00000003CRHK";
-        var data = JsonSerializer.Serialize(new WalletData("abc",
-            validBpn,
-            "123",
-            DateTime.UtcNow,
-            false,
-            null));
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -222,7 +215,7 @@ public async Task GetWalletByBpnAsync_WithInvalidData_ThrowsServiceException()
     {
         // Arrange
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -247,7 +240,7 @@ public async Task SetMembership_WithValidData_DoesNotThrowException()
         // Arrange
         const string bpn = "123";
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -268,7 +261,7 @@ public async Task SetMembership_WithConflict_DoesNotThrowException()
         // Arrange
         const string bpn = "123";
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.Conflict, new StringContent(JsonSerializer.Serialize(new MembershipErrorResponse("Credential of type MembershipCredential is already exists "))));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -294,7 +287,7 @@ public async Task SetMembership_WithConflict_ThrowsServiceExceptionWithErrorCont
         var httpMessageHandlerMock = content == null
             ? new HttpMessageHandlerMock(statusCode)
             : new HttpMessageHandlerMock(statusCode, new StringContent(content));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -322,7 +315,7 @@ public async Task TriggerFramework_WithValidData_DoesNotThrowException()
         var data = _fixture.Create<UseCaseDetailData>();
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -357,7 +350,7 @@ public async Task TriggerFramework_WithConflict_ThrowsServiceExceptionWithErrorC
         var httpMessageHandlerMock = content == null
             ? new HttpMessageHandlerMock(statusCode)
             : new HttpMessageHandlerMock(statusCode, new StringContent(content));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -384,7 +377,7 @@ public async Task TriggerDismantler_WithValidData_DoesNotThrowException()
         const string bpn = "123";
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK, null, null, true);
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
@@ -416,7 +409,7 @@ public async Task TriggerDismantler_WithConflict_ThrowsServiceExceptionWithError
         var httpMessageHandlerMock = content == null
             ? new HttpMessageHandlerMock(statusCode)
             : new HttpMessageHandlerMock(statusCode, new StringContent(content));
-        var httpClient = new HttpClient(httpMessageHandlerMock)
+        using var httpClient = new HttpClient(httpMessageHandlerMock)
         {
             BaseAddress = new Uri("https://base.address.com")
         };
diff --git a/tests/externalsystems/OfferProvider.Library/BusinessLogic/OfferProviderBusinessLogicTests.cs b/tests/externalsystems/OfferProvider.Library/BusinessLogic/OfferProviderBusinessLogicTests.cs
index c54a749a4f..b3ec3649eb 100644
--- a/tests/externalsystems/OfferProvider.Library/BusinessLogic/OfferProviderBusinessLogicTests.cs
+++ b/tests/externalsystems/OfferProvider.Library/BusinessLogic/OfferProviderBusinessLogicTests.cs
@@ -143,7 +143,7 @@ public async Task TriggerProviderCallback_InvalidSubscriptionId_Throws()
         // Arrange
         var fakeId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionRepository.GetTriggerProviderCallbackInformation(fakeId))
-            .Returns(((IEnumerable<(Guid, string?)>, string, string?, OfferSubscriptionStatusId))default);
+            .Returns<(IEnumerable<(Guid, string?)>, string?, string?, OfferSubscriptionStatusId)>(default);
         async Task Act() => await _sut.TriggerProviderCallback(fakeId, CancellationToken.None).ConfigureAwait(false);
 
         // Act
@@ -303,7 +303,7 @@ private void SetupTriggerProvider(OfferTypeId offerTypeId = OfferTypeId.APP)
             ));
 
         A.CallTo(() => _offerSubscriptionRepository.GetTriggerProviderInformation(A<Guid>.That.Not.Matches(x => x == _subscriptionId || x == _singleInstanceSubscriptionId)))
-            .Returns((TriggerProviderInformation?)null);
+            .Returns<TriggerProviderInformation?>(null);
 
         var userRoleId = Guid.NewGuid();
         A.CallTo(() => _userRolesRepository.GetUserRoleIdsUntrackedAsync(A<IEnumerable<UserRoleConfig>>._))
diff --git a/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs b/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs
index 202fe10a21..98bbebaf52 100644
--- a/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs
+++ b/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -66,7 +65,7 @@ public async Task TriggerOfferProvider_WithValidCall_ReturnsExpected()
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OfferProviderService>(_options.Value, A<CancellationToken>._))
             .Returns(httpClient);
         const string url = "https://trigger.com";
@@ -86,7 +85,7 @@ public async Task TriggerOfferProvider_WithUnsuccessfulStatusCode_ThrowsExceptio
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OfferProviderService>(_options.Value, A<CancellationToken>._))
             .Returns(httpClient);
         var data = _fixture.Create<OfferThirdPartyAutoSetupData>();
@@ -105,7 +104,7 @@ public async Task TriggerOfferProvider_WithException_ThrowsException()
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.BadRequest, ex: new HttpRequestException("DNS Error"));
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OfferProviderService>(_options.Value, A<CancellationToken>._))
             .Returns(httpClient);
         var data = _fixture.Create<OfferThirdPartyAutoSetupData>();
@@ -128,7 +127,7 @@ public async Task TriggerOfferProviderCallback_WithValidCall_ReturnsExpected()
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OfferProviderService>(_options.Value, A<CancellationToken>._))
             .Returns(httpClient);
         const string url = "https://trigger.com";
@@ -148,7 +147,7 @@ public async Task TriggerOfferProviderCallback_WithUnsuccessfulStatusCode_Throws
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OfferProviderService>(_options.Value, A<CancellationToken>._))
             .Returns(httpClient);
         var data = _fixture.Create<OfferProviderCallbackData>();
@@ -167,7 +166,7 @@ public async Task TriggerOfferProviderCallback_WithException_ThrowsException()
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.BadRequest, ex: new HttpRequestException("DNS Error"));
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OfferProviderService>(_options.Value, A<CancellationToken>._))
             .Returns(httpClient);
         var data = _fixture.Create<OfferProviderCallbackData>();
diff --git a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderBusinessLogicTests.cs b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderBusinessLogicTests.cs
index 9891b7d5a5..c62cd268d8 100644
--- a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderBusinessLogicTests.cs
+++ b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderBusinessLogicTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -20,12 +19,14 @@
 
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
 using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.DependencyInjection;
 using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
+using System.Security.Cryptography;
 using System.Text;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.Tests;
@@ -35,6 +36,7 @@ public class OnboardingServiceProviderBusinessLogicTests
     #region Initialization
 
     private readonly IFixture _fixture;
+    private readonly OnboardingServiceProviderSettings _settings;
     private readonly IOnboardingServiceProviderBusinessLogic _sut;
     private readonly IOnboardingServiceProviderService _onboardingServiceProviderService;
     private readonly INetworkRepository _networkRepository;
@@ -52,8 +54,17 @@ public OnboardingServiceProviderBusinessLogicTests()
 
         A.CallTo(() => portalRepositories.GetInstance<INetworkRepository>()).Returns(_networkRepository);
 
-        var settings = new OnboardingServiceProviderSettings { EncryptionKey = "mysmallkey1234551298765134567890" };
-        _sut = new OnboardingServiceProviderBusinessLogic(_onboardingServiceProviderService, portalRepositories, Options.Create(settings));
+        _settings = new OnboardingServiceProviderSettings
+        {
+            EncryptionConfigs = new EncryptionModeConfig[]
+            {
+                new() { Index=0, EncryptionKey="2b7e151628aed2a6abf715892b7e151628aed2a6abf715892b7e151628aed2a6", CipherMode=CipherMode.ECB, PaddingMode=PaddingMode.PKCS7 },
+                new() { Index=1, EncryptionKey="5892b7e151628aed2a6abf715892b7e151628aed2a62b7e151628aed2a6abf71", CipherMode=CipherMode.CBC, PaddingMode=PaddingMode.PKCS7 },
+            },
+            EncrptionConfigIndex = 1
+        };
+
+        _sut = new OnboardingServiceProviderBusinessLogic(_onboardingServiceProviderService, portalRepositories, Options.Create(_settings));
     }
 
     #endregion
@@ -66,7 +77,7 @@ public async Task TriggerProviderCallback_WithoutNetworkRegistration_DoesntCall(
         // Arrange
         var networkRegistrationId = Guid.NewGuid();
         A.CallTo(() => _networkRepository.GetCallbackData(networkRegistrationId, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_APPROVED))
-            .Returns(((OspDetails?, string, string?, Guid, IEnumerable<string>))default);
+            .Returns<(OspDetails?, string, string?, Guid, IEnumerable<string>)>(default);
 
         // Act
         var Act = () => _sut.TriggerProviderCallback(networkRegistrationId, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_APPROVED, CancellationToken.None);
@@ -103,7 +114,7 @@ public async Task TriggerProviderCallback_WithMultipleDeclineMessages_ThrowsUnex
         var networkRegistrationId = Guid.NewGuid();
         var secret = Encoding.UTF8.GetBytes(_fixture.Create<string>());
         const string Bpn = "BPNL00000001TEST";
-        var details = new OspDetails("https://callback.url", "https://auth.url", "test1", secret);
+        var details = new OspDetails("https://callback.url", "https://auth.url", "test1", secret, null, 0);
         A.CallTo(() => _networkRepository.GetCallbackData(networkRegistrationId, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_DECLINED))
             .Returns((details, Guid.NewGuid().ToString(), Bpn, Guid.NewGuid(), _fixture.CreateMany<string>(2)));
 
@@ -122,7 +133,7 @@ public async Task TriggerProviderCallback_WithWrongProcessStepTypeId_ThrowsUnexp
         var networkRegistrationId = Guid.NewGuid();
         var secret = Encoding.UTF8.GetBytes(_fixture.Create<string>());
         const string Bpn = "BPNL00000001TEST";
-        var details = new OspDetails("https://callback.url", "https://auth.url", "test1", secret);
+        var details = new OspDetails("https://callback.url", "https://auth.url", "test1", secret, null, 0);
         A.CallTo(() => _networkRepository.GetCallbackData(networkRegistrationId, ProcessStepTypeId.START_AUTOSETUP))
             .Returns((details, Guid.NewGuid().ToString(), Bpn, Guid.NewGuid(), Enumerable.Empty<string>()));
 
@@ -135,10 +146,13 @@ public async Task TriggerProviderCallback_WithWrongProcessStepTypeId_ThrowsUnexp
     }
 
     [Theory]
-    [InlineData(ProcessStepTypeId.TRIGGER_CALLBACK_OSP_SUBMITTED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been submitted for further processing", CompanyApplicationStatusId.SUBMITTED)]
-    [InlineData(ProcessStepTypeId.TRIGGER_CALLBACK_OSP_APPROVED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been approved", CompanyApplicationStatusId.CONFIRMED)]
-    [InlineData(ProcessStepTypeId.TRIGGER_CALLBACK_OSP_DECLINED, $"Application 2b965267-555c-4834-a323-09b7858c29ae has been declined with reason: this is a test", CompanyApplicationStatusId.DECLINED)]
-    public async Task TriggerProviderCallback_WithValidData_CallsExpected(ProcessStepTypeId processStepTypeId, string message, CompanyApplicationStatusId applicationStatusId)
+    [InlineData("/UJ0wr5w1HiXaLo25QfxqXWhyq6Pa9w+CvBFNs1782s=", null, 0, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_SUBMITTED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been submitted for further processing", CompanyApplicationStatusId.SUBMITTED)]
+    [InlineData("/UJ0wr5w1HiXaLo25QfxqXWhyq6Pa9w+CvBFNs1782s=", null, 0, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_APPROVED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been approved", CompanyApplicationStatusId.CONFIRMED)]
+    [InlineData("/UJ0wr5w1HiXaLo25QfxqXWhyq6Pa9w+CvBFNs1782s=", null, 0, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_DECLINED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been declined with reason: this is a test", CompanyApplicationStatusId.DECLINED)]
+    [InlineData("hzl/2shJlzl64Y4FGNYtuFjR2c4VKXsfBz4UeQKDovQ=", "7hFxEXvfoiRTrHYMA+vkug==", 1, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_SUBMITTED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been submitted for further processing", CompanyApplicationStatusId.SUBMITTED)]
+    [InlineData("hzl/2shJlzl64Y4FGNYtuFjR2c4VKXsfBz4UeQKDovQ=", "7hFxEXvfoiRTrHYMA+vkug==", 1, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_APPROVED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been approved", CompanyApplicationStatusId.CONFIRMED)]
+    [InlineData("hzl/2shJlzl64Y4FGNYtuFjR2c4VKXsfBz4UeQKDovQ=", "7hFxEXvfoiRTrHYMA+vkug==", 1, ProcessStepTypeId.TRIGGER_CALLBACK_OSP_DECLINED, "Application 2b965267-555c-4834-a323-09b7858c29ae has been declined with reason: this is a test", CompanyApplicationStatusId.DECLINED)]
+    public async Task TriggerProviderCallback_WithValidData_CallsExpected(string clientSecret, string? initialVector, int index, ProcessStepTypeId processStepTypeId, string message, CompanyApplicationStatusId applicationStatusId)
     {
         // Act
         const string CallbackUrl = "https://callback.url";
@@ -146,7 +160,7 @@ public async Task TriggerProviderCallback_WithValidData_CallsExpected(ProcessSte
         var externalId = Guid.NewGuid().ToString();
         var applicationId = new Guid("2b965267-555c-4834-a323-09b7858c29ae");
         var networkRegistrationId = Guid.NewGuid();
-        var details = new OspDetails(CallbackUrl, "https://auth.url", "test1", Convert.FromBase64String("9qCKYG0aXOWKl9PXcRhrSw=="));
+        var details = new OspDetails(CallbackUrl, "https://auth.url", "test1", Convert.FromBase64String(clientSecret), initialVector == null ? null : Convert.FromBase64String(initialVector), index);
         A.CallTo(() => _networkRepository.GetCallbackData(networkRegistrationId, processStepTypeId))
             .Returns((details, externalId, Bpn, applicationId, processStepTypeId == ProcessStepTypeId.TRIGGER_CALLBACK_OSP_DECLINED ? Enumerable.Repeat("this is a test", 1) : Enumerable.Empty<string>()));
 
@@ -155,7 +169,7 @@ public async Task TriggerProviderCallback_WithValidData_CallsExpected(ProcessSte
 
         // Assert
         A.CallTo(() => _onboardingServiceProviderService.TriggerProviderCallback(
-                A<OspTriggerDetails>._,
+                new OspTriggerDetails(CallbackUrl, "https://auth.url", "test1", "Sup3rS3cureTest!"),
                 new OnboardingServiceProviderCallbackData(externalId, applicationId, Bpn, applicationStatusId, message),
                 A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
diff --git a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs
index ae14ff72d7..1f633f1ee8 100644
--- a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs
+++ b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -52,7 +51,7 @@ public async Task TriggerProviderCallback_WithValidCall_ReturnsExpected()
     {
         // Arrange
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK);
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OnboardingServiceProviderService>(A<KeyVaultAuthSettings>._, A<CancellationToken>._))
             .Returns(httpClient);
         var ospDetails = new OspTriggerDetails("https://trigger.com", "https://auth.com", "test1", "ZKU7jbfe9ZUNBVYxdXgrjqtihXfR2aRr");
@@ -71,7 +70,7 @@ public async Task TriggerProviderCallback_WithUnsuccessfulStatusCode_ThrowsExcep
     {
         // Arrange
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OnboardingServiceProviderService>(A<KeyVaultAuthSettings>._, A<CancellationToken>._))
             .Returns(httpClient);
         var ospDetails = new OspTriggerDetails("https://callback.com", "https://auth.com", "test1", "ZKU7jbfe9ZUNBVYxdXgrjqtihXfR2aRr");
@@ -91,7 +90,7 @@ public async Task TriggerProviderCallback_WithException_ThrowsException()
         // Arrange
         var httpMessageHandlerMock =
             new HttpMessageHandlerMock(HttpStatusCode.BadRequest, ex: new HttpRequestException("DNS Error"));
-        var httpClient = new HttpClient(httpMessageHandlerMock);
+        using var httpClient = new HttpClient(httpMessageHandlerMock);
         A.CallTo(() => _tokenService.GetAuthorizedClient<OnboardingServiceProviderService>(A<KeyVaultAuthSettings>._, A<CancellationToken>._))
             .Returns(httpClient);
         var ospDetails = new OspTriggerDetails("https://callback.com", "https://auth.com", "test1", "ZKU7jbfe9ZUNBVYxdXgrjqtihXfR2aRr");
diff --git a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs
index d570cc092e..63649fdd12 100644
--- a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs
+++ b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryBusinessLogicTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -121,9 +120,7 @@ public async Task StartSelfDescriptionRegistration_WithValidData_CompanyIsUpdate
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(ApplicationId, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         var entry = new ApplicationChecklistEntry(Guid.NewGuid(), ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP, ApplicationChecklistEntryStatusId.TO_DO, DateTimeOffset.UtcNow);
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsWithUniqueIdentifiersAsync(ApplicationId))
-            .ReturnsLazily(() => new ValueTuple<Guid, string?, string, IEnumerable<(UniqueIdentifierId Id, string Value)>>(CompanyId, Bpn, CountryCode, UniqueIdentifiers));
-        A.CallTo(() => _service.RegisterSelfDescriptionAsync(ApplicationId, UniqueIdentifiers, CountryCode, Bpn, CancellationToken.None))
-            .ReturnsLazily(() => Task.CompletedTask);
+            .Returns((CompanyId, Bpn, CountryCode, UniqueIdentifiers));
 
         // Act
         var result = await _sut.StartSelfDescriptionRegistration(context, CancellationToken.None).ConfigureAwait(false);
@@ -153,7 +150,7 @@ public async Task StartSelfDescriptionRegistration_WithNoApplication_ThrowsConfl
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(ApplicationId, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsWithUniqueIdentifiersAsync(ApplicationId))
-            .ReturnsLazily(() => new ValueTuple<Guid, string?, string, IEnumerable<(UniqueIdentifierId Id, string Value)>>());
+            .Returns<(Guid, string?, string, IEnumerable<(UniqueIdentifierId, string)>)>(default);
 
         // Act
         async Task Act() => await _sut.StartSelfDescriptionRegistration(context, CancellationToken.None).ConfigureAwait(false);
@@ -178,7 +175,7 @@ public async Task StartSelfDescriptionRegistration_WithBpnNotSet_ThrowsConflictE
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(ApplicationId, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsWithUniqueIdentifiersAsync(ApplicationId))
-            .ReturnsLazily(() => new ValueTuple<Guid, string?, string, IEnumerable<(UniqueIdentifierId Id, string Value)>>(CompanyId, null, CountryCode, new List<(UniqueIdentifierId Id, string Value)>()));
+            .Returns((CompanyId, null, CountryCode, Enumerable.Empty<(UniqueIdentifierId Id, string Value)>()));
 
         // Act
         async Task Act() => await _sut.StartSelfDescriptionRegistration(context, CancellationToken.None).ConfigureAwait(false);
@@ -200,7 +197,7 @@ public async Task ProcessFinishSelfDescriptionLp_ConfirmWithValidData_CompanyIsU
         // Arrange
         var applicationChecklistEntry = new ApplicationChecklistEntry(Guid.NewGuid(), ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP, ApplicationChecklistEntryStatusId.TO_DO, DateTimeOffset.UtcNow);
         var company = _fixture.Build<Company>()
-            .With(x => x.SelfDescriptionDocumentId, (Guid?)null)
+            .With(x => x.SelfDescriptionDocumentId, default(Guid?))
             .Create();
         const string contentJson = "{\"@context\":[\"https://www.w3.org/2018/credentials/v1\",\"https://github.com/catenax-ng/tx-sd-factory/raw/clearing-house/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld\",\"https://w3id.org/vc/status-list/2021/v1\"],\"type\":[\"VerifiableCredential\",\"LegalPerson\"],\"issuer\":\"did:sov:12345\",\"issuanceDate\":\"2023-02-18T23:03:16Z\",\"expirationDate\":\"2023-05-19T23:03:16Z\",\"credentialSubject\":{\"bpn\":\"BPNL000000000000\",\"registrationNumber\":[{\"type\":\"local\",\"value\":\"o12345678\"}],\"headquarterAddress\":{\"countryCode\":\"DE\"},\"type\":\"LegalPerson\",\"legalAddress\":{\"countryCode\":\"DE\"},\"id\":\"did:sov:12345\"},\"credentialStatus\":{\"id\":\"https://managed-identity-wallets.int.demo.catena-x.net/api/credentials/status/123\",\"type\":\"StatusList2021Entry\",\"statusPurpose\":\"revocation\",\"statusListIndex\":\"58\",\"statusListCredential\":\"https://managed-identity-wallets.int.demo.catena-x.net/api/credentials/status/123\"},\"proof\":{\"type\":\"Ed25519Signature2018\",\"created\":\"2023-02-18T23:03:18Z\",\"proofPurpose\":\"assertionMethod\",\"verificationMethod\":\"did:sov:12345#key-1\",\"jws\":\"test\"}}";
         var data = new SelfDescriptionResponseData(ApplicationId, SelfDescriptionStatus.Confirm, null, contentJson);
@@ -227,9 +224,8 @@ public async Task ProcessFinishSelfDescriptionLp_ConfirmWithValidData_CompanyIsU
     public async Task ProcessFinishSelfDescriptionLp_ConfirmWitNoDocument_ThrowsConflictException()
     {
         // Arrange
-        var applicationChecklistEntry = new ApplicationChecklistEntry(Guid.NewGuid(), ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP, ApplicationChecklistEntryStatusId.TO_DO, DateTimeOffset.UtcNow);
         var company = _fixture.Build<Company>()
-            .With(x => x.SelfDescriptionDocumentId, (Guid?)null)
+            .With(x => x.SelfDescriptionDocumentId, default(Guid?))
             .Create();
         var data = new SelfDescriptionResponseData(ApplicationId, SelfDescriptionStatus.Confirm, null, null);
 
@@ -247,7 +243,7 @@ public async Task ProcessFinishSelfDescriptionLp_FailedWithValidData_CompanyIsUp
         // Arrange
         var applicationChecklistEntry = new ApplicationChecklistEntry(Guid.NewGuid(), ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP, ApplicationChecklistEntryStatusId.TO_DO, DateTimeOffset.UtcNow);
         var company = _fixture.Build<Company>()
-            .With(x => x.SelfDescriptionDocumentId, (Guid?)null)
+            .With(x => x.SelfDescriptionDocumentId, default(Guid?))
             .Create();
         var data = new SelfDescriptionResponseData(ApplicationId, SelfDescriptionStatus.Failed, "test message", null);
         SetupForProcessFinish(company, applicationChecklistEntry);
@@ -271,7 +267,7 @@ public async Task ProcessFinishSelfDescriptionLp_FailedWithoutMessage_ThrowsConf
     {
         // Arrange
         var company = _fixture.Build<Company>()
-            .With(x => x.SelfDescriptionDocumentId, (Guid?)null)
+            .With(x => x.SelfDescriptionDocumentId, default(Guid?))
             .Create();
         var data = new SelfDescriptionResponseData(ApplicationId, SelfDescriptionStatus.Failed, null, null);
 
@@ -296,7 +292,7 @@ public async Task RegisterSelfDescriptionAsync_WithNoApplication_ThrowsConflictE
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(ApplicationId, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsWithUniqueIdentifiersAsync(ApplicationId))
-            .ReturnsLazily(() => new ValueTuple<Guid, string?, string, IEnumerable<(UniqueIdentifierId Id, string Value)>>());
+            .Returns<(Guid, string?, string, IEnumerable<(UniqueIdentifierId, string)>)>(default);
 
         // Act
         async Task Act() => await _sut.StartSelfDescriptionRegistration(context, CancellationToken.None).ConfigureAwait(false);
@@ -319,7 +315,7 @@ public async Task RegisterSelfDescriptionAsync_WithBpnNotSet_ThrowsConflictExcep
             .ToImmutableDictionary();
         var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(ApplicationId, default, checklist, Enumerable.Empty<ProcessStepTypeId>());
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsWithUniqueIdentifiersAsync(ApplicationId))
-            .ReturnsLazily(() => new ValueTuple<Guid, string?, string, IEnumerable<(UniqueIdentifierId Id, string Value)>>(CompanyId, null, CountryCode, new List<(UniqueIdentifierId Id, string Value)>()));
+            .Returns((CompanyId, null, CountryCode, Enumerable.Empty<(UniqueIdentifierId Id, string Value)>()));
 
         // Act
         async Task Act() => await _sut.StartSelfDescriptionRegistration(context, CancellationToken.None).ConfigureAwait(false);
@@ -453,10 +449,10 @@ private void SetupForProcessFinish(Company company, ApplicationChecklistEntry ap
                 ProcessStepTypeId.FINISH_SELF_DESCRIPTION_LP,
                 null,
                 new[] { ProcessStepTypeId.START_SELF_DESCRIPTION_LP }))
-            .ReturnsLazily(() => new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _process, Guid.NewGuid(),
+            .Returns(new IApplicationChecklistService.ManualChecklistProcessStepData(ApplicationId, _process, Guid.NewGuid(),
                 ApplicationChecklistEntryTypeId.SELF_DESCRIPTION_LP,
                 ImmutableDictionary<ApplicationChecklistEntryTypeId, (ApplicationChecklistEntryStatusId, string?)>.Empty,
-                new List<ProcessStep>()));
+                Enumerable.Empty<ProcessStep>()));
         A.CallTo(() => _checklistService.FinalizeChecklistEntryAndProcessSteps(
                 A<IApplicationChecklistService.ManualChecklistProcessStepData>._, A<Action<ApplicationChecklistEntry>>._, A<Action<ApplicationChecklistEntry>>._,
                 A<IEnumerable<ProcessStepTypeId>>._))
diff --git a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs
index 26acaad7b6..03b9f66f52 100644
--- a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs
+++ b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -77,7 +76,7 @@ public async Task RegisterConnectorAsync_WithValidData_CreatesDocumentInDatabase
         const string bpn = "BPNL000000000009";
         var id = Guid.NewGuid();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK);
-        CreateHttpClient(httpMessageHandlerMock);
+        using var httpClient = CreateHttpClient(httpMessageHandlerMock);
 
         // Act
         await _service.RegisterConnectorAsync(id, "https://connect-tor.com", bpn, CancellationToken.None).ConfigureAwait(false);
@@ -93,7 +92,7 @@ public async Task RegisterConnectorAsync_WithInvalidData_ThrowsException()
         var id = Guid.NewGuid();
         const string bpn = "BPNL000000000009";
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        CreateHttpClient(httpMessageHandlerMock);
+        using var httpClient = CreateHttpClient(httpMessageHandlerMock);
 
         // Act
         async Task Action() => await _service.RegisterConnectorAsync(id, "https://connect-tor.com", bpn, CancellationToken.None).ConfigureAwait(false);
@@ -115,7 +114,7 @@ public async Task RegisterSelfDescriptionAsync_WithValidData_CreatesDocumentInDa
         const string bpn = "BPNL000000000009";
         var applicationId = Guid.NewGuid();
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.OK);
-        CreateHttpClient(httpMessageHandlerMock);
+        using var httpClient = CreateHttpClient(httpMessageHandlerMock);
 
         // Act
         await _service.RegisterSelfDescriptionAsync(applicationId, UniqueIdentifiers, "de", bpn, CancellationToken.None).ConfigureAwait(false);
@@ -131,7 +130,7 @@ public async Task RegisterSelfDescriptionAsync_WithInvalidData_ThrowsException()
         var applicationId = Guid.NewGuid();
         const string bpn = "BPNL000000000009";
         var httpMessageHandlerMock = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
-        CreateHttpClient(httpMessageHandlerMock);
+        using var httpClient = CreateHttpClient(httpMessageHandlerMock);
 
         // Act
         async Task Action() => await _service.RegisterSelfDescriptionAsync(applicationId, UniqueIdentifiers, "de", bpn, CancellationToken.None).ConfigureAwait(false);
@@ -146,11 +145,12 @@ public async Task RegisterSelfDescriptionAsync_WithInvalidData_ThrowsException()
 
     #region Setup
 
-    private void CreateHttpClient(HttpMessageHandler httpMessageHandlerMock)
+    private HttpClient CreateHttpClient(HttpMessageHandler httpMessageHandlerMock)
     {
         var httpClient = new HttpClient(httpMessageHandlerMock) { BaseAddress = new Uri(_options.Value.SdFactoryUrl) };
         A.CallTo(() => _tokenService.GetAuthorizedClient<SdFactoryService>(_options.Value, CancellationToken.None))
-            .ReturnsLazily(() => httpClient);
+            .Returns(httpClient);
+        return httpClient;
     }
 
     private void SetupRepositoryMethods()
diff --git a/tests/framework/Framework.DBAccess.Tests/ContextExtensionsTests.cs b/tests/framework/Framework.DBAccess.Tests/ContextExtensionsTests.cs
index ea4f7508b4..8ea98088bf 100644
--- a/tests/framework/Framework.DBAccess.Tests/ContextExtensionsTests.cs
+++ b/tests/framework/Framework.DBAccess.Tests/ContextExtensionsTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -125,8 +124,8 @@ public void AddAttachRemoveRangeSuccess(
         IEnumerable<string> updatedEntityKeys, IEnumerable<string> updatedEntityValues,
         IEnumerable<string> removedEntityKeys)
     {
-        var initialItems = initialKeys.Zip(initialValues).Select(x => ((Guid InitialKey, string InitialValue))(new Guid(x.First), x.Second)).ToImmutableArray();
-        var updateItems = updateKeys.Zip(updateValues).Select(x => ((Guid UpdateKey, string UpdateValue))(new Guid(x.First), x.Second)).ToImmutableArray();
+        var initialItems = initialKeys.Zip(initialValues).Select(x => (InitialKey: new Guid(x.First), InitialValue: x.Second)).ToImmutableArray();
+        var updateItems = updateKeys.Zip(updateValues).Select(x => (UpdateKey: new Guid(x.First), UpdateValue: x.Second)).ToImmutableArray();
         var addedEntities = addedEntityKeys.Zip(addedEntityValues).Select(x => new TestValueEntity(new Guid(x.First), x.Second)).ToImmutableArray();
         var updatedEntities = updatedEntityKeys.Zip(updatedEntityValues).Select(x => new TestValueEntity(new Guid(x.First), x.Second)).ToImmutableArray();
         var removedEntityIds = removedEntityKeys.Select(x => new Guid(x)).ToImmutableArray();
diff --git a/tests/framework/Framework.IO.Tests/CancelableStreamTest.cs b/tests/framework/Framework.IO.Tests/CancelableStreamTest.cs
index 918c795734..e7407c3843 100644
--- a/tests/framework/Framework.IO.Tests/CancelableStreamTest.cs
+++ b/tests/framework/Framework.IO.Tests/CancelableStreamTest.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -52,21 +51,25 @@ public CancelableStreamTest()
     [Fact]
     public async void TestReadAsyncNoOtherTokenSuccess()
     {
-        var (sut, _) = SetupForRead();
+        var (sut, source) = SetupForRead();
         var firstResult = await sut.ReadAsync(_memory).ConfigureAwait(false);
         var secondResult = await sut.ReadAsync(_memory).ConfigureAwait(false);
         firstResult.Should().Be(_numBytesFirstRead);
         secondResult.Should().Be(_numBytesSecondRead);
+        source.Dispose();
     }
 
     [Fact]
     public async void TestReadAsyncWithUncancelledOtherTokenSuccess()
     {
-        var (sut, _) = SetupForRead();
-        var firstResult = await sut.ReadAsync(_memory, new CancellationTokenSource().Token).ConfigureAwait(false);
-        var secondResult = await sut.ReadAsync(_memory, new CancellationTokenSource().Token).ConfigureAwait(false);
+        var (sut, source) = SetupForRead();
+        using var firstSource = new CancellationTokenSource();
+        using var secondSource = new CancellationTokenSource();
+        var firstResult = await sut.ReadAsync(_memory, firstSource.Token).ConfigureAwait(false);
+        var secondResult = await sut.ReadAsync(_memory, secondSource.Token).ConfigureAwait(false);
         firstResult.Should().Be(_numBytesFirstRead);
         secondResult.Should().Be(_numBytesSecondRead);
+        source.Dispose();
     }
 
     [Fact]
@@ -75,16 +78,17 @@ public async void TestReadAsyncSourceCancelledWithUncancelledOtherTokenSuccess()
         var (sut, source) = SetupForRead();
         var firstResult = await sut.ReadAsync(_memory).ConfigureAwait(false);
         source.Cancel();
-        var secondResult = await sut.ReadAsync(_memory, new CancellationTokenSource().Token).ConfigureAwait(false);
+        using var secondSource = new CancellationTokenSource();
+        var secondResult = await sut.ReadAsync(_memory, secondSource.Token).ConfigureAwait(false);
         firstResult.Should().Be(_numBytesFirstRead);
         secondResult.Should().Be(_numBytesSecondRead);
+        source.Dispose();
     }
 
     [Fact]
     public async void TestReadAsyncWithCancelledOtherTokenThrows()
     {
         var (sut, source) = SetupForRead();
-
         var firstResult = await sut.ReadAsync(_memory).ConfigureAwait(false);
         firstResult.Should().Be(_numBytesFirstRead);
 
@@ -92,13 +96,13 @@ public async void TestReadAsyncWithCancelledOtherTokenThrows()
             await sut.ReadAsync(_memory, new CancellationToken(true)).ConfigureAwait(false)
         ).ConfigureAwait(false);
         exception.Should().Be(_otherTokenCanceledException);
+        source.Dispose();
     }
 
     [Fact]
     public async void TestReadAsyncSourceCancelledThrows()
     {
         var (sut, source) = SetupForRead();
-
         var firstResult = await sut.ReadAsync(_memory).ConfigureAwait(false);
         firstResult.Should().Be(_numBytesFirstRead);
 
@@ -107,6 +111,7 @@ public async void TestReadAsyncSourceCancelledThrows()
             await sut.ReadAsync(_memory).ConfigureAwait(false)
         ).ConfigureAwait(false);
         exception.Should().Be(_sourceTokenCanceledException);
+        source.Dispose();
     }
 
     #endregion
diff --git a/tests/framework/Framework.IO.Tests/CsvParserTest.cs b/tests/framework/Framework.IO.Tests/CsvParserTest.cs
index fa4b4dff34..b15cac567d 100644
--- a/tests/framework/Framework.IO.Tests/CsvParserTest.cs
+++ b/tests/framework/Framework.IO.Tests/CsvParserTest.cs
@@ -362,7 +362,7 @@ private MemoryStream SetupStream(string stringdata)
     private static async IAsyncEnumerable<(bool Processed, Exception? Error)> ProcessLinesError(IAsyncEnumerable<FakeLineType> lines)
     {
         var numLine = 0;
-        await foreach (var line in lines)
+        await foreach (var _ in lines)
         {
             numLine++;
             yield return numLine == 3
@@ -374,7 +374,7 @@ private MemoryStream SetupStream(string stringdata)
     private static async IAsyncEnumerable<(bool Processed, Exception? Error)> ProcessLinesThrows(IAsyncEnumerable<FakeLineType> lines)
     {
         var numLine = 0;
-        await foreach (var line in lines)
+        await foreach (var _ in lines)
         {
             numLine++;
             if (numLine == 3)
diff --git a/tests/framework/Framework.Linq.Tests/DuplicatesExtensionTests.cs b/tests/framework/Framework.Linq.Tests/DuplicatesExtensionTests.cs
index 8b02e71791..7eafc22ec1 100644
--- a/tests/framework/Framework.Linq.Tests/DuplicatesExtensionTests.cs
+++ b/tests/framework/Framework.Linq.Tests/DuplicatesExtensionTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/framework/Framework.Linq.Tests/IfAnyTests.cs b/tests/framework/Framework.Linq.Tests/IfAnyTests.cs
index a69e05f4b5..f97a039e23 100644
--- a/tests/framework/Framework.Linq.Tests/IfAnyTests.cs
+++ b/tests/framework/Framework.Linq.Tests/IfAnyTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -233,6 +232,7 @@ public T Current
 
         public void Dispose()
         {
+            GC.SuppressFinalize(this);
         }
     }
 
diff --git a/tests/framework/Framework.Models.Tests/EncryptionHelperTests.cs b/tests/framework/Framework.Models.Tests/EncryptionHelperTests.cs
new file mode 100644
index 0000000000..dd7b194ce7
--- /dev/null
+++ b/tests/framework/Framework.Models.Tests/EncryptionHelperTests.cs
@@ -0,0 +1,79 @@
+/********************************************************************************
+ * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Encryption;
+using System.Security.Cryptography;
+
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Tests;
+
+public class CryptoHelperTests
+{
+    private readonly IFixture _fixture;
+    public CryptoHelperTests()
+    {
+        _fixture = new Fixture();
+    }
+
+    [Theory]
+    [InlineData(PaddingMode.ANSIX923)]
+    [InlineData(PaddingMode.ISO10126)]
+    [InlineData(PaddingMode.PKCS7)]
+    public void EncryptDecrypt_ECB_NoIV_Success(PaddingMode paddingMode)
+    {
+        var data = _fixture.Create<string>();
+        var key = _fixture.CreateMany<byte>(32).ToArray();
+        var (encrypted, _) = CryptoHelper.Encrypt(data, key, CipherMode.ECB, paddingMode);
+        var result = CryptoHelper.Decrypt(encrypted, null, key, CipherMode.ECB, paddingMode);
+        result.Should().Be(data);
+    }
+
+    [Theory]
+    [InlineData(CipherMode.CBC, PaddingMode.ANSIX923)]
+    [InlineData(CipherMode.CBC, PaddingMode.ISO10126)]
+    [InlineData(CipherMode.CBC, PaddingMode.PKCS7)]
+    [InlineData(CipherMode.CFB, PaddingMode.ANSIX923)]
+    [InlineData(CipherMode.CFB, PaddingMode.ISO10126)]
+    [InlineData(CipherMode.CFB, PaddingMode.None)]
+    [InlineData(CipherMode.CFB, PaddingMode.PKCS7)]
+    [InlineData(CipherMode.CFB, PaddingMode.Zeros)]
+    [InlineData(CipherMode.ECB, PaddingMode.ANSIX923)]
+    [InlineData(CipherMode.ECB, PaddingMode.ISO10126)]
+    [InlineData(CipherMode.ECB, PaddingMode.PKCS7)]
+
+    public void EncryptDecrypt_WithIV_Success(CipherMode cipherMode, PaddingMode paddingMode)
+    {
+        var data = _fixture.Create<string>();
+        var key = _fixture.CreateMany<byte>(32).ToArray();
+        var (encrypted, iv) = CryptoHelper.Encrypt(data, key, cipherMode, paddingMode);
+        var result = CryptoHelper.Decrypt(encrypted, iv, key, cipherMode, paddingMode);
+        result.Should().Be(data);
+    }
+
+    [Theory]
+    [InlineData("Sup3rS3cureTest!", "2b7e151628aed2a6abf715892b7e151628aed2a6abf715892b7e151628aed2a6", CipherMode.ECB, PaddingMode.PKCS7)]
+    [InlineData("Sup3rS3cureTest!", "5892b7e151628aed2a6abf715892b7e151628aed2a62b7e151628aed2a6abf71", CipherMode.CBC, PaddingMode.PKCS7)]
+    public void Foo(string data, string key, CipherMode cipherMode, PaddingMode paddingMode)
+    {
+        var (foo, bar) = CryptoHelper.Encrypt(data, Convert.FromHexString(key), cipherMode, paddingMode);
+        var secret = Convert.ToBase64String(foo);
+        var iv = Convert.ToBase64String(bar);                    // used to create testdata for OnboardingServiceProviderBusinessLogicTests
+        secret.Should().NotBeNullOrWhiteSpace();
+        iv.Should().NotBeNullOrWhiteSpace();
+    }
+}
diff --git a/tests/framework/Framework.Models.Tests/HasNextEnumeratorExtensionsTests.cs b/tests/framework/Framework.Models.Tests/HasNextEnumeratorExtensionsTests.cs
index ee7a20a969..bb23bb7e30 100644
--- a/tests/framework/Framework.Models.Tests/HasNextEnumeratorExtensionsTests.cs
+++ b/tests/framework/Framework.Models.Tests/HasNextEnumeratorExtensionsTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -78,7 +77,7 @@ static IEnumerable<string> Act(IHasNextEnumerator<string> hasNextEnumerator)
         }
 
         // Act
-        var result = Assert.Throws<InvalidOperationException>(() => Act(sut).ToList());
+        Assert.Throws<InvalidOperationException>(() => Act(sut).ToList());
 
         // Assert
         A.CallTo(() => enumerator.MoveNext()).MustHaveHappened(6, Times.Exactly);
diff --git a/tests/framework/Framework.Models.Tests/ValidationTests.cs b/tests/framework/Framework.Models.Tests/ValidationTests.cs
index 8573629ed6..6ea6de261f 100644
--- a/tests/framework/Framework.Models.Tests/ValidationTests.cs
+++ b/tests/framework/Framework.Models.Tests/ValidationTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -88,14 +87,17 @@ public void DistinctValuesValidation_Distinct_ReturnsExpected()
                 }
             ]
         }";
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configuration))).Build();
+
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configuration));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var settings = config.Get<DistinctValuesTestSettings>();
+        settings.Should().NotBeNull();
         var name = _fixture.Create<string>();
 
         var sut = new DistinctValuesValidation<DistinctValuesTestSettings>(name, config);
 
         // Act
-        var result = sut.Validate(name, settings);
+        var result = sut.Validate(name, settings!);
 
         // Assert
         result.Should().NotBeNull().And.Match<ValidateOptionsResult>(r =>
@@ -115,7 +117,9 @@ public void DistinctValuesValidation_Missing_ReturnsExpected()
             ""StringProperty"": [],
             ""TypedProperty"": []
         }";
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configuration))).Build();
+
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configuration));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var settings = new DistinctValuesTestSettings();
         var name = _fixture.Create<string>();
 
@@ -159,14 +163,17 @@ public void DistinctValuesValidation_Duplicates_ReturnsExpected()
                 }
             ]
         }";
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configuration))).Build();
+
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configuration));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var settings = config.Get<DistinctValuesTestSettings>();
+        settings.Should().NotBeNull();
         var name = _fixture.Create<string>();
 
         var sut = new DistinctValuesValidation<DistinctValuesTestSettings>(name, config);
 
         // Act
-        var result = sut.Validate(name, settings);
+        var result = sut.Validate(name, settings!);
 
         // Assert
         result.Should().NotBeNull().And.Match<ValidateOptionsResult>(r =>
@@ -198,13 +205,16 @@ public void DistinctValuesValidation_InvalidProperty_ThrowsExpected()
                 }
             ]
         }";
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configuration))).Build();
+
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configuration));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var settings = config.Get<InvalidDistinctValuesTestSettings>();
+        settings.Should().NotBeNull();
         var name = _fixture.Create<string>();
 
         var sut = new DistinctValuesValidation<InvalidDistinctValuesTestSettings>(name, config);
 
-        var Act = () => sut.Validate(name, settings);
+        var Act = () => sut.Validate(name, settings!);
 
         // Act
         var result = Assert.Throws<UnexpectedConditionException>(Act);
@@ -222,7 +232,9 @@ public void DistinctValuesValidation_EmptyInvalidProperty_ThrowsExpected()
         {
             ""InvalidProperty"": []
         }";
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configuration))).Build();
+
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configuration));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var settings = new InvalidDistinctValuesTestSettings();
         var name = _fixture.Create<string>();
 
@@ -266,14 +278,17 @@ public void DistinctValuesValidation_WrappedDuplicates_ReturnsExpected()
                 ]   
             }
         }";
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configuration))).Build();
+
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configuration));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var settings = config.Get<WrappedDistinctValuesTestSettings>();
+        settings.Should().NotBeNull();
         var name = _fixture.Create<string>();
 
         var sut = new DistinctValuesValidation<WrappedDistinctValuesTestSettings>(name, config);
 
         // Act
-        var result = sut.Validate(name, settings);
+        var result = sut.Validate(name, settings!);
 
         // Assert
         result.Should().NotBeNull().And.Match<ValidateOptionsResult>(r =>
@@ -324,15 +339,17 @@ public void EnumEnumerableValidation_Valid_ReturnsExpected()
             ]
         }";
 
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(appSettings))).Build();
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(appSettings));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var name = _fixture.Create<string>();
 
         var sut = new EnumEnumerableValidation<EnumEnumerableTestSettings>(name, config);
 
         var settings = config.Get<EnumEnumerableTestSettings>();
+        settings.Should().NotBeNull();
 
         // Act
-        var result = sut.Validate(name, settings);
+        var result = sut.Validate(name, settings!);
 
         // Assert
         result.Should().NotBeNull().And.Match<ValidateOptionsResult>(r =>
@@ -356,15 +373,17 @@ public void EnumEnumerableValidation_Extra_ReturnsExpected()
             ]
         }";
 
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(appSettings))).Build();
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(appSettings));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var name = _fixture.Create<string>();
 
         var sut = new EnumEnumerableValidation<EnumEnumerableTestSettings>(name, config);
 
         var settings = config.Get<EnumEnumerableTestSettings>();
+        settings.Should().NotBeNull();
 
         // Act
-        var result = sut.Validate(name, settings);
+        var result = sut.Validate(name, settings!);
 
         // Assert
         result.Should().NotBeNull().And.Match<ValidateOptionsResult>(r =>
@@ -387,14 +406,16 @@ public void EnumEnumerableValidation_Invalid_ThrowsExpected()
             ]
         }";
 
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(appSettings))).Build();
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(appSettings));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var name = _fixture.Create<string>();
 
         var sut = new EnumEnumerableValidation<InvalidEnumEnumerableTestSettings>(name, config);
 
         var settings = config.Get<InvalidEnumEnumerableTestSettings>();
+        settings.Should().NotBeNull();
 
-        var Act = () => sut.Validate(name, settings);
+        var Act = () => sut.Validate(name, settings!);
 
         // Act
         var result = Assert.Throws<UnexpectedConditionException>(Act);
@@ -420,15 +441,17 @@ public void EnumEnumerableValidation_WithWrappedInvalidProperty_ThrowsExpected()
             }
         }";
 
-        var config = new ConfigurationBuilder().AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(appSettings))).Build();
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(appSettings));
+        var config = new ConfigurationBuilder().AddJsonStream(memoryStream).Build();
         var name = _fixture.Create<string>();
 
         var sut = new EnumEnumerableValidation<WrapperInvalidEnumEnumerableTestSettings>(name, config);
 
         var settings = config.Get<WrapperInvalidEnumEnumerableTestSettings>();
+        settings.Should().NotBeNull();
 
         // Act
-        var result = sut.Validate(name, settings);
+        var result = sut.Validate(name, settings!);
 
         // Assert
         result.Should().NotBeNull().And.Match<ValidateOptionsResult>(r =>
diff --git a/tests/framework/Framework.ProcessIdentity.Tests/ProcessIdentityDataDeterminationTests.cs b/tests/framework/Framework.ProcessIdentity.Tests/ProcessIdentityDataDeterminationTests.cs
index eb280220b4..2280795ba5 100644
--- a/tests/framework/Framework.ProcessIdentity.Tests/ProcessIdentityDataDeterminationTests.cs
+++ b/tests/framework/Framework.ProcessIdentity.Tests/ProcessIdentityDataDeterminationTests.cs
@@ -74,7 +74,7 @@ public async Task GetIdentityData_WithNotExistingIdentityId_Throws()
         var identityId = Guid.NewGuid();
         A.CallTo(() => _processIdentityDataBuilder.IdentityId).Returns(identityId);
         A.CallTo(() => _identityRepository.GetActiveIdentityDataByIdentityId(A<Guid>._))
-            .Returns(default((IdentityTypeId, Guid)));
+            .Returns<(IdentityTypeId, Guid)>(default);
 
         // Act
         var error = await Assert.ThrowsAsync<ConflictException>(async () => await _sut.GetIdentityData().ConfigureAwait(false)).ConfigureAwait(false);
diff --git a/tests/framework/Framework.Token.Tests/TokenServiceTests.cs b/tests/framework/Framework.Token.Tests/TokenServiceTests.cs
index 139c915146..7d10d37dbe 100644
--- a/tests/framework/Framework.Token.Tests/TokenServiceTests.cs
+++ b/tests/framework/Framework.Token.Tests/TokenServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -62,7 +61,7 @@ public async Task GetAuthorizedClient_Success()
 
         var sut = new TokenService(_httpClientFactory);
 
-        var result = await sut.GetAuthorizedClient<TokenService>(settings, _cancellationToken).ConfigureAwait(false);
+        using var result = await sut.GetAuthorizedClient<TokenService>(settings, _cancellationToken).ConfigureAwait(false);
 
         result.Should().NotBeNull();
         result.BaseAddress.Should().Be(_validBaseAddress);
@@ -77,9 +76,9 @@ public async Task GetAuthorizedClient_HttpClientError500_Throws()
 
         var sut = new TokenService(_httpClientFactory);
 
-        var act = () => sut.GetAuthorizedClient<TokenService>(settings, _cancellationToken);
+        Task<HttpClient> Act() => sut.GetAuthorizedClient<TokenService>(settings, _cancellationToken);
 
-        var error = await Assert.ThrowsAsync<ServiceException>(act).ConfigureAwait(false);
+        var error = await Assert.ThrowsAsync<ServiceException>(Act).ConfigureAwait(false);
 
         error.Should().NotBeNull();
         error.Message.Should().Be($"call to external system token-post failed with statuscode 500 - Message: {errorResponse}");
@@ -94,9 +93,9 @@ public async Task GetAuthorizedClient_HttpClientThrows_Throws()
 
         var sut = new TokenService(_httpClientFactory);
 
-        var act = () => sut.GetAuthorizedClient<TokenService>(settings, _cancellationToken);
+        Task<HttpClient> Act() => sut.GetAuthorizedClient<TokenService>(settings, _cancellationToken);
 
-        var error = await Assert.ThrowsAsync<ServiceException>(act).ConfigureAwait(false);
+        var error = await Assert.ThrowsAsync<ServiceException>(Act).ConfigureAwait(false);
 
         error.Should().NotBeNull();
         error.InnerException.Should().Be(_testException);
diff --git a/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs b/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs
index 2c92fd23f4..68feff2025 100644
--- a/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs
+++ b/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs
@@ -21,6 +21,7 @@
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 using System.Text.Json;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests;
@@ -49,9 +50,9 @@ public void MapDefaultHealthChecks_AmbiguousPathes_Throws()
             new () { Path = "/foo" }
         };
 
-        var app = WebApplication.Create();
+        using var app = WebApplication.Create();
 
-        var result = Assert.Throws<Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.ConfigurationException>(() => app.MapDefaultHealthChecks(settings));
+        var result = Assert.Throws<ConfigurationException>(() => app.MapDefaultHealthChecks(settings));
         result.Message.Should().Be("HealthChecks mapping /foo, /foo contains ambiguous pathes");
     }
 
@@ -190,7 +191,8 @@ private WebApplication CreateSut(string name, IEnumerable<string> tags)
         await app.StartAsync().ConfigureAwait(false);
         try
         {
-            var result = await new HttpClient().GetAsync("http://localhost:5000/health").ConfigureAwait(false);
+            using var httpClient = new HttpClient();
+            using var result = await httpClient.GetAsync("http://localhost:5000/health").ConfigureAwait(false);
             await using var responseStream = await result.Content.ReadAsStreamAsync().ConfigureAwait(false);
             return await JsonSerializer.DeserializeAsync<HealthResponse>(responseStream, _options).ConfigureAwait(false);
         }
diff --git a/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs b/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs
index 8610209288..34404fbb3a 100644
--- a/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs
+++ b/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs
@@ -44,17 +44,18 @@ public async Task CheckHealthAsync_Success_ReturnsExpected()
         // Arrange
         var config = OpenIdConnectConfiguration.Create("{\"authorization_endpoint\": \"https://login.example.org/\",\n  \"token_endpoint\": \"https://login.example.org/oauth2/v2.0/token\",\n  \"token_endpoint_auth_methods_supported\": [\n    \"client_secret_post\",\n    \"private_key_jwt\"\n  ],\n  \"jwks_uri\": \"https://login.example.org/discovery/v2.0/keys\",\n  \"userinfo_endpoint\": \"https://graph.example.org/oidc/userinfo\",\n  \"subject_types_supported\": [\n      \"pairwise\"\n  ] }");
 
-        var jsonOptions = new JsonSerializerOptions() { PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase };
+        var jsonOptions = new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
 
-        var jwtOptions = new JwtBearerOptions()
-        {
-            MetadataAddress = "https://foo.bar",
-            BackchannelHttpHandler = new HttpMessageHandlerMock(
+        var httpMessageHandler = new HttpMessageHandlerMock(
             HttpStatusCode.OK,
             config.ToJsonContent(
                 jsonOptions,
-                "application/json")
-            )
+                "application/json"));
+
+        var jwtOptions = new JwtBearerOptions()
+        {
+            MetadataAddress = "https://foo.bar",
+            BackchannelHttpHandler = httpMessageHandler
         };
 
         var context = _fixture.Create<HealthCheckContext>();
@@ -72,10 +73,12 @@ public async Task CheckHealthAsync_Success_ReturnsExpected()
     public async Task CheckHealthAsync_Failure_ReturnsExpected()
     {
         // Arrange
+        var httpMessageHandler = new HttpMessageHandlerMock(HttpStatusCode.BadRequest);
+
         var jwtOptions = new JwtBearerOptions()
         {
             MetadataAddress = "https://foo.bar",
-            BackchannelHttpHandler = new HttpMessageHandlerMock(HttpStatusCode.BadRequest)
+            BackchannelHttpHandler = httpMessageHandler
         };
 
         var context = _fixture.Create<HealthCheckContext>();
diff --git a/tests/keycloak/Keycloak.Seeding.Tests/KeycloakRealmModelTests.cs b/tests/keycloak/Keycloak.Seeding.Tests/KeycloakRealmModelTests.cs
index cd580509fe..e9110c7959 100644
--- a/tests/keycloak/Keycloak.Seeding.Tests/KeycloakRealmModelTests.cs
+++ b/tests/keycloak/Keycloak.Seeding.Tests/KeycloakRealmModelTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -41,7 +40,6 @@ public async Task SeedDataHandlerImportsExpected()
         var identityProviders = sut.IdentityProviders;
         var identityProviderMappers = sut.IdentityProviderMappers;
         var users = sut.Users;
-        var authenticationFlows = sut.TopLevelCustomAuthenticationFlows;
         var clientScopes = sut.ClientScopes;
 
         // Assert
@@ -95,9 +93,9 @@ public async Task SeedDataHandlerImportsExpected()
                 x.FailureFactor == 30 &&
                 x.Roles != null &&
                 x.Roles.Client != null &&
-                x.Roles.Client == clientRoles &&
+                x.Roles.Client.SequenceEqual(clientRoles) &&
                 x.Roles.Realm != null &&
-                x.Roles.Realm == realmRoles &&
+                x.Roles.Realm.SequenceEqual(realmRoles) &&
                 x.Groups != null &&
                 // roles and groups are being asserted separately
                 x.DefaultRole != null &&
@@ -146,9 +144,9 @@ public async Task SeedDataHandlerImportsExpected()
                 x.ScopeMappings != null &&
                 x.ClientScopeMappings != null &&
                 x.Clients != null &&
-                x.Clients == clients &&
+                x.Clients.SequenceEqual(clients) &&
                 x.ClientScopes != null &&
-                x.ClientScopes == clientScopes &&
+                x.ClientScopes.SequenceEqual(clientScopes) &&
                 // users, scopeMappings, clientScopeMappings, clients, clientScopes are being asserted separately
                 x.DefaultDefaultClientScopes != null &&
                 x.DefaultDefaultClientScopes.SequenceEqual(new[] { "role_list", "profile", "email", "roles", "web-origins" }) &&
@@ -187,9 +185,9 @@ public async Task SeedDataHandlerImportsExpected()
                 x.AdminEventsEnabled == false &&
                 x.AdminEventsDetailsEnabled == false &&
                 x.IdentityProviders != null &&
-                x.IdentityProviders == identityProviders &&
+                x.IdentityProviders.SequenceEqual(identityProviders) &&
                 x.IdentityProviderMappers != null &&
-                x.IdentityProviderMappers == identityProviderMappers &&
+                x.IdentityProviderMappers.SequenceEqual(identityProviderMappers) &&
                 // identityProviders, identityProviderMappers, components are being asserted separately
                 x.InternationalizationEnabled == true &&
                 x.SupportedLocales != null &&
diff --git a/tests/mailing/Mailing.Service.Tests/RoleBaseMailServiceTests.cs b/tests/mailing/Mailing.Service.Tests/RoleBaseMailServiceTests.cs
index 686ced3d08..9ceb99f77c 100644
--- a/tests/mailing/Mailing.Service.Tests/RoleBaseMailServiceTests.cs
+++ b/tests/mailing/Mailing.Service.Tests/RoleBaseMailServiceTests.cs
@@ -77,7 +77,7 @@ public async Task RoleBaseSendMailForCompany_WithUserNameParameter_ReturnsExpect
         };
         var userNameParam = hasUserNameParameter
             ? ("offerProviderName", "user")
-            : ((string, string)?)null;
+            : default((string, string)?);
         var receiverRoles = new[]
         {
             new UserRoleConfig("ClientId", new[] { "TestApp Manager", "TestSale Manager" })
@@ -159,7 +159,7 @@ public async Task RoleBaseSendMailForIdp_WithUserNameParameter_ReturnsExpectedCa
         };
         var userNameParam = hasUserNameParameter
             ? ("username", "user")
-            : ((string, string)?)null;
+            : default((string, string)?);
         var receiverRoles = new[]
         {
             new UserRoleConfig("ClientId", new[] { "IT Admin", "Company Admin" })
diff --git a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs
index 7611987f82..033e6b1ad6 100644
--- a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs
+++ b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppBusinessLogicTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -181,13 +180,6 @@ public async Task GetAppAgreement_WithUserId_ReturnsAgreementData()
     public async Task AddServiceSubscription_ReturnsCorrectId()
     {
         // Arrange
-        var appsSettings = new AppsSettings
-        {
-            SubscriptionManagerRoles = new[]
-            {
-                new UserRoleConfig("portal", new [] { "App Manager", "Sales Manager" })
-            }
-        };
         var offerSubscriptionId = Guid.NewGuid();
         var offerSubscriptionService = A.Fake<IOfferSubscriptionService>();
         var consentData = _fixture.CreateMany<OfferAgreementConsentData>(2);
@@ -283,7 +275,6 @@ public async Task ActivateSingleInstance_ReturnsExcepted()
     public async Task GetCompanyProvidedAppSubscriptionStatusesForUserAsync_ReturnsExpected(string? offerIdTxt)
     {
         // Arrange
-        var iamUserId = _fixture.Create<string>();
         Guid? offerId = offerIdTxt == null ? null : new Guid(offerIdTxt);
         var data = _fixture.CreateMany<OfferCompanySubscriptionStatusData>(5).ToImmutableArray();
         A.CallTo(() => _offerSubscriptionRepository.GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync(A<Guid>._, A<OfferTypeId>._, A<SubscriptionStatusSorting?>._, A<IEnumerable<OfferSubscriptionStatusId>>._, A<Guid?>._, A<string?>._))
@@ -316,7 +307,6 @@ public async Task GetCompanyProvidedAppSubscriptionStatusesForUserAsync_ReturnsE
     public async Task GetCompanyProvidedAppSubscriptionStatusesForUserAsync_EmptyImage_ReturnsExpected()
     {
         // Arrange
-        var iamUserId = _fixture.Create<string>();
         var offerId = Guid.NewGuid();
         var data = new[] {
             _fixture.Build<OfferCompanySubscriptionStatusData>().With(x => x.Image, Guid.Empty).Create(),
@@ -349,14 +339,9 @@ public async Task GetCompanyProvidedAppSubscriptionStatusesForUserAsync_EmptyIma
     public async Task GetCompanyProvidedAppSubscriptionStatusesForUserAsync_QueryNullResult_ReturnsExpected()
     {
         // Arrange
-        var iamUserId = _fixture.Create<string>();
         var offerId = Guid.NewGuid();
-        var data = new[] {
-            _fixture.Build<OfferCompanySubscriptionStatusData>().With(x => x.Image, Guid.Empty).Create(),
-            _fixture.Build<OfferCompanySubscriptionStatusData>().With(x => x.Image, Guid.NewGuid()).Create()
-        };
         A.CallTo(() => _offerSubscriptionRepository.GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync(A<Guid>._, A<OfferTypeId>._, A<SubscriptionStatusSorting?>._, A<IEnumerable<OfferSubscriptionStatusId>>._, A<Guid?>._, A<string?>._))
-            .Returns((skip, take) => Task.FromResult((Pagination.Source<OfferCompanySubscriptionStatusData>?)null));
+            .Returns((skip, take) => Task.FromResult<Pagination.Source<OfferCompanySubscriptionStatusData>?>(null));
 
         var appsSettings = new AppsSettings
         {
@@ -430,6 +415,10 @@ public async Task GetAppDocumentContentAsync_ReturnsExpectedResult()
             AppImageDocumentTypeIds = _fixture.CreateMany<DocumentTypeId>(),
         };
 
+        var data = _fixture.Create<(byte[] Content, string ContentType, string FileName)>();
+        A.CallTo(() => _offerService.GetOfferDocumentContentAsync(appId, documentId, settings.AppImageDocumentTypeIds, OfferTypeId.APP, A<CancellationToken>._))
+            .Returns(data);
+
         var sut = new AppsBusinessLogic(_portalRepositories, null!, _offerService, null!, Options.Create(settings), _identityService, _logger);
 
         // Act
@@ -437,6 +426,11 @@ public async Task GetAppDocumentContentAsync_ReturnsExpectedResult()
 
         // Assert
         A.CallTo(() => _offerService.GetOfferDocumentContentAsync(appId, documentId, settings.AppImageDocumentTypeIds, OfferTypeId.APP, A<CancellationToken>._)).MustHaveHappened();
+        result.Should().Match<(byte[] Content, string ContentType, string FileName)>(x =>
+            x.Content == data.Content &&
+            x.ContentType == data.ContentType &&
+            x.FileName == data.FileName
+        );
     }
 
     #endregion
@@ -505,7 +499,6 @@ public async Task GetSubscriptionDetailForProvider_ReturnsExpected()
         // Arrange
         var appId = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
-        var companyId = Guid.NewGuid();
         var data = _fixture.Create<AppProviderSubscriptionDetailData>();
         var settings = new AppsSettings
         {
@@ -537,7 +530,6 @@ public async Task GetSubscriptionDetailForSubscriber_ReturnsExpected()
         // Arrange
         var appId = Guid.NewGuid();
         var subscriptionId = Guid.NewGuid();
-        var companyId = Guid.NewGuid();
         var settings = new AppsSettings
         {
             CompanyAdminRoles = new[]
@@ -641,13 +633,13 @@ public async Task GetAppDetailsByIdAsync_WithNullProperties_ReturnsExpected()
         // Arrange
         var appId = Guid.NewGuid();
         var data = _fixture.Build<OfferDetailsData>()
-            .With(x => x.Title, (string?)null)
-            .With(x => x.ProviderUri, (string?)null)
-            .With(x => x.LongDescription, (string?)null)
-            .With(x => x.Price, (string?)null)
-            .With(x => x.IsSubscribed, (OfferSubscriptionStatusId)default)
+            .With(x => x.Title, default(string?))
+            .With(x => x.ProviderUri, default(string?))
+            .With(x => x.LongDescription, default(string?))
+            .With(x => x.Price, default(string?))
+            .With(x => x.IsSubscribed, default(OfferSubscriptionStatusId))
             .Create();
-        A.CallTo(() => _offerRepository.GetOfferDetailsByIdAsync(A<Guid>._, A<Guid>._, A<string?>._, A<string>._!, A<OfferTypeId>._))
+        A.CallTo(() => _offerRepository.GetOfferDetailsByIdAsync(A<Guid>._, A<Guid>._, A<string>._, A<string>._, A<OfferTypeId>._))
             .Returns(data);
 
         var sut = new AppsBusinessLogic(_portalRepositories, null!, _offerService, null!, Options.Create(new AppsSettings()), _identityService, _logger);
diff --git a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppChangeBusinessLogicTest.cs b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppChangeBusinessLogicTest.cs
index 93a342e726..a91ab4fa2a 100644
--- a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppChangeBusinessLogicTest.cs
+++ b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppChangeBusinessLogicTest.cs
@@ -144,7 +144,6 @@ public async Task AddActiveAppUserRoleAsync_ExecutesSuccessfully()
     {
         //Arrange
         var appId = _fixture.Create<Guid>();
-        var companyId = _fixture.Create<Guid>();
         var appName = _fixture.Create<string>();
         var appAssignedRoleDesc = _fixture.CreateMany<string>(3).Select(role => new AppUserRole(role, _fixture.CreateMany<AppUserRoleDescription>(2).ToImmutableArray())).ToImmutableArray();
         var clientIds = new[] { "client" };
@@ -244,7 +243,7 @@ public async Task AddActiveAppUserRoleAsync_WithCompanyUserIdNotSet_ThrowsForbid
         var clientIds = new[] { "client" };
         A.CallTo(() => _offerRepository.GetInsertActiveAppUserRoleDataAsync(appId, OfferTypeId.APP))
             .Returns((true, appName, Guid.NewGuid(), clientIds));
-        var existingOffer = _fixture.Create<Offer>();
+
         //Act
         async Task Act() => await _sut.AddActiveAppUserRoleAsync(appId, appAssignedRoleDesc).ConfigureAwait(false);
 
@@ -287,10 +286,9 @@ public async Task GetAppUpdateDescriptionByIdAsync_ReturnsExpected()
         // Arrange
         var appId = _fixture.Create<Guid>();
         var offerDescription = _fixture.CreateMany<LocalizedDescription>(3);
-        var appDescriptionData = (IsStatusActive: true, IsProviderCompanyUser: true, OfferDescriptionDatas: offerDescription);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((true, true, offerDescription));
 
         // Act
         var result = await _sut.GetAppUpdateDescriptionByIdAsync(appId).ConfigureAwait(false);
@@ -307,7 +305,7 @@ public async Task GetAppUpdateDescriptionByIdAsync_ThrowsNotFoundException()
         var appId = _fixture.Create<Guid>();
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(((bool IsStatusActive, bool IsProviderCompanyUser, IEnumerable<LocalizedDescription> OfferDescriptionDatas))default);
+            .Returns<(bool, bool, IEnumerable<LocalizedDescription>?)>(default);
 
         // Act
         async Task Act() => await _sut.GetAppUpdateDescriptionByIdAsync(appId).ConfigureAwait(false);
@@ -323,10 +321,9 @@ public async Task GetAppUpdateDescriptionByIdAsync_ThrowsConflictException()
         // Arrange
         var appId = _fixture.Create<Guid>();
         var offerDescription = _fixture.CreateMany<LocalizedDescription>(3);
-        var appDescriptionData = (IsStatusActive: false, IsProviderCompanyUser: true, OfferDescriptionDatas: offerDescription);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((false, true, offerDescription));
 
         // Act
         async Task Act() => await _sut.GetAppUpdateDescriptionByIdAsync(appId).ConfigureAwait(false);
@@ -342,10 +339,9 @@ public async Task GetAppUpdateDescriptionByIdAsync_ThrowsForbiddenException()
         // Arrange
         var appId = _fixture.Create<Guid>();
         var offerDescription = _fixture.CreateMany<LocalizedDescription>(3);
-        var appDescriptionData = (IsStatusActive: true, IsProviderCompanyUser: false, OfferDescriptionDatas: offerDescription);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((true, false, offerDescription));
 
         // Act
         async Task Act() => await _sut.GetAppUpdateDescriptionByIdAsync(appId).ConfigureAwait(false);
@@ -360,9 +356,8 @@ public async Task GetAppUpdateDescriptionByIdAsync_withNullDescriptionData_Throw
     {
         // Arrange
         var appId = _fixture.Create<Guid>();
-        var appDescriptionData = (IsStatusActive: true, IsProviderCompanyUser: true, OfferDescriptionDatas: (IEnumerable<LocalizedDescription>?)null);
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((true, true, default(IEnumerable<LocalizedDescription>?)));
 
         // Act
         var Act = () => _sut.GetAppUpdateDescriptionByIdAsync(appId);
@@ -386,10 +381,9 @@ public async Task CreateOrUpdateAppDescriptionByIdAsync_withEmptyExistingDescrip
             new LocalizedDescription("en", _fixture.Create<string>(), _fixture.Create<string>()),
             new LocalizedDescription("de", _fixture.Create<string>(), _fixture.Create<string>())
             };
-        var appDescriptionData = (IsStatusActive: true, IsProviderCompanyUser: true, OfferDescriptionDatas: (IEnumerable<LocalizedDescription>)updateDescriptionData);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((true, true, updateDescriptionData));
         var existingOffer = _fixture.Create<Offer>();
         existingOffer.DateLastChanged = DateTimeOffset.UtcNow;
         A.CallTo(() => _offerRepository.AttachAndModifyOffer(appId, A<Action<Offer>>._, A<Action<Offer>?>._))
@@ -416,10 +410,9 @@ public async Task CreateOrUpdateAppDescriptionByIdAsync_withNullDescriptionData_
             new LocalizedDescription("en", _fixture.Create<string>(), _fixture.Create<string>()),
             new LocalizedDescription("de", _fixture.Create<string>(), _fixture.Create<string>())
             };
-        var appDescriptionData = (IsStatusActive: true, IsProviderCompanyUser: true, OfferDescriptionDatas: (IEnumerable<LocalizedDescription>)null!);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((true, true, default(IEnumerable<LocalizedDescription>?)));
 
         // Act
         var Act = () => _sut.CreateOrUpdateAppDescriptionByIdAsync(appId, updateDescriptionData);
@@ -439,10 +432,9 @@ public async Task CreateOrUpdateAppDescriptionByIdAsync_ThrowsForbiddenException
             new LocalizedDescription("en", _fixture.Create<string>(), _fixture.Create<string>()),
             new LocalizedDescription("de", _fixture.Create<string>(), _fixture.Create<string>())
             };
-        var appDescriptionData = (IsStatusActive: true, IsProviderCompanyUser: false, OfferDescriptionDatas: (IEnumerable<LocalizedDescription>)null!);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((true, false, default(IEnumerable<LocalizedDescription>?)));
 
         // Act
         var Act = () => _sut.CreateOrUpdateAppDescriptionByIdAsync(appId, updateDescriptionData);
@@ -462,10 +454,9 @@ public async Task CreateOrUpdateAppDescriptionByIdAsync_ThrowsConflictException(
             new LocalizedDescription("en", _fixture.Create<string>(), _fixture.Create<string>()),
             new LocalizedDescription("de", _fixture.Create<string>(), _fixture.Create<string>())
             };
-        var appDescriptionData = (IsStatusActive: false, IsProviderCompanyUser: true, OfferDescriptionDatas: (IEnumerable<LocalizedDescription>)null!);
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-            .Returns(appDescriptionData);
+            .Returns((false, true, default(IEnumerable<LocalizedDescription>?)));
 
         // Act
         var Act = () => _sut.CreateOrUpdateAppDescriptionByIdAsync(appId, updateDescriptionData);
@@ -487,7 +478,7 @@ public async Task CreateOrUpdateAppDescriptionByIdAsync_ThrowsNotFoundException(
             };
 
         A.CallTo(() => _offerRepository.GetActiveOfferDescriptionDataByIdAsync(appId, OfferTypeId.APP, _identity.CompanyId))
-             .Returns(((bool IsStatusActive, bool IsProviderCompanyUser, IEnumerable<LocalizedDescription> OfferDescriptionDatas))default);
+            .Returns<(bool, bool, IEnumerable<LocalizedDescription>?)>(default);
 
         // Act
         var Act = () => _sut.CreateOrUpdateAppDescriptionByIdAsync(appId, updateDescriptionData);
@@ -616,7 +607,7 @@ public async Task UploadOfferAssignedAppLeadImageDocumentById_ThrowsNotFoundExce
         var file = FormFileHelper.GetFormFile("Test Image", "TestImage.jpeg", "image/jpeg");
 
         A.CallTo(() => _offerRepository.GetOfferAssignedAppLeadImageDocumentsByIdAsync(A<Guid>._, A<Guid>._, A<OfferTypeId>._))
-            .Returns(default((bool, bool, IEnumerable<DocumentStatusData>)));
+            .Returns<(bool, bool, IEnumerable<DocumentStatusData>)>(default);
 
         // Act
         async Task Act() => await _sut.UploadOfferAssignedAppLeadImageDocumentByIdAsync(appId, file, CancellationToken.None);
@@ -858,7 +849,7 @@ public async Task UpdateTenantUrlAsync_WithoutApp_ThrowsNotFoundException()
         var appId = _fixture.Create<Guid>();
         var subscriptionId = _fixture.Create<Guid>();
         A.CallTo(() => _offerSubscriptionsRepository.GetUpdateUrlDataAsync(appId, subscriptionId, _identity.CompanyId))
-            .Returns((OfferUpdateUrlData?)null);
+            .Returns<OfferUpdateUrlData?>(null);
 
         // Act
         async Task Act() => await _sut.UpdateTenantUrlAsync(appId, subscriptionId, data).ConfigureAwait(false);
@@ -1022,7 +1013,6 @@ public async Task DeleteActiveAppDocumentAsync_ReturnsExpected()
         // Arrange
         var appId = _fixture.Create<Guid>();
         var documentId = _fixture.Create<Guid>();
-        var documentStatusData = new DocumentStatusData(documentId, DocumentStatusId.PENDING);
 
         A.CallTo(() => _offerRepository.GetOfferAssignedAppDocumentsByIdAsync(A<Guid>._, A<Guid>._, OfferTypeId.APP, A<Guid>._))
             .Returns((true, true, DocumentTypeId.APP_CONTRACT, DocumentStatusId.LOCKED));
@@ -1065,7 +1055,7 @@ public async Task DeleteActiveAppDocumentAsync_DefaultQueryResult_Throws_NotFoun
         var appId = _fixture.Create<Guid>();
         var documentId = _fixture.Create<Guid>();
         A.CallTo(() => _offerRepository.GetOfferAssignedAppDocumentsByIdAsync(A<Guid>._, A<Guid>._, OfferTypeId.APP, A<Guid>._))
-            .Returns(((bool, bool, DocumentTypeId, DocumentStatusId))default);
+            .Returns<(bool, bool, DocumentTypeId, DocumentStatusId)>(default);
 
         // Act
         async Task Act() => await _sut.DeleteActiveAppDocumentAsync(appId, documentId);
@@ -1084,7 +1074,6 @@ public async Task DeleteActiveAppDocumentAsync_IncorrectOfferState_Throws_Confli
         // Arrange
         var appId = _fixture.Create<Guid>();
         var documentId = _fixture.Create<Guid>();
-        var documentStatusData = _fixture.Create<DocumentStatusData>();
         A.CallTo(() => _offerRepository.GetOfferAssignedAppDocumentsByIdAsync(A<Guid>._, A<Guid>._, OfferTypeId.APP, A<Guid>._))
             .Returns((false, true, DocumentTypeId.APP_CONTRACT, DocumentStatusId.LOCKED));
 
@@ -1105,7 +1094,6 @@ public async Task DeleteActiveAppDocumentAsync_InvalidDocumentType_Throws_Confli
         // Arrange
         var appId = _fixture.Create<Guid>();
         var documentId = _fixture.Create<Guid>();
-        var documentStatusData = _fixture.Create<DocumentStatusData>();
         A.CallTo(() => _offerRepository.GetOfferAssignedAppDocumentsByIdAsync(A<Guid>._, A<Guid>._, OfferTypeId.APP, A<Guid>._))
             .Returns((true, true, DocumentTypeId.CX_FRAME_CONTRACT, DocumentStatusId.LOCKED));
 
@@ -1126,7 +1114,6 @@ public async Task DeleteActiveAppDocumentAsync_NotProviderCompany_Throws_Forbidd
         // Arrange
         var appId = _fixture.Create<Guid>();
         var documentId = _fixture.Create<Guid>();
-        var documentStatusData = _fixture.Create<DocumentStatusData>();
         A.CallTo(() => _offerRepository.GetOfferAssignedAppDocumentsByIdAsync(A<Guid>._, A<Guid>._, OfferTypeId.APP, A<Guid>._))
             .Returns((true, false, DocumentTypeId.APP_CONTRACT, DocumentStatusId.LOCKED));
 
diff --git a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppReleaseBusinessLogicTest.cs b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppReleaseBusinessLogicTest.cs
index c02f77c296..73d1ad35ce 100644
--- a/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppReleaseBusinessLogicTest.cs
+++ b/tests/marketplace/Apps.Service.Tests/BusinessLogic/AppReleaseBusinessLogicTest.cs
@@ -601,7 +601,6 @@ public async Task GetAppDetailsForStatusAsync_ReturnsExpected()
     {
         // Arrange
         var appId = Guid.NewGuid();
-        var userId = _fixture.Create<string>();
         var data = _fixture.Create<OfferProviderResponse>();
         A.CallTo(() => _offerService.GetProviderOfferDetailsForStatusAsync(A<Guid>._, A<OfferTypeId>._))
             .Returns(data);
@@ -636,9 +635,8 @@ public async Task GetAppDetailsForStatusAsync_NullUseCase_ThrowsUnexpectedCondit
     {
         // Arrange
         var appId = Guid.NewGuid();
-        var userId = _fixture.Create<string>();
         var data = _fixture.Build<OfferProviderResponse>()
-                        .With(x => x.UseCase, (IEnumerable<AppUseCaseData>?)null)
+                        .With(x => x.UseCase, default(IEnumerable<AppUseCaseData>?))
                         .Create();
 
         A.CallTo(() => _offerService.GetProviderOfferDetailsForStatusAsync(A<Guid>._, A<OfferTypeId>._))
@@ -852,7 +850,7 @@ public async Task ApproveAppRequestAsync_CallsExpected()
                 A<IEnumerable<UserRoleConfig>>._,
                 A<IEnumerable<NotificationTypeId>>._,
                 A<IEnumerable<UserRoleConfig>>._,
-                A<ValueTuple<string, string>>.That.Matches(x => x.Item1 == _settings.OfferSubscriptionAddress && x.Item2 == _settings.OfferDetailAddress),
+                A<(string, string)>.That.Matches(x => x.Item1 == _settings.OfferSubscriptionAddress && x.Item2 == _settings.OfferDetailAddress),
                 A<IEnumerable<UserRoleConfig>>._))
             .MustHaveHappenedOnceExactly();
     }
@@ -898,7 +896,7 @@ public async Task SetInstanceType_WithNotExistingApp_NotFoundException()
         var appId = Guid.NewGuid();
         var data = new AppInstanceSetupData(true, "https://test.de");
         A.CallTo(() => _offerRepository.GetOfferWithSetupDataById(appId, _identity.CompanyId, OfferTypeId.APP))
-            .Returns(default((OfferStatusId, bool, AppInstanceSetupTransferData?, IEnumerable<(Guid, Guid, string)>)));
+            .Returns<(OfferStatusId, bool, AppInstanceSetupTransferData?, IEnumerable<(Guid, Guid, string)>)>(default);
 
         //Act
         async Task Act() => await _sut.SetInstanceType(appId, data).ConfigureAwait(false);
@@ -1157,7 +1155,7 @@ public async Task GetInReviewAppDetailsByIdAsync_ThrowsNotFoundException()
         var appId = _fixture.Create<Guid>();
 
         A.CallTo(() => _offerRepository.GetInReviewAppDataByIdAsync(appId, OfferTypeId.APP))
-            .Returns(default(InReviewOfferData?));
+            .Returns<InReviewOfferData?>(default);
 
         //Act
         async Task Act() => await _sut.GetInReviewAppDetailsByIdAsync(appId).ConfigureAwait(false);
@@ -1219,7 +1217,7 @@ private void SetupUpdateApp()
         A.CallTo(() => _languageRepository.GetLanguageCodesUntrackedAsync(A<IEnumerable<string>>._))
             .Returns(_languageCodes.ToAsyncEnumerable());
         A.CallTo(() => _offerRepository.GetAppUpdateData(_notExistingAppId, _identity.CompanyId, A<IEnumerable<string>>._))
-            .Returns((AppUpdateData?)null);
+            .Returns<AppUpdateData?>(null);
         A.CallTo(() => _offerRepository.GetAppUpdateData(_activeAppId, _identity.CompanyId, A<IEnumerable<string>>._))
             .Returns(_fixture.Build<AppUpdateData>()
                 .With(x => x.OfferState, OfferStatusId.ACTIVE)
diff --git a/tests/marketplace/Apps.Service.Tests/Controllers/AppChangeControllerTest.cs b/tests/marketplace/Apps.Service.Tests/Controllers/AppChangeControllerTest.cs
index 5d3ad8620e..9e614f8853 100644
--- a/tests/marketplace/Apps.Service.Tests/Controllers/AppChangeControllerTest.cs
+++ b/tests/marketplace/Apps.Service.Tests/Controllers/AppChangeControllerTest.cs
@@ -87,6 +87,8 @@ public async Task GetAppUpdateDescriptionsAsync_ReturnsExpected()
 
         //Assert
         A.CallTo(() => _logic.GetAppUpdateDescriptionByIdAsync(A<Guid>._)).MustHaveHappened();
+        result.Should().NotBeNull()
+            .And.ContainInOrder(offerDescriptionData);
     }
 
     [Fact]
@@ -110,14 +112,13 @@ public async Task UploadOfferAssignedAppLeadImageDocumentByIdAsync_ReturnsExpect
         // Arrange
         var appId = _fixture.Create<Guid>();
         var file = FormFileHelper.GetFormFile("Test Image", "TestImage.jpeg", "image/jpeg");
-        A.CallTo(() => _logic.UploadOfferAssignedAppLeadImageDocumentByIdAsync(A<Guid>._, A<IFormFile>._, CancellationToken.None))
-            .ReturnsLazily(() => Task.CompletedTask);
+        var cancellationToken = CancellationToken.None;
 
         // Act
-        var result = await _controller.UploadOfferAssignedAppLeadImageDocumentByIdAsync(appId, file, CancellationToken.None).ConfigureAwait(false);
+        var result = await _controller.UploadOfferAssignedAppLeadImageDocumentByIdAsync(appId, file, cancellationToken).ConfigureAwait(false);
 
         // Assert
-        A.CallTo(() => _logic.UploadOfferAssignedAppLeadImageDocumentByIdAsync(appId, file, CancellationToken.None)).MustHaveHappenedOnceExactly();
+        A.CallTo(() => _logic.UploadOfferAssignedAppLeadImageDocumentByIdAsync(appId, file, cancellationToken)).MustHaveHappenedOnceExactly();
         result.Should().BeOfType<NoContentResult>();
     }
 
@@ -132,6 +133,7 @@ public async Task DeactivateApp_ReturnsNoContent()
 
         //Assert
         A.CallTo(() => _logic.DeactivateOfferByAppIdAsync(appId)).MustHaveHappenedOnceExactly();
+        result.Should().BeOfType<NoContentResult>();
     }
 
     [Fact]
diff --git a/tests/marketplace/Apps.Service.Tests/Controllers/AppsControllerTests.cs b/tests/marketplace/Apps.Service.Tests/Controllers/AppsControllerTests.cs
index 8b438b9c9e..c548d3a313 100644
--- a/tests/marketplace/Apps.Service.Tests/Controllers/AppsControllerTests.cs
+++ b/tests/marketplace/Apps.Service.Tests/Controllers/AppsControllerTests.cs
@@ -344,6 +344,10 @@ public async Task GetAppImageDocumentContentAsync_ReturnsExpected()
 
         //Assert
         A.CallTo(() => _logic.GetAppDocumentContentAsync(A<Guid>._, A<Guid>._, A<CancellationToken>._)).MustHaveHappenedOnceExactly();
+        result.Should().NotBeNull().And.Match<FileResult>(x =>
+            x.ContentType == "image/png" &&
+            x.FileDownloadName == fileName
+        );
     }
 
     [Fact]
@@ -363,6 +367,10 @@ public async Task GetAppDocumentTypePdfContentAsync_ReturnsExpected()
 
         //Assert
         A.CallTo(() => _logic.GetAppDocumentContentAsync(A<Guid>._, A<Guid>._, A<CancellationToken>._)).MustHaveHappenedOnceExactly();
+        result.Should().NotBeNull().And.Match<FileResult>(x =>
+            x.ContentType == "application/pdf" &&
+            x.FileDownloadName == fileName
+        );
     }
 
     [Fact]
diff --git a/tests/marketplace/Offer.Library.Web.Tests/OfferDocumentServiceTests.cs b/tests/marketplace/Offer.Library.Web.Tests/OfferDocumentServiceTests.cs
index 43de420e3e..3257917cbf 100644
--- a/tests/marketplace/Offer.Library.Web.Tests/OfferDocumentServiceTests.cs
+++ b/tests/marketplace/Offer.Library.Web.Tests/OfferDocumentServiceTests.cs
@@ -123,7 +123,7 @@ public async Task UploadDocumentAsync_InValidData_ThrowsNotFoundException(OfferT
             : new UploadDocumentConfig[] { new(DocumentTypeId.ADDITIONAL_DETAILS, new[] { MediaTypeId.PDF }) };
         var file = FormFileHelper.GetFormFile("this is just a test", "superFile.pdf", "application/pdf");
         A.CallTo(() => _offerRepository.GetProviderCompanyUserIdForOfferUntrackedAsync(id, _identity.CompanyId, OfferStatusId.CREATED, offerTypeId))
-            .Returns(((bool, bool, bool))default);
+            .Returns<(bool, bool, bool)>(default);
 
         // Act
         async Task Act() => await _sut.UploadDocumentAsync(id, documentTypeId, file, offerTypeId, uploadDocumentTypeIdSettings, offerStatusId, CancellationToken.None).ConfigureAwait(false);
diff --git a/tests/marketplace/Offers.Library.Tests/Service/OfferServiceTests.cs b/tests/marketplace/Offers.Library.Tests/Service/OfferServiceTests.cs
index f4151298f5..80f9af6349 100644
--- a/tests/marketplace/Offers.Library.Tests/Service/OfferServiceTests.cs
+++ b/tests/marketplace/Offers.Library.Tests/Service/OfferServiceTests.cs
@@ -528,31 +528,30 @@ public void UpsertRemoveOfferDescription_ReturnsExpected()
         // Arrange
         var seedOfferId = _fixture.Create<Guid>();
         var seed = new Dictionary<(Guid, string), OfferDescription>() {
-            {(seedOfferId, "de"), new OfferDescription(seedOfferId, "de", _fixture.Create<string>(), _fixture.Create<string>())},
-            {(seedOfferId, "en"), new OfferDescription(seedOfferId, "en", _fixture.Create<string>(), _fixture.Create<string>())},
-            {(seedOfferId, "fr"), new OfferDescription(seedOfferId, "fr", _fixture.Create<string>(), _fixture.Create<string>())},
-            {(seedOfferId, "cz"), new OfferDescription(seedOfferId, "cz", _fixture.Create<string>(), _fixture.Create<string>())},
-            {(seedOfferId, "it"), new OfferDescription(seedOfferId, "it", _fixture.Create<string>(), _fixture.Create<string>())},
+            {(seedOfferId, "de"), new(seedOfferId, "de", _fixture.Create<string>(), _fixture.Create<string>())},
+            {(seedOfferId, "en"), new(seedOfferId, "en", _fixture.Create<string>(), _fixture.Create<string>())},
+            {(seedOfferId, "fr"), new(seedOfferId, "fr", _fixture.Create<string>(), _fixture.Create<string>())},
+            {(seedOfferId, "cz"), new(seedOfferId, "cz", _fixture.Create<string>(), _fixture.Create<string>())},
+            {(seedOfferId, "it"), new(seedOfferId, "it", _fixture.Create<string>(), _fixture.Create<string>())},
         };
 
-        var updateDescriptions = new[] {
-            new LocalizedDescription("de", _fixture.Create<string>(), _fixture.Create<string>()),
-            new LocalizedDescription("fr", _fixture.Create<string>(), _fixture.Create<string>()),
-            new LocalizedDescription("sk", _fixture.Create<string>(), _fixture.Create<string>()),
-            new LocalizedDescription("se", _fixture.Create<string>(), _fixture.Create<string>()),
-            new LocalizedDescription("it", null!,null!)
+        var updateDescriptions = new LocalizedDescription[] {
+            new("de", _fixture.Create<string>(), _fixture.Create<string>()),
+            new("fr", _fixture.Create<string>(), _fixture.Create<string>()),
+            new("sk", _fixture.Create<string>(), _fixture.Create<string>()),
+            new("se", _fixture.Create<string>(), _fixture.Create<string>()),
+            new("it", null!,null!)
         };
 
-        var existingDescriptions = seed.Select((x) => x.Value).Select(y => new LocalizedDescription(y.LanguageShortName, y.DescriptionLong, y.DescriptionShort)).ToList();
+        var transformedUpdateDescriptions = updateDescriptions.Select(x => (x.LanguageCode, x.LongDescription, x.ShortDescription));
 
-        A.CallTo(() => _offerRepository.CreateUpdateDeleteOfferDescriptions(seedOfferId, existingDescriptions,
-            updateDescriptions.Select(x => new ValueTuple<string, string, string>(x.LanguageCode, x.LongDescription, x.ShortDescription))));
+        var existingDescriptions = seed.Select((x) => x.Value).Select(y => new LocalizedDescription(y.LanguageShortName, y.DescriptionLong, y.DescriptionShort)).ToList();
 
         _sut.UpsertRemoveOfferDescription(seedOfferId, updateDescriptions, existingDescriptions);
 
         // Assert
-        A.CallTo(() => _offerRepository.CreateUpdateDeleteOfferDescriptions(A<Guid>._, A<IEnumerable<LocalizedDescription>>._
-            , A<IEnumerable<(string, string, string)>>._)).MustHaveHappened();
+        A.CallTo(() => _offerRepository.CreateUpdateDeleteOfferDescriptions(seedOfferId, A<IEnumerable<LocalizedDescription>>.That.IsSameSequenceAs(existingDescriptions),
+            A<IEnumerable<(string, string, string)>>.That.IsSameSequenceAs(transformedUpdateDescriptions))).MustHaveHappenedOnceExactly();
     }
 
     #endregion
@@ -615,7 +614,7 @@ public async Task SubmitOffer_WithNotExistingOffer_ThrowsNotFoundException(Offer
     {
         // Arrange
         var notExistingOffer = _fixture.Create<Guid>();
-        A.CallTo(() => _offerRepository.GetOfferReleaseDataByIdAsync(notExistingOffer, offerType)).Returns((OfferReleaseData?)null);
+        A.CallTo(() => _offerRepository.GetOfferReleaseDataByIdAsync(notExistingOffer, offerType)).Returns<OfferReleaseData?>(null);
 
         // Act
         async Task Act() => await _sut.SubmitOfferAsync(notExistingOffer, offerType, new[] { NotificationTypeId.APP_SUBSCRIPTION_REQUEST }, Enumerable.Empty<UserRoleConfig>(), new[] { DocumentTypeId.CONFORMITY_APPROVAL_BUSINESS_APPS }).ConfigureAwait(false);
@@ -970,7 +969,7 @@ public async Task SubmitService_WithNotExistingOffer_ThrowsNotFoundException(Off
     {
         // Arrange
         var notExistingOffer = _fixture.Create<Guid>();
-        A.CallTo(() => _offerRepository.GetOfferReleaseDataByIdAsync(notExistingOffer, offerType)).Returns((OfferReleaseData?)null);
+        A.CallTo(() => _offerRepository.GetOfferReleaseDataByIdAsync(notExistingOffer, offerType)).Returns<OfferReleaseData?>(null);
 
         // Act
         async Task Act() => await _sut.SubmitServiceAsync(notExistingOffer, offerType, new[] { NotificationTypeId.APP_SUBSCRIPTION_REQUEST }, _fixture.CreateMany<UserRoleConfig>()).ConfigureAwait(false);
@@ -1078,7 +1077,7 @@ public async Task DeclineOfferAsync_WithNotExistingOffer_ThrowsForbiddenExceptio
         // Arrange
         var notExistingOffer = _fixture.Create<Guid>();
         A.CallTo(() => _offerRepository.GetOfferDeclineDataAsync(notExistingOffer, offerTypeId))
-            .Returns(((string?, OfferStatusId, Guid?, IEnumerable<DocumentStatusData>))default);
+            .Returns<(string?, OfferStatusId, Guid?, IEnumerable<DocumentStatusData>)>(default);
 
         // Act
         async Task Act() => await _sut.DeclineOfferAsync(notExistingOffer, new OfferDeclineRequest("Test"), offerTypeId, NotificationTypeId.SERVICE_RELEASE_REJECTION, Enumerable.Empty<UserRoleConfig>(), string.Empty, new[] { NotificationTypeId.APP_SUBSCRIPTION_REQUEST }, _fixture.CreateMany<UserRoleConfig>()).ConfigureAwait(false);
@@ -1115,7 +1114,7 @@ public async Task DeclineOfferAsync_WithOfferNameNotSet_ThrowsConflictException(
         var notExistingOffer = _fixture.Create<Guid>();
         var documentStatusDatas = _fixture.CreateMany<DocumentStatusData>();
         A.CallTo(() => _offerRepository.GetOfferDeclineDataAsync(notExistingOffer, offerTypeId))
-            .Returns(((string?)null, OfferStatusId.IN_REVIEW, Guid.NewGuid(), documentStatusDatas));
+            .Returns((null, OfferStatusId.IN_REVIEW, Guid.NewGuid(), documentStatusDatas));
 
         // Act
         async Task Act() => await _sut.DeclineOfferAsync(notExistingOffer, new OfferDeclineRequest("Test"), offerTypeId, NotificationTypeId.SERVICE_RELEASE_REJECTION, Enumerable.Empty<UserRoleConfig>(), string.Empty, new[] { NotificationTypeId.APP_SUBSCRIPTION_REQUEST }, _fixture.CreateMany<UserRoleConfig>()).ConfigureAwait(false);
@@ -1175,7 +1174,7 @@ public async Task DeclineOfferAsync_WithValidData_CallsExpected(OfferTypeId offe
         A.CallTo(() => _userRolesRepository.GetUserRoleIdsUntrackedAsync(A<IEnumerable<UserRoleConfig>>._))
             .Returns(roleIds.ToAsyncEnumerable());
         A.CallTo(() => _userRepository.GetCompanyUserEmailForCompanyAndRoleId(A<IEnumerable<Guid>>._, A<Guid>._))
-            .Returns(new[] { ("test@email.com", (string?)"Test User 1", (string?)"cx-user-2") }.ToAsyncEnumerable());
+            .Returns(new (string, string?, string?)[] { ("test@email.com", "Test User 1", "cx-user-2") }.ToAsyncEnumerable());
 
         IEnumerable<Document>? initial = null;
         IEnumerable<Document>? modified = null;
@@ -1249,7 +1248,7 @@ public async Task DeactivateOfferStatusIdAsync_WithoutExistingAppId_ThrowsForbid
         // Arrange
         var notExistingId = _fixture.Create<Guid>();
         A.CallTo(() => _offerRepository.GetOfferActiveStatusDataByIdAsync(notExistingId, offerTypeId, _companyId))
-            .Returns(((bool, bool))default);
+            .Returns<(bool, bool)>(default);
 
         // Act
         async Task Act() => await _sut.DeactivateOfferIdAsync(notExistingId, offerTypeId).ConfigureAwait(false);
@@ -1306,7 +1305,7 @@ public async Task DeactivateOfferStatusIdAsync_WithValidData_CallsExpected(Offer
         var offer = _fixture.Create<Offer>();
         var offerId = _fixture.Create<Guid>();
         A.CallTo(() => _offerRepository.GetOfferActiveStatusDataByIdAsync(offerId, offerTypeId, _companyId))
-            .Returns(new ValueTuple<bool, bool>(true, true));
+            .Returns((true, true));
 
         A.CallTo(() => _offerRepository.AttachAndModifyOffer(offerId, A<Action<Offer>>._, A<Action<Offer>?>._))
             .Invokes((Guid _, Action<Offer> setOptionalParameters, Action<Offer>? initializeParemeters) =>
@@ -1370,7 +1369,7 @@ public async Task GetProviderOfferAgreementConsentById_WithInvalidOfferId_Throws
         var serviceId = Guid.NewGuid();
 
         A.CallTo(() => _agreementRepository.GetOfferAgreementConsentById(A<Guid>._, A<Guid>._, OfferTypeId.SERVICE))
-            .Returns(((OfferAgreementConsent, bool))default);
+            .Returns<(OfferAgreementConsent, bool)>(default);
 
         // Act
         async Task Act() => await _sut.GetProviderOfferAgreementConsentById(serviceId, OfferTypeId.SERVICE).ConfigureAwait(false);
@@ -1394,7 +1393,7 @@ public async Task CreateOrUpdateProviderOfferAgreementConsent_WithNoService_Thro
         var agreementId = Guid.NewGuid();
         var consentData = new OfferAgreementConsent(new[] { new AgreementConsentStatus(agreementId, ConsentStatusId.ACTIVE) });
         A.CallTo(() => _agreementRepository.GetOfferAgreementConsent(offerId, _companyId, OfferStatusId.CREATED, offerTypeId))
-            .Returns(((OfferAgreementConsentUpdate, bool))default);
+            .Returns<(OfferAgreementConsentUpdate, bool)>(default);
 
         // Act
         async Task Act() => await _sut.CreateOrUpdateProviderOfferAgreementConsent(offerId, consentData, offerTypeId).ConfigureAwait(false);
@@ -1548,7 +1547,7 @@ public async Task GetOfferDocumentContentAsync_ForDocumentIdNotExist_ThrowsArgum
         var documentId = _fixture.Create<Guid>();
 
         A.CallTo(() => _documentRepository.GetOfferDocumentContentAsync(offerId, documentId, documentTypeIdSettings, offerTypeId, A<CancellationToken>._))
-            .Returns((OfferDocumentContentData?)null);
+            .Returns<OfferDocumentContentData?>(null);
 
         // Act
         async Task Act() => await _sut.GetOfferDocumentContentAsync(offerId, documentId, documentTypeIdSettings, offerTypeId, CancellationToken.None).ConfigureAwait(false);
@@ -1701,7 +1700,7 @@ public async Task DeleteDocumentsAsync_WithNoDocument_ThrowsNotFoundException(Of
     {
         //Arrange
         A.CallTo(() => _documentRepository.GetOfferDocumentsAsync(_validDocumentId, _companyId, documentTypeIdSettings, offerTypeId))
-            .Returns(((IEnumerable<(OfferStatusId, Guid, bool)>, bool, DocumentStatusId, bool))default);
+            .Returns<(IEnumerable<(OfferStatusId, Guid, bool)>, bool, DocumentStatusId, bool)>(default);
 
         //Act
         async Task Act() => await _sut.DeleteDocumentsAsync(_validDocumentId, documentTypeIdSettings, offerTypeId).ConfigureAwait(false);
@@ -1718,7 +1717,7 @@ public async Task DeleteDocumentsAsync_WithNoAssignedOfferDocument_ThrowsConflic
     {
         //Arrange
         A.CallTo(() => _documentRepository.GetOfferDocumentsAsync(_validDocumentId, _companyId, documentTypeIdSettings, offerTypeId))
-            .Returns((new[] { ((OfferStatusId, Guid, bool))default }, true, DocumentStatusId.PENDING, true));
+            .Returns((new[] { default((OfferStatusId, Guid, bool)) }, true, DocumentStatusId.PENDING, true));
 
         //Act
         async Task Act() => await _sut.DeleteDocumentsAsync(_validDocumentId, documentTypeIdSettings, offerTypeId).ConfigureAwait(false);
@@ -1877,9 +1876,8 @@ public async Task GetTechnicalUserProfileData_WithoutOffer_ThrowsNotFoundExcepti
     {
         // Arrange
         var offerId = _fixture.Create<Guid>();
-        var data = _fixture.CreateMany<TechnicalUserProfileInformation>(5);
         A.CallTo(() => _technicalUserProfileRepository.GetTechnicalUserProfileInformation(offerId, _companyId, offerTypeId))
-            .Returns(((bool, IEnumerable<TechnicalUserProfileInformation>))default);
+            .Returns<(bool, IEnumerable<TechnicalUserProfileInformation>)>(default);
 
         // Act
         async Task Act() => await _sut.GetTechnicalUserProfilesForOffer(offerId, offerTypeId).ConfigureAwait(false);
@@ -2093,7 +2091,7 @@ public async Task UpdateTechnicalUserProfiles_WithoutOffer_ThrowsException(Offer
             }),
         };
         A.CallTo(() => _technicalUserProfileRepository.GetOfferProfileData(offerId, offerTypeId, _companyId))
-            .Returns((OfferProfileData?)null);
+            .Returns<OfferProfileData?>(null);
         A.CallTo(() => _userRolesRepository.GetRolesForClient("cl1"))
             .Returns(new Guid[] { userRole1Id, userRole2Id }.ToAsyncEnumerable());
 
@@ -2163,7 +2161,7 @@ public async Task GetSubscriptionDetailForProvider_WithNotExistingOffer_ThrowsNo
         SetupGetSubscriptionDetailForProvider();
 
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionDetailsForProviderAsync(A<Guid>._, A<Guid>._, A<Guid>._, A<OfferTypeId>._, A<IEnumerable<Guid>>._))
-            .Returns(((bool, bool, ProviderSubscriptionDetailData))default);
+            .Returns<(bool, bool, ProviderSubscriptionDetailData)>(default);
 
         // Act
         async Task Act() => await _sut.GetSubscriptionDetailsForProviderAsync(serviceId, subscriptionId, OfferTypeId.SERVICE, companyAdminRoles).ConfigureAwait(false);
@@ -2270,7 +2268,7 @@ public async Task GetAppSubscriptionDetailForProvider_WithNotExistingOffer_Throw
         SetupGetSubscriptionDetailForProvider();
 
         A.CallTo(() => _offerSubscriptionsRepository.GetAppSubscriptionDetailsForProviderAsync(A<Guid>._, A<Guid>._, A<Guid>._, A<OfferTypeId>._, A<IEnumerable<Guid>>._))
-            .Returns(((bool, bool, AppProviderSubscriptionDetail))default);
+            .Returns<(bool, bool, AppProviderSubscriptionDetail)>(default);
 
         // Act
         async Task Act() => await _sut.GetAppSubscriptionDetailsForProviderAsync(appId, subscriptionId, OfferTypeId.APP, companyAdminRoles).ConfigureAwait(false);
@@ -2384,7 +2382,7 @@ public async Task GetSubscriptionDetailsForSubscriber_WithNotExistingOffer_Throw
         SetupGetSubscriptionDetailForProvider();
 
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionDetailsForSubscriberAsync(A<Guid>._, A<Guid>._, A<Guid>._, A<OfferTypeId>._, A<IEnumerable<Guid>>._))
-            .Returns(((bool, bool, SubscriberSubscriptionDetailData))default);
+            .Returns<(bool, bool, SubscriberSubscriptionDetailData)>(default);
 
         // Act
         async Task Act() => await _sut.GetSubscriptionDetailsForSubscriberAsync(appId, subscriptionId, OfferTypeId.APP, companyAdminRoles).ConfigureAwait(false);
@@ -2490,7 +2488,7 @@ public async Task GetCompanySubscribedOfferSubscriptionStatusesForUserAsync_With
     {
         // Arrange
         A.CallTo(() => _offerSubscriptionsRepository.GetOwnCompanySubscribedOfferSubscriptionStatusesUntrackedAsync(A<Guid>._, A<OfferTypeId>._, A<DocumentTypeId>._))
-            .Returns((skip, take) => Task.FromResult((Pagination.Source<OfferSubscriptionStatusData>?)null));
+            .Returns((skip, take) => Task.FromResult<Pagination.Source<OfferSubscriptionStatusData>?>(null));
 
         // Act
         var result = await _sut.GetCompanySubscribedOfferSubscriptionStatusesForUserAsync(0, 10, offerTypeId, documentTypeId).ConfigureAwait(false);
@@ -2512,7 +2510,7 @@ public async Task UnsubscribeOwnCompanySubscriptionAsync_WithNotExistingApp_Thro
         // Arrange
         var notExistingSubscriptionId = _fixture.Create<Guid>();
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyAssignedOfferSubscriptionDataForCompanyUserAsync(A<Guid>._, A<Guid>._))
-            .Returns(((OfferSubscriptionStatusId, bool, bool, IEnumerable<Guid>, IEnumerable<Guid>))default);
+            .Returns<(OfferSubscriptionStatusId, bool, bool, IEnumerable<Guid>, IEnumerable<Guid>)>(default);
 
         // Act
         async Task Act() => await _sut.UnsubscribeOwnCompanySubscriptionAsync(notExistingSubscriptionId).ConfigureAwait(false);
@@ -2658,13 +2656,13 @@ private void SetupRepositories()
             .Returns((_companyId, offerSubscription));
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
                 A<Guid>.That.Matches(x => x == _existingServiceId), _companyUserId, A<OfferTypeId>.That.Not.Matches(x => x == OfferTypeId.SERVICE)))
-            .Returns((_companyId, (OfferSubscription?)null));
+            .Returns<(Guid, OfferSubscription?)>((_companyId, null));
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(A<Guid>.That.Not.Matches(x => x == _existingServiceId), _companyUserId, A<OfferTypeId>._))
-            .Returns((_companyId, (OfferSubscription?)null));
+            .Returns<(Guid, OfferSubscription?)>((_companyId, null));
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
                 A<Guid>.That.Matches(x => x == _existingServiceId), A<Guid>.That.Not.Matches(x => x == _companyUserId),
                 A<OfferTypeId>._))
-            .Returns(((Guid companyId, OfferSubscription? offerSubscription))default);
+            .Returns<(Guid companyId, OfferSubscription? offerSubscription)>(default);
 
         var agreementData = _fixture.CreateMany<AgreementData>(1);
         A.CallTo(() => _agreementRepository.GetOfferAgreementDataForOfferId(A<Guid>.That.Matches(x => x == _existingServiceId), A<OfferTypeId>._))
@@ -2675,14 +2673,14 @@ private void SetupRepositories()
         A.CallTo(() => _consentRepository.GetConsentDetailData(A<Guid>.That.Matches(x => x == _validConsentId), A<OfferTypeId>.That.Matches(x => x == OfferTypeId.SERVICE)))
             .Returns(new ConsentDetailData(_validConsentId, "The Company", this._companyUser.Id, ConsentStatusId.ACTIVE, "Agreed"));
         A.CallTo(() => _consentRepository.GetConsentDetailData(A<Guid>.That.Not.Matches(x => x == _validConsentId), A<OfferTypeId>._))
-            .Returns((ConsentDetailData?)null);
+            .Returns<ConsentDetailData?>(null);
         A.CallTo(() => _consentRepository.GetConsentDetailData(A<Guid>._, A<OfferTypeId>.That.Not.Matches(x => x == OfferTypeId.SERVICE)))
-            .Returns((ConsentDetailData?)null);
+            .Returns<ConsentDetailData?>(null);
 
         A.CallTo(() => _companyRepository.GetCompanyNameUntrackedAsync(_companyId))
             .Returns((true, "the company"));
         A.CallTo(() => _companyRepository.GetCompanyNameUntrackedAsync(A<Guid>.That.Not.Matches(x => x == _companyId)))
-            .Returns(new ValueTuple<bool, string>());
+            .Returns<(bool, string)>(default);
 
         A.CallTo(() => _consentAssignedOfferSubscriptionRepository.GetConsentAssignedOfferSubscriptionsForSubscriptionAsync(A<Guid>._, A<IEnumerable<Guid>>.That.Not.Matches(x => x.Any(y => y == _existingAgreementForSubscriptionId))))
             .Returns(Enumerable.Empty<(Guid ConsentId, Guid AgreementId, ConsentStatusId ConsentStatusId)>().ToAsyncEnumerable());
diff --git a/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs b/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs
index 6b9ab38312..f555339660 100644
--- a/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs
+++ b/tests/marketplace/Offers.Library.Tests/Service/OfferSetupServiceTests.cs
@@ -256,13 +256,7 @@ public async Task AutoSetup_WithMultipleTechnicalUsers_ThrowsException()
         SetupAutoSetup(OfferTypeId.APP, offerSubscription, false, companyServiceAccount);
         var clientId = Guid.NewGuid();
         var appInstanceId = Guid.NewGuid();
-        var clients = new List<IamClient>();
         A.CallTo(() => _clientRepository.CreateClient(A<string>._))
-            .Invokes((string clientName) =>
-            {
-                var client = new IamClient(clientId, clientName);
-                clients.Add(client);
-            })
             .Returns(new IamClient(clientId, "cl1"));
         A.CallTo(() => _technicalUserProfileService.GetTechnicalUserProfilesForOfferSubscription(A<Guid>._))
             .Returns(new ServiceAccountCreationInfo[]
@@ -372,7 +366,7 @@ public async Task AutoSetup_WithNotExistingOfferSubscriptionId_ThrowsException()
         SetupAutoSetup(OfferTypeId.APP);
         var data = new OfferAutoSetupData(Guid.NewGuid(), "https://new-url.com/");
         A.CallTo(() => _offerSubscriptionsRepository.GetOfferDetailsAndCheckProviderCompany(data.RequestId, _companyId, OfferTypeId.SERVICE))
-            .Returns((OfferSubscriptionTransferData?)null);
+            .Returns<OfferSubscriptionTransferData?>(null);
 
         // Act
         async Task Action() => await _sut.AutoSetupOfferAsync(data, Enumerable.Empty<UserRoleConfig>(), OfferTypeId.SERVICE, "https://base-address.com", Enumerable.Empty<UserRoleConfig>());
@@ -396,6 +390,7 @@ public async Task AutoSetup_WithActiveSubscription_ThrowsException()
 
         // Assert
         var ex = await Assert.ThrowsAsync<ConflictException>(Action);
+        ex.Message.Should().Be("Status of the offer subscription must be pending");
         A.CallTo(() => _portalRepositories.SaveAsync()).MustNotHaveHappened();
         A.CallTo(() => _mailingService.SendMails(A<string>._, A<Dictionary<string, string>>._, A<List<string>>._)).MustNotHaveHappened();
     }
@@ -414,6 +409,7 @@ public async Task AutoSetup_WithUserNotFromProvidingCompany_ThrowsException()
 
         // Assert
         var ex = await Assert.ThrowsAsync<ForbiddenException>(Action);
+        ex.Message.Should().Be("Only the providing company can setup the service");
         A.CallTo(() => _portalRepositories.SaveAsync()).MustNotHaveHappened();
         A.CallTo(() => _mailingService.SendMails(A<string>._, A<Dictionary<string, string>>._, A<List<string>>._)).MustNotHaveHappened();
     }
@@ -673,7 +669,7 @@ public async Task StartAutoSetupAsync_WithNotExistingOfferSubscription_ThrowsNot
         var offerSubscriptionId = Guid.NewGuid();
         var data = new OfferAutoSetupData(offerSubscriptionId, "https://www.test.de");
         A.CallTo(() => _offerSubscriptionsRepository.GetOfferDetailsAndCheckProviderCompany(offerSubscriptionId, _companyId, offerTypeId))
-            .Returns((OfferSubscriptionTransferData?)null);
+            .Returns<OfferSubscriptionTransferData?>(null);
 
         // Act
         async Task Act() => await _sut.StartAutoSetupAsync(data, offerTypeId).ConfigureAwait(false);
@@ -738,7 +734,7 @@ public async Task StartAutoSetupAsync_WithMultipleInstancesForSingleInstance_Thr
         var transferData = _fixture.Build<OfferSubscriptionTransferData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
             .With(x => x.IsProviderCompany, true)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(true, null))
+            .With(x => x.InstanceData, (true, null))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid(), Guid.NewGuid() })
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
@@ -763,7 +759,7 @@ public async Task StartAutoSetupAsync_WithValidSingleInstance_ThrowsConflictExce
         var transferData = _fixture.Build<OfferSubscriptionTransferData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
             .With(x => x.IsProviderCompany, true)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(true, "https://www.test.de"))
+            .With(x => x.InstanceData, (true, "https://www.test.de"))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid() })
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
@@ -800,7 +796,7 @@ public async Task StartAutoSetupAsync_WithValidMultiInstance_ReturnsExpected(Off
         var transferData = _fixture.Build<OfferSubscriptionTransferData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
             .With(x => x.IsProviderCompany, true)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(false, null))
+            .With(x => x.InstanceData, (false, null))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid(), Guid.NewGuid() })
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
@@ -846,7 +842,7 @@ public async Task CreateSingleInstanceSubscriptionDetail_WithNotExistingOfferSub
         // Arrange
         var offerSubscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionActivationDataByIdAsync(offerSubscriptionId))
-            .Returns((SubscriptionActivationData?)null);
+            .Returns<SubscriptionActivationData?>(null);
 
         // Act
         async Task Act() => await _sut.CreateSingleInstanceSubscriptionDetail(offerSubscriptionId).ConfigureAwait(false);
@@ -862,7 +858,7 @@ public async Task CreateSingleInstanceSubscriptionDetail_WithMultipleInstancesFo
         // Arrange
         var transferData = _fixture.Build<SubscriptionActivationData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(true, "https://www.test.de"))
+            .With(x => x.InstanceData, (true, "https://www.test.de"))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid(), Guid.NewGuid() })
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
@@ -883,7 +879,7 @@ public async Task CreateSingleInstanceSubscriptionDetail_WithMultipleInstance_Th
         // Arrange
         var transferData = _fixture.Build<SubscriptionActivationData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(false, "https://www.test.de"))
+            .With(x => x.InstanceData, (false, "https://www.test.de"))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid(), Guid.NewGuid() })
             .Create();
         var offerSubscriptionId = Guid.NewGuid();
@@ -904,7 +900,7 @@ public async Task CreateSingleInstanceSubscriptionDetail_WithWrongCompanyId_Thro
         // Arrange
         var transferData = _fixture.Build<SubscriptionActivationData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(true, "https://www.test.de"))
+            .With(x => x.InstanceData, (true, "https://www.test.de"))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid() })
             .With(x => x.ProviderCompanyId, Guid.NewGuid())
             .Create();
@@ -935,7 +931,7 @@ public async Task CreateSingleInstanceSubscriptionDetail_WithValidData_ReturnsEx
         var offerSubscriptionId = Guid.NewGuid();
         var transferData = _fixture.Build<SubscriptionActivationData>()
             .With(x => x.Status, OfferSubscriptionStatusId.PENDING)
-            .With(x => x.InstanceData, new ValueTuple<bool, string?>(true, "https://www.test.de"))
+            .With(x => x.InstanceData, (true, "https://www.test.de"))
             .With(x => x.AppInstanceIds, new[] { Guid.NewGuid() })
             .With(x => x.ProviderCompanyId, _companyId)
             .Create();
@@ -971,7 +967,7 @@ public async Task CreateClient_WithNotExistingOfferSubscription_ThrowsNotFoundEx
         // Arrange
         var offerSubscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionsRepository.GetClientCreationData(offerSubscriptionId))
-            .Returns((OfferSubscriptionClientCreationData?)null);
+            .Returns<OfferSubscriptionClientCreationData?>(null);
 
         // Act
         async Task Act() => await _sut.CreateClient(offerSubscriptionId).ConfigureAwait(false);
@@ -1008,7 +1004,6 @@ public async Task CreateClient_WithValidData_ReturnsExpected(bool technicalUserN
         // Arrange
         const string clientId = "cl1";
         const string url = "https://www.test.de";
-        var clients = new List<IamClient>();
         var offerSubscriptionId = Guid.NewGuid();
         var iamClientId = Guid.NewGuid();
         var data = new OfferSubscriptionClientCreationData(_validOfferId, OfferTypeId.APP, url, technicalUserNeeded);
@@ -1020,11 +1015,6 @@ public async Task CreateClient_WithValidData_ReturnsExpected(bool technicalUserN
         A.CallTo(() => _provisioningManager.SetupClientAsync($"{url}/*", url, A<IEnumerable<string>>._, false))
             .Returns(clientId);
         A.CallTo(() => _clientRepository.CreateClient(clientId))
-            .Invokes((string paramClientId) =>
-            {
-                var client = new IamClient(iamClientId, paramClientId);
-                clients.Add(client);
-            })
             .Returns(new IamClient(iamClientId, clientId));
         A.CallTo(() => _appSubscriptionDetailRepository.CreateAppSubscriptionDetail(offerSubscriptionId, A<Action<AppSubscriptionDetail?>>._))
             .Invokes((Guid _, Action<AppSubscriptionDetail> setOptionalParameter) =>
@@ -1058,7 +1048,7 @@ public async Task CreateTechnicalUser_WithNotExistingOfferSubscription_ThrowsNot
         // Arrange
         var offerSubscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionsRepository.GetTechnicalUserCreationData(offerSubscriptionId))
-            .Returns((OfferSubscriptionTechnicalUserCreationData?)null);
+            .Returns<OfferSubscriptionTechnicalUserCreationData?>(null);
 
         // Act
         async Task Act() => await _sut.CreateTechnicalUser(offerSubscriptionId, null!).ConfigureAwait(false);
@@ -1098,7 +1088,7 @@ public async Task CreateTechnicalUser_WithTechnicalUserNeeded_ReturnsExpected(st
         var data = new OfferSubscriptionTechnicalUserCreationData(true, clientId, "Test App", "Stark Industries", CompanyUserCompanyId, Bpn, OfferTypeId.SERVICE);
         var serviceAccountData = _fixture.Create<ServiceAccountData>();
         var companyServiceAccount = _fixture.Build<CompanyServiceAccount>()
-            .With(x => x.OfferSubscriptionId, (Guid?)null)
+            .With(x => x.OfferSubscriptionId, default(Guid?))
             .Create();
         var roleIds = _fixture.CreateMany<Guid>().AsEnumerable();
         A.CallTo(() => _offerSubscriptionsRepository.GetTechnicalUserCreationData(offerSubscriptionId))
@@ -1112,7 +1102,7 @@ public async Task CreateTechnicalUser_WithTechnicalUserNeeded_ReturnsExpected(st
             {
                 setOptionalParameter?.Invoke(companyServiceAccount);
             })
-            .Returns(new ValueTuple<string, ServiceAccountData, Guid, List<UserRoleData>>(
+            .Returns((
                 clientId ?? $"{data.OfferName}-{data.CompanyName}",
                 serviceAccountData,
                 serviceAccountId,
@@ -1168,7 +1158,7 @@ public async Task ActivateSingleInstanceSubscription_WithNotExistingOfferSubscri
         // Arrange
         var offerSubscriptionId = Guid.NewGuid();
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionActivationDataByIdAsync(offerSubscriptionId))
-            .Returns((SubscriptionActivationData?)null);
+            .Returns<SubscriptionActivationData?>(null);
 
         // Act
         async Task Act() => await _sut.ActivateSubscription(offerSubscriptionId, null!, null!, null!).ConfigureAwait(false);
@@ -1450,7 +1440,7 @@ private IAsyncEnumerator<Guid> SetupAutoSetup(OfferTypeId offerTypeId, OfferSubs
                 A<Guid>.That.Not.Matches(x => x == _pendingSubscriptionId || x == _validSubscriptionId || x == _offerIdWithMultipleInstances),
                 _companyId,
                 A<OfferTypeId>._))
-            .Returns((OfferSubscriptionTransferData?)null);
+            .Returns<OfferSubscriptionTransferData?>(null);
         A.CallTo(() => _offerSubscriptionsRepository.GetOfferDetailsAndCheckProviderCompany(
                 _pendingSubscriptionId,
                 A<Guid>.That.Not.Matches(x => x == _companyId || x == _companyUserWithoutMailCompanyId),
@@ -1490,7 +1480,7 @@ private void SetupCreateSingleInstance(AppInstance? appInstance = null)
         A.CallTo(() => _offerRepository.GetSingleInstanceOfferData(_offerIdWithWithNoInstanceSetupIds, OfferTypeId.APP))
             .Returns(new SingleInstanceOfferData(CompanyUserCompanyId, "app1", Bpn, true, Enumerable.Empty<(Guid, string)>()));
         A.CallTo(() => _offerRepository.GetSingleInstanceOfferData(A<Guid>.That.Not.Matches(x => x == _offerIdWithoutClient || x == _validOfferId || x == _offerIdWithMultipleInstances || x == _offerIdWithWithNoInstanceSetupIds), OfferTypeId.APP))
-            .Returns((SingleInstanceOfferData?)null);
+            .Returns<SingleInstanceOfferData?>(null);
     }
 
     #endregion
diff --git a/tests/marketplace/Offers.Library.Tests/Service/OfferSubscriptionServiceTests.cs b/tests/marketplace/Offers.Library.Tests/Service/OfferSubscriptionServiceTests.cs
index 37e256cb62..bd72b3e966 100644
--- a/tests/marketplace/Offers.Library.Tests/Service/OfferSubscriptionServiceTests.cs
+++ b/tests/marketplace/Offers.Library.Tests/Service/OfferSubscriptionServiceTests.cs
@@ -532,7 +532,7 @@ private void SetupRepositories()
         A.CallTo(() => _companyRepository.GetOwnCompanyInformationAsync(_identity.CompanyId, _identity.IdentityId))
             .Returns(new CompanyInformationData(_companyId, "The Company", "DE", "BPM00000001", "test@mail.com"));
         A.CallTo(() => _companyRepository.GetOwnCompanyInformationAsync(_notAssignedCompanyId, _identity.IdentityId))
-            .Returns((CompanyInformationData?)null);
+            .Returns<CompanyInformationData?>(null);
         A.CallTo(() => _companyRepository.GetOwnCompanyInformationAsync(_noBpnSetCompanyId, _identity.IdentityId))
             .Returns(new CompanyInformationData(_companyId, "The Company", "DE", null, "test@mail.com"));
         A.CallTo(() => _companyRepository.GetOwnCompanyInformationAsync(_existingActiveSubscriptionCompanyId, _identity.IdentityId))
@@ -557,7 +557,7 @@ private void SetupRepositories()
             }
             });
         A.CallTo(() => _offerRepository.GetOfferDetailByIdUntrackedAsync(A<Guid>.That.Not.Matches(x => x == _existingOfferId), A<string>._, A<Guid>._, A<OfferTypeId>._))
-            .Returns((OfferDetailData?)null);
+            .Returns<OfferDetailData?>(null);
 
         A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(A<Guid>.That.Matches(x => x == _existingOfferId), A<OfferTypeId>._))
             .Returns(new OfferProviderDetailsData("Test Offer", "Test Company", "provider@mail.de", _salesManagerId, "https://www.testurl.com", false, _companyId));
@@ -568,7 +568,7 @@ private void SetupRepositories()
         A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(A<Guid>.That.Matches(x => x == _existingOfferWithoutDetailsFilled), A<OfferTypeId>._))
             .Returns(new OfferProviderDetailsData(null, "Test Company", null, _salesManagerId, "https://www.fail.com", false, _companyId));
         A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(A<Guid>.That.Not.Matches(x => x == _existingOfferId || x == _existingOfferWithFailingAutoSetupId || x == _existingOfferWithoutDetailsFilled || x == _existingOfferIdWithoutProviderEmail), A<OfferTypeId>._))
-            .Returns((OfferProviderDetailsData?)null);
+            .Returns<OfferProviderDetailsData?>(null);
 
         var offerSubscription = _fixture.Create<OfferSubscription>();
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionDetailDataForOwnUserAsync(
@@ -580,7 +580,7 @@ private void SetupRepositories()
                 A<Guid>.That.Not.Matches(x => x == _validSubscriptionId),
                 A<Guid>.That.Matches(x => x == _companyId),
                 A<OfferTypeId>._))
-            .Returns((SubscriptionDetailData?)null);
+            .Returns<SubscriptionDetailData?>(null);
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
                 A<Guid>.That.Matches(x => x == _existingOfferId), A<Guid>.That.Matches(x => x == _identity.IdentityId), A<OfferTypeId>._))
             .Returns((_companyId, offerSubscription));
@@ -591,7 +591,7 @@ private void SetupRepositories()
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
                 A<Guid>.That.Matches(x => x == _existingOfferId), A<Guid>.That.Not.Matches(x => x == _identity.IdentityId),
                 A<OfferTypeId>._))
-            .Returns(((Guid companyId, OfferSubscription? offerSubscription))default);
+            .Returns<(Guid companyId, OfferSubscription? offerSubscription)>(default);
 
         A.CallTo(() => _agreementRepository.GetAgreementIdsForOfferAsync(A<Guid>.That.Matches(id => id == _existingOfferId || id == _existingOfferWithFailingAutoSetupId || id == _existingOfferWithoutDetailsFilled || id == _existingOfferIdWithoutProviderEmail)))
             .Returns(_offerAgreementIds.ToAsyncEnumerable());
diff --git a/tests/marketplace/Offers.Library.Tests/Service/TechnicalUserProfileServiceTests.cs b/tests/marketplace/Offers.Library.Tests/Service/TechnicalUserProfileServiceTests.cs
index b7a78d539e..92afbe372f 100644
--- a/tests/marketplace/Offers.Library.Tests/Service/TechnicalUserProfileServiceTests.cs
+++ b/tests/marketplace/Offers.Library.Tests/Service/TechnicalUserProfileServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -55,7 +54,7 @@ public async Task GetTechnicalUserProfilesForOffer_WithoutOffer_ThrowsException(
     {
         // Arrange
         A.CallTo(() => _offerRepository.GetServiceAccountProfileData(_offerId, A<OfferTypeId>._))
-            .Returns(((bool, IEnumerable<IEnumerable<UserRoleData>>, string?))default);
+            .Returns<(bool, IEnumerable<IEnumerable<UserRoleData>>, string?)>(default);
 
         // Act
         async Task Act() => await _sut.GetTechnicalUserProfilesForOffer(_offerId, OfferTypeId.APP).ConfigureAwait(false);
@@ -116,7 +115,7 @@ public async Task GetTechnicalUserProfilesForOfferSubscription_WithoutOfferName_
     {
         // Arrange
         A.CallTo(() => _offerRepository.GetServiceAccountProfileDataForSubscription(_offerSubscriptionId))
-            .Returns((true, Enumerable.Empty<IEnumerable<UserRoleData>>(), (string?)null));
+            .Returns((true, Enumerable.Empty<IEnumerable<UserRoleData>>(), null));
 
         // Act
         async Task Act() => await _sut.GetTechnicalUserProfilesForOfferSubscription(_offerSubscriptionId).ConfigureAwait(false);
diff --git a/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs b/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs
index d809270105..ef07d23f4d 100644
--- a/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs
+++ b/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceBusinessLogicTests.cs
@@ -179,7 +179,7 @@ public async Task AddServiceSubscription_ReturnsCorrectId()
         A.CallTo(() => _offerSubscriptionService.AddOfferSubscriptionAsync(
             A<Guid>._,
             A<IEnumerable<OfferAgreementConsentData>>._,
-            A<OfferTypeId>.That.Matches(x => x == OfferTypeId.SERVICE),
+            OfferTypeId.SERVICE,
             A<string>._,
             A<IEnumerable<UserRoleConfig>>._,
             A<IEnumerable<UserRoleConfig>>._))
@@ -259,12 +259,8 @@ public async Task GetCompanyProvidedServiceSubscriptionStatusesForUserAsync_Quer
     {
         // Arrange
         var offerId = Guid.NewGuid();
-        var data = new[] {
-            _fixture.Build<OfferCompanySubscriptionStatusData>().With(x => x.Image, Guid.Empty).Create(),
-            _fixture.Build<OfferCompanySubscriptionStatusData>().With(x => x.Image, Guid.NewGuid()).Create()
-        };
         A.CallTo(() => _offerSubscriptionsRepository.GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync(A<Guid>._, A<OfferTypeId>._, A<SubscriptionStatusSorting?>._, A<IEnumerable<OfferSubscriptionStatusId>>._, A<Guid?>._, A<string?>._))
-            .Returns((skip, take) => Task.FromResult((Pagination.Source<OfferCompanySubscriptionStatusData>?)null));
+            .Returns((skip, take) => Task.FromResult<Pagination.Source<OfferCompanySubscriptionStatusData>?>(null));
 
         var serviceSettings = new ServiceSettings
         {
@@ -329,7 +325,7 @@ public async Task GetServiceAgreement_WithUserId_ReturnsServiceDetailData()
         // Arrange
         var offerService = A.Fake<IOfferService>();
         var data = _fixture.CreateMany<AgreementData>(1);
-        A.CallTo(() => offerService.GetOfferAgreementsAsync(A<Guid>.That.Matches(x => x == _existingServiceId), A<OfferTypeId>._))
+        A.CallTo(() => offerService.GetOfferAgreementsAsync(_existingServiceId, A<OfferTypeId>._))
             .Returns(data.ToAsyncEnumerable());
         var sut = new ServiceBusinessLogic(null!, offerService, null!, null!, _identityService, Options.Create(new ServiceSettings()), _logger);
 
@@ -382,7 +378,7 @@ public async Task GetServiceConsentDetailData_WithValidId_ReturnsServiceConsentD
         // Arrange
         var data = new ConsentDetailData(_validConsentId, "The Company", Guid.NewGuid(), ConsentStatusId.ACTIVE, "Agreed");
         var offerService = A.Fake<IOfferService>();
-        A.CallTo(() => offerService.GetConsentDetailDataAsync(A<Guid>.That.Matches(x => x == _validConsentId), A<OfferTypeId>._))
+        A.CallTo(() => offerService.GetConsentDetailDataAsync(_validConsentId, A<OfferTypeId>._))
             .Returns(data);
         var sut = new ServiceBusinessLogic(null!, offerService, null!, null!, _identityService, Options.Create(new ServiceSettings()), _logger);
 
@@ -496,13 +492,12 @@ public async Task GetServiceDocumentContentAsync_ReturnsExpectedCalls()
     [InlineData(ServiceStatusIdFilter.Inactive, new[] { OfferStatusId.INACTIVE })]
     [InlineData(ServiceStatusIdFilter.InReview, new[] { OfferStatusId.IN_REVIEW })]
     [InlineData(ServiceStatusIdFilter.WIP, new[] { OfferStatusId.CREATED })]
-    [InlineData((ServiceStatusIdFilter)default, new[] { OfferStatusId.CREATED, OfferStatusId.IN_REVIEW, OfferStatusId.ACTIVE, OfferStatusId.INACTIVE })]
+    [InlineData(default(ServiceStatusIdFilter), new[] { OfferStatusId.CREATED, OfferStatusId.IN_REVIEW, OfferStatusId.ACTIVE, OfferStatusId.INACTIVE })]
     public async Task GetCompanyProvidedServiceStatusDataAsync_InActiveRequest(ServiceStatusIdFilter serviceStatusIdFilter, IEnumerable<OfferStatusId> offerStatusIds)
     {
         // Arrange
         var serviceDetailData = _fixture.CreateMany<AllOfferStatusData>(10).ToImmutableArray();
         var paginationResult = (int skip, int take) => Task.FromResult(new Pagination.Source<AllOfferStatusData>(serviceDetailData.Length, serviceDetailData.Skip(skip).Take(take)));
-        var user = _fixture.Create<string>();
         var sorting = _fixture.Create<OfferSorting>();
         var name = _fixture.Create<string>();
 
@@ -646,7 +641,7 @@ private void SetupRepositories()
             .With(x => x.Id, _existingServiceId)
             .Create();
 
-        A.CallTo(() => _offerRepository.GetServiceDetailByIdUntrackedAsync(_existingServiceId, A<string>.That.Matches(x => x == "en"), A<Guid>._))
+        A.CallTo(() => _offerRepository.GetServiceDetailByIdUntrackedAsync(_existingServiceId, "en", A<Guid>._))
             .Returns(serviceDetail with
             {
                 OfferSubscriptionDetailData = new[] { new OfferSubscriptionStateDetailData(Guid.NewGuid(), OfferSubscriptionStatusId.ACTIVE) },
@@ -654,21 +649,21 @@ private void SetupRepositories()
                 TechnicalUserProfile = new[] { new TechnicalUserRoleData(Guid.NewGuid(), new[] { "role1", "role2" }) }
             });
         A.CallTo(() => _offerRepository.GetServiceDetailByIdUntrackedAsync(A<Guid>.That.Not.Matches(x => x == _existingServiceId), A<string>._, A<Guid>._))
-            .Returns((ServiceDetailData?)null);
+            .Returns<ServiceDetailData?>(null);
 
-        A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(A<Guid>.That.Matches(x => x == _existingServiceId), A<OfferTypeId>._))
+        A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(_existingServiceId, A<OfferTypeId>._))
             .Returns(new OfferProviderDetailsData("Test Service", "Test Company", "provider@mail.de", new Guid("ac1cf001-7fbc-1f2f-817f-bce058020001"), "https://www.testurl.com", false, Guid.NewGuid()));
-        A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(A<Guid>.That.Matches(x => x == _existingServiceWithFailingAutoSetupId), A<OfferTypeId>._))
+        A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(_existingServiceWithFailingAutoSetupId, A<OfferTypeId>._))
             .Returns(new OfferProviderDetailsData("Test Service", "Test Company", "provider@mail.de", new Guid("ac1cf001-7fbc-1f2f-817f-bce058020001"), "https://www.fail.com", false, Guid.NewGuid()));
         A.CallTo(() => _offerRepository.GetOfferProviderDetailsAsync(A<Guid>.That.Not.Matches(x => x == _existingServiceId || x == _existingServiceWithFailingAutoSetupId), A<OfferTypeId>._))
-            .Returns((OfferProviderDetailsData?)null);
+            .Returns<OfferProviderDetailsData?>(null);
 
         var agreementData = _fixture.CreateMany<AgreementData>(1);
-        A.CallTo(() => _agreementRepository.GetOfferAgreementDataForOfferId(A<Guid>.That.Matches(x => x == _existingServiceId), A<OfferTypeId>._))
+        A.CallTo(() => _agreementRepository.GetOfferAgreementDataForOfferId(_existingServiceId, A<OfferTypeId>._))
             .Returns(agreementData.ToAsyncEnumerable());
         A.CallTo(() => _agreementRepository.GetOfferAgreementDataForOfferId(A<Guid>.That.Not.Matches(x => x == _existingServiceId), A<OfferTypeId>._))
             .Returns(Enumerable.Empty<AgreementData>().ToAsyncEnumerable());
-        A.CallTo(() => _agreementRepository.CheckAgreementExistsForSubscriptionAsync(A<Guid>.That.Matches(x => x == _existingAgreementId), A<Guid>._, A<OfferTypeId>.That.Matches(x => x == OfferTypeId.SERVICE)))
+        A.CallTo(() => _agreementRepository.CheckAgreementExistsForSubscriptionAsync(_existingAgreementId, A<Guid>._, OfferTypeId.SERVICE))
             .Returns(true);
         A.CallTo(() => _agreementRepository.CheckAgreementExistsForSubscriptionAsync(A<Guid>.That.Not.Matches(x => x == _existingAgreementId), A<Guid>._, A<OfferTypeId>._))
             .Returns(false);
@@ -677,7 +672,7 @@ private void SetupRepositories()
 
         var offerSubscription = _fixture.Create<OfferSubscription>();
         A.CallTo(() => _offerSubscriptionsRepository.GetSubscriptionDetailDataForOwnUserAsync(
-                A<Guid>.That.Matches(x => x == _validSubscriptionId),
+                _validSubscriptionId,
                 _identity.CompanyId,
                 A<OfferTypeId>._))
             .Returns(new SubscriptionDetailData(_existingServiceId, "Super Service", OfferSubscriptionStatusId.ACTIVE));
@@ -685,31 +680,31 @@ private void SetupRepositories()
                 A<Guid>.That.Not.Matches(x => x == _validSubscriptionId),
                 _identity.CompanyId,
                 A<OfferTypeId>._))
-            .Returns((SubscriptionDetailData?)null);
+            .Returns<SubscriptionDetailData?>(null);
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
-                A<Guid>.That.Matches(x => x == _existingServiceId), _identity.IdentityId, A<OfferTypeId>._))
+                _existingServiceId, _identity.IdentityId, A<OfferTypeId>._))
             .Returns((_identity.CompanyId, offerSubscription));
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
                 A<Guid>.That.Not.Matches(x => x == _existingServiceId), _identity.IdentityId,
                 A<OfferTypeId>._))
-            .Returns((_identity.CompanyId, (OfferSubscription?)null));
+            .Returns((_identity.CompanyId, default(OfferSubscription?)));
         A.CallTo(() => _offerSubscriptionsRepository.GetCompanyIdWithAssignedOfferForCompanyUserAndSubscriptionAsync(
-                A<Guid>.That.Matches(x => x == _existingServiceId), A<Guid>.That.Not.Matches(x => x == _identity.IdentityId),
+                _existingServiceId, A<Guid>.That.Not.Matches(x => x == _identity.IdentityId),
                 A<OfferTypeId>._))
-            .Returns(((Guid companyId, OfferSubscription? offerSubscription))default);
+            .Returns<(Guid companyId, OfferSubscription? offerSubscription)>(default);
 
-        A.CallTo(() => _consentRepository.GetConsentDetailData(A<Guid>.That.Matches(x => x == _validConsentId), A<OfferTypeId>.That.Matches(x => x == OfferTypeId.SERVICE)))
+        A.CallTo(() => _consentRepository.GetConsentDetailData(_validConsentId, OfferTypeId.SERVICE))
             .Returns(new ConsentDetailData(_validConsentId, "The Company", _companyUser.Id, ConsentStatusId.ACTIVE, "Agreed"));
         A.CallTo(() => _consentRepository.GetConsentDetailData(A<Guid>._, A<OfferTypeId>.That.Not.Matches(x => x == OfferTypeId.SERVICE)))
-            .Returns((ConsentDetailData?)null);
+            .Returns<ConsentDetailData?>(null);
         A.CallTo(() => _consentRepository.GetConsentDetailData(A<Guid>.That.Not.Matches(x => x == _validConsentId), A<OfferTypeId>._))
-            .Returns((ConsentDetailData?)null);
+            .Returns<ConsentDetailData?>(null);
 
         var userRoleData = _fixture.CreateMany<UserRoleData>(3);
         A.CallTo(() => _userRolesRepository.GetUserRoleDataUntrackedAsync(A<IEnumerable<UserRoleConfig>>._))
             .Returns(userRoleData.ToAsyncEnumerable());
 
-        A.CallTo(() => _userRolesRepository.GetUserRolesForOfferIdAsync(A<Guid>.That.Matches(x => x == _existingServiceId)))
+        A.CallTo(() => _userRolesRepository.GetUserRolesForOfferIdAsync(_existingServiceId))
             .Returns(new[] { "Buyer", "Supplier" }.ToAsyncEnumerable());
         A.CallTo(() => _portalRepositories.GetInstance<IAgreementRepository>()).Returns(_agreementRepository);
         A.CallTo(() => _portalRepositories.GetInstance<IConsentRepository>()).Returns(_consentRepository);
diff --git a/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceReleaseBusinessLogicTest.cs b/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceReleaseBusinessLogicTest.cs
index 3d1e34af4f..a26cca5bbc 100644
--- a/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceReleaseBusinessLogicTest.cs
+++ b/tests/marketplace/Services.Service.Tests/BusinessLogic/ServiceReleaseBusinessLogicTest.cs
@@ -162,10 +162,10 @@ public async Task GetServiceDetailsByIdWillNullPropertiesAsync_ReturnsExpectedRe
         //Arrange
         var data = _fixture.Build<ServiceDetailsData>()
                            .With(x => x.OfferStatusId, OfferStatusId.IN_REVIEW)
-                           .With(x => x.Title, (string?)null)
-                           .With(x => x.ProviderUri, (string?)null)
-                           .With(x => x.ContactEmail, (string?)null)
-                           .With(x => x.ContactNumber, (string?)null)
+                           .With(x => x.Title, default(string?))
+                           .With(x => x.ProviderUri, default(string?))
+                           .With(x => x.ContactEmail, default(string?))
+                           .With(x => x.ContactNumber, default(string?))
                            .Create();
         var serviceId = _fixture.Create<Guid>();
 
@@ -191,7 +191,7 @@ public async Task GetServiceDetailsByIdAsync_WithInvalidServiceId_ThrowsExceptio
         // Arrange
         var invalidServiceId = Guid.NewGuid();
         A.CallTo(() => _offerRepository.GetServiceDetailsByIdAsync(invalidServiceId))
-           .Returns((ServiceDetailsData?)null);
+           .Returns<ServiceDetailsData?>(null);
 
         // Act
         async Task Act() => await _sut.GetServiceDetailsByIdAsync(invalidServiceId).ConfigureAwait(false);
@@ -254,7 +254,7 @@ public async Task GetServiceTypeDataAsync_ReturnsExpected()
         var data = _fixture.Build<OfferProviderResponse>()
             .With(x => x.Title, "test title")
             .With(x => x.ContactEmail, "info@test.de")
-            .With(x => x.UseCase, (IEnumerable<AppUseCaseData>?)null)
+            .With(x => x.UseCase, default(IEnumerable<AppUseCaseData>?))
             .With(x => x.ServiceTypeIds, new[] { ServiceTypeId.DATASPACE_SERVICE, ServiceTypeId.CONSULTANCY_SERVICE })
             .Create();
 
@@ -574,7 +574,7 @@ public async Task ApproveServiceRequestAsync_WithValid_CallsExpected()
         A.CallTo(() => _offerService.ApproveOfferRequestAsync(offerId, OfferTypeId.SERVICE,
             A<IEnumerable<NotificationTypeId>>._, A<IEnumerable<UserRoleConfig>>._,
             A<IEnumerable<NotificationTypeId>>._, A<IEnumerable<UserRoleConfig>>._,
-            A<ValueTuple<string, string>>.That.Matches(x => x.Item1 == _options.Value.OfferSubscriptionAddress && x.Item2 == _options.Value.OfferDetailAddress),
+            A<(string, string)>.That.Matches(x => x.Item1 == _options.Value.OfferSubscriptionAddress && x.Item2 == _options.Value.OfferDetailAddress),
             A<IEnumerable<UserRoleConfig>>._)).MustHaveHappenedOnceExactly();
     }
 
@@ -624,11 +624,11 @@ await sut
     private void SetupUpdateService()
     {
         A.CallTo(() => _offerRepository.GetServiceUpdateData(_notExistingServiceId, A<IEnumerable<ServiceTypeId>>._, _identity.CompanyId))
-            .Returns((ServiceUpdateData?)null);
+            .Returns<ServiceUpdateData?>(null);
         A.CallTo(() => _offerRepository.GetServiceUpdateData(_activeServiceId, A<IEnumerable<ServiceTypeId>>._, _identity.CompanyId))
-            .Returns(new ServiceUpdateData(OfferStatusId.ACTIVE, false, Array.Empty<(ServiceTypeId serviceTypeId, bool IsMatch)>(), ((Guid, string, bool))default, Array.Empty<LocalizedDescription>(), null));
+            .Returns(new ServiceUpdateData(OfferStatusId.ACTIVE, false, Array.Empty<(ServiceTypeId serviceTypeId, bool IsMatch)>(), default, Array.Empty<LocalizedDescription>(), null));
         A.CallTo(() => _offerRepository.GetServiceUpdateData(_differentCompanyServiceId, A<IEnumerable<ServiceTypeId>>._, _identity.CompanyId))
-            .Returns(new ServiceUpdateData(OfferStatusId.CREATED, false, Array.Empty<(ServiceTypeId serviceTypeId, bool IsMatch)>(), ((Guid, string, bool))default, Array.Empty<LocalizedDescription>(), null));
+            .Returns(new ServiceUpdateData(OfferStatusId.CREATED, false, Array.Empty<(ServiceTypeId serviceTypeId, bool IsMatch)>(), default, Array.Empty<LocalizedDescription>(), null));
         A.CallTo(() => _offerRepository.GetServiceUpdateData(_existingServiceId, A<IEnumerable<ServiceTypeId>>._, _identity.CompanyId))
             .Returns(new ServiceUpdateData(OfferStatusId.CREATED, true, new[] { (ServiceTypeId.DATASPACE_SERVICE, false) }, (Guid.NewGuid(), "123", false), Array.Empty<LocalizedDescription>(), Guid.NewGuid()));
     }
diff --git a/tests/notifications/Notifications.Library.Tests/NotificationServiceTests.cs b/tests/notifications/Notifications.Library.Tests/NotificationServiceTests.cs
index f866beebd2..ddca2ba5ba 100644
--- a/tests/notifications/Notifications.Library.Tests/NotificationServiceTests.cs
+++ b/tests/notifications/Notifications.Library.Tests/NotificationServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -404,7 +403,7 @@ public async Task SetNotificationsForOfferToDone_WithMultipleUserRoleAndOneNotif
         // Assert
         A.CallTo(() => _notificationRepository.GetNotificationUpdateIds(
                 A<IEnumerable<Guid>>.That.IsSameSequenceAs(new[] { UserRoleId }),
-                (IEnumerable<Guid>?)null,
+                default(IEnumerable<Guid>?),
                 A<IEnumerable<NotificationTypeId>>.That.IsSameSequenceAs(new[] { NotificationTypeId.APP_RELEASE_REQUEST }),
                 appId))
             .MustHaveHappenedOnceExactly();
diff --git a/tests/notifications/Notifications.Service.Tests/BusinessLogic/NotificationBusinessLogicTests.cs b/tests/notifications/Notifications.Service.Tests/BusinessLogic/NotificationBusinessLogicTests.cs
index 53e70eaac4..612e8b242d 100644
--- a/tests/notifications/Notifications.Service.Tests/BusinessLogic/NotificationBusinessLogicTests.cs
+++ b/tests/notifications/Notifications.Service.Tests/BusinessLogic/NotificationBusinessLogicTests.cs
@@ -191,12 +191,22 @@ public async Task GetNotifications_WithFilters_CallsExpected()
         A.CallTo(() => _identity.IdentityId).Returns(userId);
         var filter = _fixture.Create<NotificationFilters>();
 
+        A.CallTo(() => _notificationRepository.GetAllNotificationDetailsByReceiver(A<Guid>._, A<SearchSemanticTypeId>._, A<bool>._, A<NotificationTypeId>._, A<NotificationTopicId>._, A<bool>._, A<NotificationSorting>._, A<bool>._, A<IEnumerable<NotificationTypeId>>._, A<string?>._))
+            .Returns((int skip, int take) => Task.FromResult<Pagination.Source<NotificationDetailData>?>(new(100, _fixture.CreateMany<NotificationDetailData>(take))));
+
         // Act
-        var result = await sut.GetNotificationsAsync(0, 20, filter, SearchSemanticTypeId.AND).ConfigureAwait(false);
+        var result = await sut.GetNotificationsAsync(2, 10, filter, SearchSemanticTypeId.AND).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _notificationRepository.GetAllNotificationDetailsByReceiver(userId, SearchSemanticTypeId.AND, filter.IsRead, filter.TypeId, filter.TopicId, filter.OnlyDueDate, filter.Sorting, filter.DoneState, A<IEnumerable<NotificationTypeId>>.That.Matches(x => x.Count() == filter.SearchTypeIds.Count()), filter.SearchQuery))
             .MustHaveHappenedOnceExactly();
+        result.Should().NotBeNull()
+            .And.Match<Pagination.Response<NotificationDetailData>>(x =>
+                x.Meta.NumberOfElements == 100 &&
+                x.Meta.NumberOfPages == 10 &&
+                x.Meta.Page == 2 &&
+                x.Meta.PageSize == 10 &&
+                x.Content.Count() == 10);
     }
 
     #endregion
@@ -452,11 +462,11 @@ private void SetupRepositories()
         A.CallTo(() =>
                 _notificationRepository.GetNotificationByIdAndValidateReceiverAsync(
                     A<Guid>.That.Not.Matches(x => x == _notificationDetail.Id), A<Guid>._))
-            .Returns(((bool, NotificationDetailData))default);
+            .Returns<(bool, NotificationDetailData)>(default);
 
         A.CallTo(() =>
                 _notificationRepository.CheckNotificationExistsByIdAndValidateReceiverAsync(_notificationDetail.Id, _identityId))
-            .ReturnsLazily(() => (true, true, true));
+            .Returns((true, true, true));
         A.CallTo(() =>
                 _notificationRepository.CheckNotificationExistsByIdAndValidateReceiverAsync(
                     A<Guid>.That.Not.Matches(x => x == _notificationDetail.Id), A<Guid>._))
@@ -470,7 +480,7 @@ private void SetupRepositories()
         A.CallTo(() => _notificationRepository.GetNotificationByIdAndValidateReceiverAsync(_notificationDetail.Id, A<Guid>.That.Not.Matches(x => x == _identityId)))
             .Returns((false, _unreadNotificationDetails.First()));
         A.CallTo(() => _notificationRepository.GetNotificationByIdAndValidateReceiverAsync(A<Guid>.That.Not.Matches(x => x == _notificationDetail.Id), _identityId))
-            .Returns(default((bool IsUserReceiver, NotificationDetailData NotificationDetailData)));
+            .Returns<(bool IsUserReceiver, NotificationDetailData NotificationDetailData)>(default);
 
         A.CallTo(() => _notificationRepository.GetNotificationCountForUserAsync(_identityId, false))
             .Returns(5);
diff --git a/tests/notifications/Notifications.Service.Tests/Controllers/NotificationControllerTest.cs b/tests/notifications/Notifications.Service.Tests/Controllers/NotificationControllerTest.cs
index a5e7c8be8b..a1e447a56d 100644
--- a/tests/notifications/Notifications.Service.Tests/Controllers/NotificationControllerTest.cs
+++ b/tests/notifications/Notifications.Service.Tests/Controllers/NotificationControllerTest.cs
@@ -64,7 +64,7 @@ public async Task GetNotifications_ReturnsExpectedCount()
         var doneState = _fixture.Create<bool?>();
         var paginationResponse = new Pagination.Response<NotificationDetailData>(new Pagination.Metadata(15, 1, 1, 15), _fixture.CreateMany<NotificationDetailData>(5));
         A.CallTo(() => _logic.GetNotificationsAsync(A<int>._, A<int>._, A<NotificationFilters>._, SearchSemanticTypeId.AND))
-            .ReturnsLazily(() => paginationResponse);
+            .Returns(paginationResponse);
 
         //Act
         var result = await _controller.GetNotifications(isRead: isRead, notificationTypeId: typeId, notificationTopicId: topicId, onlyDueDate: onlyDueDate, sorting: sorting, doneState: doneState, searchTypeIds: Enumerable.Empty<NotificationTypeId>()).ConfigureAwait(false);
@@ -82,7 +82,7 @@ public async Task GetNotification_ReturnsExpectedData()
         var data = _fixture.Create<NotificationDetailData>();
         var notificationId = _fixture.Create<Guid>();
         A.CallTo(() => _logic.GetNotificationDetailDataAsync(A<Guid>._))
-            .ReturnsLazily(() => data);
+            .Returns(data);
 
         //Act
         var result = await _controller.GetNotification(notificationId).ConfigureAwait(false);
@@ -98,7 +98,7 @@ public async Task NotificationCountDetails_ReturnsExpectedData()
         //Arrange
         var data = _fixture.Create<NotificationCountDetails>();
         A.CallTo(() => _logic.GetNotificationCountDetailsAsync())
-            .ReturnsLazily(() => data);
+            .Returns(data);
 
         //Act
         var result = await _controller.NotificationCountDetails().ConfigureAwait(false);
@@ -114,8 +114,6 @@ public async Task SetNotificationToRead_ReturnsNoContent()
     {
         //Arrange
         var notificationId = Guid.NewGuid();
-        A.CallTo(() => _logic.SetNotificationStatusAsync(notificationId, A<bool>._))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         //Act
         var result = await _controller.SetNotificationToRead(notificationId).ConfigureAwait(false);
@@ -130,8 +128,6 @@ public async Task DeleteNotification_ReturnsNoContent()
     {
         //Arrange
         var notificationId = Guid.NewGuid();
-        A.CallTo(() => _logic.DeleteNotificationAsync(notificationId))
-            .ReturnsLazily(() => Task.CompletedTask);
 
         //Act
         var result = await _controller.DeleteNotification(notificationId).ConfigureAwait(false);
diff --git a/tests/notifications/Notifications.Service.Tests/EnpointSetup/NotificationEndpoints.cs b/tests/notifications/Notifications.Service.Tests/EndpointSetup/NotificationEndpoints.cs
similarity index 68%
rename from tests/notifications/Notifications.Service.Tests/EnpointSetup/NotificationEndpoints.cs
rename to tests/notifications/Notifications.Service.Tests/EndpointSetup/NotificationEndpoints.cs
index 0a5ece36cb..d83aba02fa 100644
--- a/tests/notifications/Notifications.Service.Tests/EnpointSetup/NotificationEndpoints.cs
+++ b/tests/notifications/Notifications.Service.Tests/EndpointSetup/NotificationEndpoints.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -23,7 +22,7 @@
 using System.Text;
 using System.Text.Json;
 
-namespace Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Tests.EnpointSetup;
+namespace Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Tests.EndpointSetup;
 
 public class NotificationEndpoints
 {
@@ -33,44 +32,44 @@ public class NotificationEndpoints
 
     public NotificationEndpoints(HttpClient client)
     {
-        this._client = client;
+        _client = client;
     }
 
     public async Task<HttpResponseMessage> CreateNotification(Guid companyUserId, NotificationCreationData data)
     {
-        var request = new HttpRequestMessage(HttpMethod.Post, $"{Path}/{companyUserId}");
+        using var request = new HttpRequestMessage(HttpMethod.Post, $"{Path}/{companyUserId}");
         request.Content = new StringContent(JsonSerializer.Serialize(data), Encoding.UTF8, "application/json");
-        return await this._client.SendAsync(request);
+        return await _client.SendAsync(request);
     }
 
     public async Task<HttpResponseMessage> GetNotification(Guid notificationId)
     {
-        var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}/{notificationId}");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}/{notificationId}");
+        return await _client.SendAsync(request);
     }
 
     public async Task<HttpResponseMessage> GetNotifications(Guid applicationId)
     {
-        var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}/application/{applicationId}/companyDetailsWithAddress");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}/application/{applicationId}/companyDetailsWithAddress");
+        return await _client.SendAsync(request);
     }
 
     public async Task<HttpResponseMessage> NotificationCount(bool? isRead)
     {
         var countParam = isRead.HasValue ? $"?isRead={isRead.Value}" : string.Empty;
-        var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}/count{countParam}");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}/count{countParam}");
+        return await _client.SendAsync(request);
     }
 
     public async Task<HttpResponseMessage> SetNotificationToRead(Guid notificationId)
     {
-        var request = new HttpRequestMessage(HttpMethod.Put, $"{Path}/{notificationId}/read");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Put, $"{Path}/{notificationId}/read");
+        return await _client.SendAsync(request);
     }
 
     public async Task<HttpResponseMessage> DeleteNotification(Guid notificationId)
     {
-        var request = new HttpRequestMessage(HttpMethod.Delete, $"{Path}/{notificationId}");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Delete, $"{Path}/{notificationId}");
+        return await _client.SendAsync(request);
     }
 }
diff --git a/tests/notifications/Notifications.Service.Tests/IntegrationTests/NotificationControllerIntegrationTests.cs b/tests/notifications/Notifications.Service.Tests/IntegrationTests/NotificationControllerIntegrationTests.cs
index 841c7dca08..b6af6ba27c 100644
--- a/tests/notifications/Notifications.Service.Tests/IntegrationTests/NotificationControllerIntegrationTests.cs
+++ b/tests/notifications/Notifications.Service.Tests/IntegrationTests/NotificationControllerIntegrationTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -20,7 +19,7 @@
 
 using FluentAssertions;
 using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Controllers;
-using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Tests.EnpointSetup;
+using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Tests.EndpointSetup;
 using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions;
 using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.IntegrationTests;
 using System.Net;
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRepositoryTests.cs
index 5ea32dfbde..bf3d451d87 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRepositoryTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -19,6 +18,7 @@
  ********************************************************************************/
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories;
@@ -395,7 +395,7 @@ public async Task CheckServiceProviderDetailsExistsForUser_WithNotExistingIamUse
         new[] { "value-1", "value-2", "value-3" },                                                                                           // initialValues
         new[] { "added-1", "changed-1", "added-2" },                                                                                         // updateValues
         new[] { UniqueIdentifierId.COMMERCIAL_REG_NUMBER, UniqueIdentifierId.VIES },                                                         // addedEntityKeys
-        new[] { "added-1", "added-2" },                                                                                                       // addedEntityValues
+        new[] { "added-1", "added-2" },                                                                                                      // addedEntityValues
         new[] { UniqueIdentifierId.EORI },                                                                                                   // updatedEntityKeys
         new[] { "changed-1" },                                                                                                               // updatedEntityValues
         new[] { UniqueIdentifierId.LEI_CODE, UniqueIdentifierId.VAT_ID }                                                                     // removedEntityKeys
@@ -409,8 +409,8 @@ public async Task CreateUpdateDeleteIdentifiers(
         IEnumerable<UniqueIdentifierId> removedEntityKeys)
     {
         var companyId = Guid.NewGuid();
-        var initialItems = initialKeys.Zip(initialValues).Select(x => ((UniqueIdentifierId InitialKey, string InitialValue))(x.First, x.Second)).ToImmutableArray();
-        var updateItems = updateKeys.Zip(updateValues).Select(x => ((UniqueIdentifierId UpdateKey, string UpdateValue))(x.First, x.Second)).ToImmutableArray();
+        var initialItems = initialKeys.Zip(initialValues).Select(x => (InitialKey: x.First, InitialValue: x.Second)).ToImmutableArray();
+        var updateItems = updateKeys.Zip(updateValues).Select(x => (UpdateKey: x.First, UpdateValue: x.Second)).ToImmutableArray();
         var addedEntities = addedEntityKeys.Zip(addedEntityValues).Select(x => new CompanyIdentifier(companyId, x.First, x.Second)).OrderBy(x => x.UniqueIdentifierId).ToImmutableArray();
         var updatedEntities = updatedEntityKeys.Zip(updatedEntityValues).Select(x => new CompanyIdentifier(companyId, x.First, x.Second)).OrderBy(x => x.UniqueIdentifierId).ToImmutableArray();
         var removedEntities = removedEntityKeys.Select(x => new CompanyIdentifier(companyId, x, null!)).OrderBy(x => x.UniqueIdentifierId).ToImmutableArray();
@@ -424,9 +424,9 @@ public async Task CreateUpdateDeleteIdentifiers(
         changeTracker.HasChanges().Should().BeTrue();
         changedEntries.Should().AllSatisfy(entry => entry.Entity.Should().BeOfType<CompanyIdentifier>());
         changedEntries.Should().HaveCount(addedEntities.Length + updatedEntities.Length + removedEntities.Length);
-        var added = changedEntries.Where(entry => entry.State == Microsoft.EntityFrameworkCore.EntityState.Added).Select(x => (CompanyIdentifier)x.Entity).ToImmutableArray();
-        var modified = changedEntries.Where(entry => entry.State == Microsoft.EntityFrameworkCore.EntityState.Modified).Select(x => (CompanyIdentifier)x.Entity).ToImmutableArray();
-        var deleted = changedEntries.Where(entry => entry.State == Microsoft.EntityFrameworkCore.EntityState.Deleted).Select(x => (CompanyIdentifier)x.Entity).ToImmutableArray();
+        var added = changedEntries.Where(entry => entry.State == EntityState.Added).Select(x => (CompanyIdentifier)x.Entity).ToImmutableArray();
+        var modified = changedEntries.Where(entry => entry.State == EntityState.Modified).Select(x => (CompanyIdentifier)x.Entity).ToImmutableArray();
+        var deleted = changedEntries.Where(entry => entry.State == EntityState.Deleted).Select(x => (CompanyIdentifier)x.Entity).ToImmutableArray();
 
         added.Should().HaveSameCount(addedEntities);
         added.OrderBy(x => x.UniqueIdentifierId).Zip(addedEntities).Should().AllSatisfy(x => (x.First.UniqueIdentifierId == x.Second.UniqueIdentifierId && x.First.Value == x.Second.Value).Should().BeTrue());
@@ -551,7 +551,7 @@ public async Task RemoveCompanyAssignedUseCase_ReturnsExpectedResult()
     [Fact]
     public async Task GetCompanyRoleAndConsentAgreementDetailsAsync_ReturnsExpected()
     {
-        var (sut, context) = await CreateSut().ConfigureAwait(false);
+        var (sut, _) = await CreateSut().ConfigureAwait(false);
         var companyId = new Guid("3390c2d7-75c1-4169-aa27-6ce00e1f3cdd");
         var activeDescription = "The participant role is covering the data provider, data consumer or app user scenario. As participant you are an active member of the network with enabled services to particiapte as contributer and user.";
         var serviceDscription = "The Service Provider is able to offer 3rd party services, such as dataspace service offerings to Catena-X Members. Catena-X members can subscribe for those services.";
@@ -563,13 +563,13 @@ public async Task GetCompanyRoleAndConsentAgreementDetailsAsync_ReturnsExpected(
         result.Should().NotBeNull()
             .And.HaveCount(4)
             .And.Satisfy(
-                x => x.CompanyRoleId == CompanyRoleId.ACTIVE_PARTICIPANT && x.RoleDescription == activeDescription && x.CompanyRolesActive == false && x.Agreements.Count() == 2 && x.Agreements.All(agreement => agreement.ConsentStatus == 0),
-                x => x.CompanyRoleId == CompanyRoleId.APP_PROVIDER && x.RoleDescription == appDescription && x.CompanyRolesActive == false && x.Agreements.Count() == 1 && x.Agreements.All(agreement => agreement.ConsentStatus == 0),
-                x => x.CompanyRoleId == CompanyRoleId.SERVICE_PROVIDER && x.RoleDescription == serviceDscription && x.CompanyRolesActive == true && x.Agreements.Count() == 3
+                x => x.CompanyRoleId == CompanyRoleId.ACTIVE_PARTICIPANT && x.RoleDescription == activeDescription && !x.CompanyRolesActive && x.Agreements.Count() == 2 && x.Agreements.All(agreement => agreement.ConsentStatus == 0),
+                x => x.CompanyRoleId == CompanyRoleId.APP_PROVIDER && x.RoleDescription == appDescription && !x.CompanyRolesActive && x.Agreements.Count() == 1 && x.Agreements.All(agreement => agreement.ConsentStatus == 0),
+                x => x.CompanyRoleId == CompanyRoleId.SERVICE_PROVIDER && x.RoleDescription == serviceDscription && x.CompanyRolesActive && x.Agreements.Count() == 3
                      && x.Agreements.Any(agr => agr.AgreementId == new Guid("aa0a0000-7fbc-1f2f-817f-bce0502c1094") && agr.DocumentId == null && agr.AgreementName == "Terms & Conditions - Consultant" && agr.ConsentStatus == ConsentStatusId.ACTIVE)
                      && x.Agreements.Any(agr => agr.AgreementId == new Guid("aa0a0000-7fbc-1f2f-817f-bce0502c1018") && agr.DocumentId == null && agr.AgreementName == "Data Sharing Approval - allow CX to submit company data (company name, requester) to process the subscription" && agr.ConsentStatus == 0)
-                    && x.Agreements.Any(agr => agr.AgreementId == new Guid("aa0a0000-7fbc-1f2f-817f-bce0502c1017") && agr.DocumentId == new Guid("00000000-0000-0000-0000-000000000004") && agr.AgreementName == "Terms & Conditions Service Provider" && agr.ConsentStatus == 0),
-                x => x.CompanyRoleId == CompanyRoleId.ONBOARDING_SERVICE_PROVIDER && x.RoleDescription == onboardingServiceProviderDescription && x.CompanyRolesActive == false && x.Agreements.Count() == 1 && x.Agreements.All(agreement => agreement.ConsentStatus == 0));
+                     && x.Agreements.Any(agr => agr.AgreementId == new Guid("aa0a0000-7fbc-1f2f-817f-bce0502c1017") && agr.DocumentId == new Guid("00000000-0000-0000-0000-000000000004") && agr.AgreementName == "Terms & Conditions Service Provider" && agr.ConsentStatus == 0),
+                x => x.CompanyRoleId == CompanyRoleId.ONBOARDING_SERVICE_PROVIDER && x.RoleDescription == onboardingServiceProviderDescription && !x.CompanyRolesActive && x.Agreements.Count() == 1 && x.Agreements.All(agreement => agreement.ConsentStatus == 0));
     }
 
     #endregion
@@ -581,7 +581,7 @@ public async Task GetCompanyRolesDataAsync_ReturnsExpected()
     {
         // Arrange
         var companyRoleIds = new[] { CompanyRoleId.SERVICE_PROVIDER, CompanyRoleId.ACTIVE_PARTICIPANT };
-        var (sut, context) = await CreateSut().ConfigureAwait(false);
+        var (sut, _) = await CreateSut().ConfigureAwait(false);
 
         // Act
         var result = await sut.GetCompanyRolesDataAsync(new("3390c2d7-75c1-4169-aa27-6ce00e1f3cdd"), companyRoleIds).ConfigureAwait(false);
@@ -604,7 +604,7 @@ public async Task GetAgreementAssignedRolesDataAsync_ReturnsExpected()
     {
         // Arrange
         var companyRoleIds = new[] { CompanyRoleId.APP_PROVIDER };
-        var (sut, context) = await CreateSut().ConfigureAwait(false);
+        var (sut, _) = await CreateSut().ConfigureAwait(false);
 
         // Act
         var result = await sut.GetAgreementAssignedRolesDataAsync(companyRoleIds).ToListAsync().ConfigureAwait(false);
@@ -624,7 +624,7 @@ public async Task GetAgreementAssignedRolesDataAsync_ReturnsExpectedOrder()
     {
         // Arrange
         var companyRoleIds = new[] { CompanyRoleId.APP_PROVIDER, CompanyRoleId.SERVICE_PROVIDER, CompanyRoleId.ACTIVE_PARTICIPANT };
-        var (sut, context) = await CreateSut().ConfigureAwait(false);
+        var (sut, _) = await CreateSut().ConfigureAwait(false);
 
         // Act
         var result = await sut.GetAgreementAssignedRolesDataAsync(companyRoleIds).ToListAsync().ConfigureAwait(false);
@@ -864,16 +864,22 @@ public async Task AttachAndModifyOnboardingServiceProvider_Unchanged_ReturnsExpe
 
     #region CreateOnboardingServiceProviderDetails
 
-    [Fact]
-    public async Task CreateOnboardingServiceProviderDetails_Changed_ReturnsExpectedResult()
+    [Theory]
+    [InlineData("JHcycHPDfRwjT1J1NqBJtQ==")]
+    [InlineData(null)]
+    public async Task CreateOnboardingServiceProviderDetails_Changed_ReturnsExpectedResult(string? initVector)
     {
         // Arrange
         const string url = "https://service-url.com/new";
+        const string authUrl = "https://auth.url";
+        const string clientId = "acmeId";
         var (sut, context) = await CreateSut().ConfigureAwait(false);
-        var secret = "test123"u8.ToArray();
+        var secret = Convert.FromHexString("2b7e151628aed2a6abf715892b7e151628aed2a6abf715892b7e151628aed2a6");
+        var initializationVector = initVector == null ? null : Convert.FromBase64String(initVector);
+        var index = 5;
 
         // Act
-        var result = sut.CreateOnboardingServiceProviderDetails(_validCompanyId, url, "https//auth.url", "test", secret);
+        var result = sut.CreateOnboardingServiceProviderDetails(_validCompanyId, url, authUrl, clientId, secret, initializationVector, index);
 
         // Assert
         result.CompanyId.Should().Be(_validCompanyId);
@@ -881,12 +887,19 @@ public async Task CreateOnboardingServiceProviderDetails_Changed_ReturnsExpected
         var changeTracker = context.ChangeTracker;
         var changedEntries = changeTracker.Entries().ToList();
         changeTracker.HasChanges().Should().BeTrue();
-        changedEntries.Should().NotBeEmpty();
-        changedEntries.Should().HaveCount(1);
-        changedEntries.Single().Entity.Should().BeOfType<OnboardingServiceProviderDetail>().Which.CallbackUrl.Should().Be(url);
-        var entry = changedEntries.Single();
-        entry.Entity.Should().BeOfType<OnboardingServiceProviderDetail>().Which.CallbackUrl.Should().Be(url);
-        entry.State.Should().Be(EntityState.Added);
+        changedEntries.Should().ContainSingle()
+            .Which.Should().Match<EntityEntry>(x =>
+                x.State == EntityState.Added &&
+                x.Entity.GetType() == typeof(OnboardingServiceProviderDetail) &&
+                ((OnboardingServiceProviderDetail)x.Entity).CompanyId.Equals(_validCompanyId) &&
+                ((OnboardingServiceProviderDetail)x.Entity).CallbackUrl.Equals(url) &&
+                ((OnboardingServiceProviderDetail)x.Entity).AuthUrl.Equals(authUrl) &&
+                ((OnboardingServiceProviderDetail)x.Entity).ClientId.Equals(clientId) &&
+                ((OnboardingServiceProviderDetail)x.Entity).ClientSecret.SequenceEqual(secret) &&
+                ((OnboardingServiceProviderDetail)x.Entity).InitializationVector == null
+                    ? initializationVector == null
+                    : ((OnboardingServiceProviderDetail)x.Entity).InitializationVector!.SequenceEqual(initializationVector!) &&
+                ((OnboardingServiceProviderDetail)x.Entity).EncryptionMode == index);
     }
 
     #endregion
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanySsiDetailsRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanySsiDetailsRepositoryTests.cs
index 4f6b4cdf4d..519cb4f775 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanySsiDetailsRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanySsiDetailsRepositoryTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -380,7 +379,6 @@ public async Task GetSsiRejectionData_WithNotExisting_ReturnsExpected()
     public async Task CreateCredentialDetails_WithValidData_ReturnsExpected()
     {
         // Arrange
-        var now = DateTimeOffset.UtcNow;
         var (sut, context) = await CreateSutWithContext();
 
         // Act
@@ -402,7 +400,6 @@ public async Task CreateCredentialDetails_WithValidData_ReturnsExpected()
     public async Task CreateCredentialDetails_WithNoChanges_ReturnsExpected()
     {
         // Arrange
-        var now = DateTimeOffset.UtcNow;
         var (sut, context) = await CreateSutWithContext();
 
         // Act
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/DocumentRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/DocumentRepositoryTests.cs
index 2c038dcac2..fa5e4c4461 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/DocumentRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/DocumentRepositoryTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -237,11 +236,9 @@ public async Task AttachAndModifyDocument_ReturnsExpectedResult()
         var changeTracker = context.ChangeTracker;
         var changedEntries = changeTracker.Entries().ToList();
         changeTracker.HasChanges().Should().BeTrue();
-        changedEntries.Should().NotBeEmpty();
-        changedEntries.Should().HaveCount(1);
-        changedEntries.Single().Entity.Should()
-            .BeOfType<PortalEntities.Entities.Document>()
-                .Which.DocumentStatusId.Should().Be(DocumentStatusId.LOCKED);
+        changedEntries.Should().ContainSingle()
+            .Which.Entity.Should().BeOfType<Document>()
+            .Which.DocumentStatusId.Should().Be(DocumentStatusId.LOCKED);
     }
 
     [Fact]
@@ -249,16 +246,19 @@ public async Task AttachAndModifyDocument_NoUpdate()
     {
         // Arrange
         var (sut, context) = await CreateSut().ConfigureAwait(false);
+        var id = Guid.NewGuid();
 
         // Act
-        sut.AttachAndModifyDocument(Guid.NewGuid(),
+        sut.AttachAndModifyDocument(id,
             docstatusId => { docstatusId.DocumentStatusId = DocumentStatusId.LOCKED; },
             docstatusId => { docstatusId.DocumentStatusId = DocumentStatusId.LOCKED; });
 
         // Assert
         var changeTracker = context.ChangeTracker;
-        var changedEntries = changeTracker.Entries().ToList();
         changeTracker.HasChanges().Should().BeFalse();
+        changeTracker.Entries().Should().ContainSingle()
+            .Which.Entity.Should().BeOfType<Document>()
+            .Which.DocumentStatusId.Should().Be(DocumentStatusId.LOCKED);
     }
 
     #endregion
@@ -350,7 +350,7 @@ public async Task GetOfferImageDocumentContentAsync_ReturnsExpectedResult(Guid o
             result.IsValidDocumentType.Should().Be(isValidDocumentType);
             result.IsValidOfferType.Should().Be(isValidOfferType);
             result.IsInactive.Should().Be(isInactive);
-            if (isDocumentExisting && isLinkedToOffer && isValidDocumentType && isValidOfferType && !isInactive)
+            if (isLinkedToOffer && isValidDocumentType && isValidOfferType && !isInactive)
             {
                 result.Content.Should().NotBeNull();
             }
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/IdentityProviderRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/IdentityProviderRepositoryTests.cs
index a52831730f..7374902ba8 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/IdentityProviderRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/IdentityProviderRepositoryTests.cs
@@ -53,16 +53,14 @@ public async Task CreateCompanyIdentityProvider_WithValid_ReturnsExpected()
 
         // Assert
         var changeTracker = context.ChangeTracker;
-        var changedEntries = changeTracker.Entries().ToList();
         result.CompanyId.Should().Be(_companyId);
         result.IdentityProviderId.Should().Be(identityProviderId);
         changeTracker.HasChanges().Should().BeTrue();
-        changedEntries.Should().NotBeEmpty();
-        changedEntries.Should().HaveCount(1);
-        changedEntries.Single().Entity.Should().BeOfType<CompanyIdentityProvider>();
-        var idp = changedEntries.Single().Entity as CompanyIdentityProvider;
-        idp!.CompanyId.Should().Be(_companyId);
-        idp.IdentityProviderId.Should().Be(identityProviderId);
+        changeTracker.Entries().Should().ContainSingle()
+            .Which.Entity.Should().BeOfType<CompanyIdentityProvider>()
+            .Which.Should().Match<CompanyIdentityProvider>(x =>
+                x.CompanyId == _companyId &&
+                x.IdentityProviderId == identityProviderId);
     }
 
     #endregion
@@ -79,16 +77,14 @@ public async Task CreateIamIdentityProvider_WithValid_ReturnsExpected()
 
         // Assert
         var changeTracker = context.ChangeTracker;
-        var changedEntries = changeTracker.Entries().ToList();
         result.IamIdpAlias.Should().Be("idp-999");
         result.IdentityProviderId.Should().Be(identityProviderId);
         changeTracker.HasChanges().Should().BeTrue();
-        changedEntries.Should().NotBeEmpty();
-        changedEntries.Should().HaveCount(1);
-        changedEntries.Single().Entity.Should().BeOfType<IamIdentityProvider>();
-        var idp = changedEntries.Single().Entity as IamIdentityProvider;
-        idp!.IamIdpAlias.Should().Be("idp-999");
-        idp.IdentityProviderId.Should().Be(identityProviderId);
+        changeTracker.Entries().Should().ContainSingle()
+            .Which.Entity.Should().BeOfType<IamIdentityProvider>()
+            .Which.Should().Match<IamIdentityProvider>(x =>
+                x.IamIdpAlias == "idp-999" &&
+                x.IdentityProviderId == identityProviderId);
     }
 
     #endregion
@@ -261,6 +257,7 @@ public async Task GetSingleManagedIdentityProviderAliasDataUntracked_WithCompany
 
         // Assert
         var result = await Assert.ThrowsAsync<InvalidOperationException>(Act).ConfigureAwait(false);
+        result.Should().NotBeNull();
     }
 
     [Fact]
@@ -273,7 +270,7 @@ public async Task GetSingleManagedIdentityProviderAliasDataUntracked_WithCompany
         var result = await sut.GetSingleManagedIdentityProviderAliasDataUntracked(new Guid("2dc4249f-b5ca-4d42-bef1-7a7a950a4f88")).ConfigureAwait(false);
 
         // Assert
-        result.Should().Be(((Guid, string?))default);
+        result.Should().Be(default((Guid, string?)));
     }
 
     #endregion
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/NotificationRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/NotificationRepositoryTests.cs
index 01c17b4999..f3b9073862 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/NotificationRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/NotificationRepositoryTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -329,7 +328,7 @@ public async Task GetAllAsDetailsByUserIdUntracked_WithUnreadStatus_ReturnsExpec
         // Assert
         results.Should().NotBeNull();
         results!.Data.Count().Should().Be(count);
-        results.Data.Should().AllSatisfy(detailData => detailData.Should().Match<NotificationDetailData>(x => x.IsRead == false));
+        results.Data.Should().AllSatisfy(detailData => detailData.IsRead.Should().BeFalse());
     }
 
     [Theory]
@@ -348,7 +347,7 @@ public async Task GetAllAsDetailsByUserIdUntracked_WithReadStatus_ReturnsExpecte
         // Assert
         results.Should().NotBeNull();
         results!.Data.Count().Should().Be(count);
-        results.Data.Should().AllSatisfy(detailData => detailData.Should().Match<NotificationDetailData>(x => x.IsRead == true));
+        results.Data.Should().AllSatisfy(detailData => detailData.IsRead.Should().BeTrue());
     }
 
     [Theory]
@@ -367,8 +366,8 @@ public async Task GetAllAsDetailsByUserIdUntracked_WithReadStatusAndInfoType_Ret
         results!.Data.Count().Should().Be(count);
         results.Data.Should().AllSatisfy(detailData => detailData.Should().Match<NotificationDetailData>(x =>
             searchSemanticTypeId == SearchSemanticTypeId.AND
-            ? (x.IsRead == true && x.TypeId == NotificationTypeId.INFO)
-            : (x.IsRead == true || x.TypeId == NotificationTypeId.INFO)));
+            ? (x.IsRead && x.TypeId == NotificationTypeId.INFO)
+            : (x.IsRead || x.TypeId == NotificationTypeId.INFO)));
     }
 
     [Theory]
@@ -387,8 +386,8 @@ public async Task GetAllAsDetailsByUserIdUntracked_WithReadStatusAndActionType_R
         results!.Data.Count().Should().Be(count);
         results.Data.Should().AllSatisfy(detailData => detailData.Should().Match<NotificationDetailData>(x =>
             searchSemanticTypeId == SearchSemanticTypeId.AND
-                ? (x.IsRead == true && x.TypeId == NotificationTypeId.ACTION)
-                : (x.IsRead == true || x.TypeId == NotificationTypeId.ACTION)));
+                ? (x.IsRead && x.TypeId == NotificationTypeId.ACTION)
+                : (x.IsRead || x.TypeId == NotificationTypeId.ACTION)));
     }
 
     [Theory]
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferRepositoryTests.cs
index 3ea6a67189..704809402b 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferRepositoryTests.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferRepositoryTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -50,36 +49,6 @@ public OfferRepositoryTests(TestDbFixture testDbFixture)
         _dbTestDbFixture = testDbFixture;
     }
 
-    #region CheckAppExistsById
-
-    [Fact]
-    public async Task CheckAppExistsById_WithExistingEntry_ReturnsTrue()
-    {
-        // Arrange
-        var sut = await CreateSut().ConfigureAwait(false);
-
-        // Act
-        var result = await sut.CheckAppExistsById(new Guid("ac1cf001-7fbc-1f2f-817f-bce0572c0007")).ConfigureAwait(false);
-
-        // Assert
-        result.Should().BeTrue();
-    }
-
-    [Fact]
-    public async Task CheckAppExistsById_WithNonExistingEntry_ReturnsFalse()
-    {
-        // Arrange
-        var sut = await CreateSut().ConfigureAwait(false);
-
-        // Act
-        var result = await sut.CheckAppExistsById(Guid.NewGuid()).ConfigureAwait(false);
-
-        // Assert
-        result.Should().BeFalse();
-    }
-
-    #endregion
-
     #region GetOfferProviderDetailsAsync
 
     [Fact]
@@ -1178,6 +1147,7 @@ public async Task GetServiceDetailsByIdAsync_InCorrectOfferStatus_ReturnsNull()
     [Theory]
     [InlineData(new[] { OfferStatusId.ACTIVE }, OfferSorting.NameDesc, null, "en")]
     [InlineData(new[] { OfferStatusId.ACTIVE }, OfferSorting.NameAsc, null, "en")]
+    [InlineData(new[] { OfferStatusId.ACTIVE }, null, null, "en")]
     public async Task GetAllInReviewStatusServiceAsync_ReturnsExpectedResult(IEnumerable<OfferStatusId> statusids, OfferSorting? sorting, string? serviceName, string languagename)
     {
         // Arrange
@@ -1188,7 +1158,6 @@ public async Task GetAllInReviewStatusServiceAsync_ReturnsExpectedResult(IEnumer
 
         // Assert
         result.Should().NotBeNull();
-        result!.Data.Should().NotBeEmpty();
         result!.Data.Should().HaveCount(4);
         if (sorting == OfferSorting.NameAsc)
         {
@@ -1207,12 +1176,11 @@ public async Task GetAllInReviewStatusServiceAsync_ReturnsExpectedResult_WithDat
         var sut = await CreateSut().ConfigureAwait(false);
 
         // Act
-        var result = await sut.GetAllInReviewStatusServiceAsync(new[] { OfferStatusId.ACTIVE }, OfferTypeId.SERVICE, OfferSorting.NameAsc, null, "en", Constants.DefaultLanguage)(0, 10).ConfigureAwait(false);
+        var result = await sut.GetAllInReviewStatusServiceAsync(new[] { OfferStatusId.ACTIVE }, OfferTypeId.SERVICE, OfferSorting.DateDesc, null, "en", Constants.DefaultLanguage)(0, 10).ConfigureAwait(false);
 
         // Assert
         result.Should().NotBeNull();
-        result!.Data.Should().NotBeEmpty()
-            .And.HaveCount(4)
+        result!.Data.Should().HaveCount(4)
             .And.StartWith(new InReviewServiceData(new Guid("ac1cf001-7fbc-1f2f-817f-bce0000c0001"), "Consulting Service - Data Readiness", OfferStatusId.ACTIVE, "Catena-X", "Lorem ipsum dolor sit amet, consectetur adipiscing elit."));
     }
 
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs
index 405915fb80..8acfbf9866 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/OfferSubscriptionRepositoryTest.cs
@@ -1,6 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
- * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -148,7 +147,8 @@ public async Task GetAllBusinessAppDataForUserIdAsync_WithValidUser_ReturnsExpec
     [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.INACTIVE }, 1, false, 1)]
     [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING }, 1, false, 1)]
     [InlineData(SubscriptionStatusSorting.OfferIdAsc, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING, OfferSubscriptionStatusId.ACTIVE }, 2, false, 1)]
-    public async Task GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync_ReturnsExpectedNotificationDetailData(SubscriptionStatusSorting sorting, string? offerIdTxt, OfferTypeId offerTypeId, IEnumerable<OfferSubscriptionStatusId> offerSubscriptionStatusIds, int count, bool technicalUser, int companySubscriptionCount)
+    [InlineData(null, null, OfferTypeId.APP, new[] { OfferSubscriptionStatusId.PENDING, OfferSubscriptionStatusId.ACTIVE }, 2, false, 1)]
+    public async Task GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync_ReturnsExpectedNotificationDetailData(SubscriptionStatusSorting? sorting, string? offerIdTxt, OfferTypeId offerTypeId, IEnumerable<OfferSubscriptionStatusId> offerSubscriptionStatusIds, int count, bool technicalUser, int companySubscriptionCount)
     {
         // Arrange
         Guid? offerId = offerIdTxt == null ? null : new Guid(offerIdTxt);
@@ -162,9 +162,11 @@ public async Task GetOwnCompanyProvidedOfferSubscriptionStatusesUntrackedAsync_R
         {
             results.Should().NotBeNull();
             results!.Count.Should().Be(count);
-            results.Data.Should().HaveCount(count);
-            results.Data.Should().AllBeOfType<OfferCompanySubscriptionStatusData>().Which.First().CompanySubscriptionStatuses.Should().HaveCount(companySubscriptionCount);
-            results.Data.Should().AllBeOfType<OfferCompanySubscriptionStatusData>().Which.First().CompanySubscriptionStatuses.Should().Match(x => x.Count() == companySubscriptionCount && x.First().TechnicalUser == technicalUser);
+            results.Data.Should().HaveCount(count)
+                .And.AllBeOfType<OfferCompanySubscriptionStatusData>()
+                .Which.First().CompanySubscriptionStatuses.Should().Match(x =>
+                    x.Count() == companySubscriptionCount &&
+                    x.First().TechnicalUser == technicalUser);
         }
         else
         {
diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/StaticDataRepositoryTest.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/StaticDataRepositoryTest.cs
index b95bc7e4ea..fbdc6543d3 100644
--- a/tests/portalbackend/PortalBackend.DBAccess.Tests/StaticDataRepositoryTest.cs
+++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/StaticDataRepositoryTest.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -90,9 +89,11 @@ public async Task GetCountryAssignedIdentifiers_ReturnsExpectedResult(string cou
         result.IsValidCountry.Should().Be(validCountry);
         if (result.IsValidCountry)
         {
-            var expectedIds = (IEnumerable<(BpdmIdentifierId BpdmId, UniqueIdentifierId UniqueId)>)expectedBpdmIds!.Zip(expectedUniqueIds!);
-            result.Identifiers.Should().NotBeNull();
-            result.Identifiers.Should().HaveSameCount(expectedIds);
+            expectedBpdmIds.Should().NotBeNull();
+            expectedUniqueIds.Should().NotBeNull();
+            var expectedIds = expectedBpdmIds!.Zip(expectedUniqueIds!);
+            result.Identifiers.Should().NotBeNull()
+                .And.HaveSameCount(expectedIds);
             result.Identifiers.OrderBy(item => item).Should().ContainInOrder(expectedIds?.OrderBy(item => item));
         }
         else
diff --git a/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistHandlerServiceTests.cs b/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistHandlerServiceTests.cs
index b3ac1a8b29..3457dfc9a2 100644
--- a/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistHandlerServiceTests.cs
+++ b/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistHandlerServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -174,12 +173,6 @@ public void GetProcessStepExecution_ExecutableStep_Success(ProcessStepTypeId ste
     public void GetProcessStepExecution_InvalidStep_Throws(ProcessStepTypeId stepTypeId)
     {
         // Arrange
-        var context = new IApplicationChecklistService.WorkerChecklistProcessStepData(
-            Guid.NewGuid(),
-            stepTypeId,
-            _fixture.Create<IDictionary<ApplicationChecklistEntryTypeId, ApplicationChecklistEntryStatusId>>().ToImmutableDictionary(),
-            _fixture.CreateMany<ProcessStepTypeId>());
-
         var sut = CreateSut();
 
         var Act = () => sut.GetProcessStepExecution(stepTypeId);
diff --git a/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistProcessTypeExecutorTests.cs b/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistProcessTypeExecutorTests.cs
index 39e117ef0a..8b00d6c141 100644
--- a/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistProcessTypeExecutorTests.cs
+++ b/tests/processes/ApplicationChecklist.Executor.Tests/ApplicationChecklistProcessTypeExecutorTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -514,7 +513,6 @@ public async Task ExecuteProcessStep_ThrowingTestException_WithoutErrorFunc_Retu
 
         // Arrange execute
         var executeProcessStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>();
-        var followupStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>();
         var error = _fixture.Create<TestException>();
 
         A.CallTo(() => _secondProcessFunc(A<IApplicationChecklistService.WorkerChecklistProcessStepData>._, A<CancellationToken>._))
@@ -580,7 +578,6 @@ public async Task ExecuteProcessStep_ThrowingRecoverableServiceException_Without
 
         // Arrange execute
         var executeProcessStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>();
-        var followupStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>();
         var error = new ServiceException(_fixture.Create<string>(), true);
 
         A.CallTo(() => _secondProcessFunc(A<IApplicationChecklistService.WorkerChecklistProcessStepData>._, A<CancellationToken>._))
@@ -767,8 +764,8 @@ private void SetupFakes()
             .ReturnsLazily((ProcessStepTypeId stepTypeId) =>
                 stepTypeId switch
                 {
-                    _ when stepTypeId == _firstStepTypeId => _firstExecution,
-                    _ when stepTypeId == _secondStepTypeId => _secondExecution,
+                    var id when id == _firstStepTypeId => _firstExecution,
+                    var id when id == _secondStepTypeId => _secondExecution,
                     _ => throw new ConflictException($"no execution defined for processStep {stepTypeId}"),
                 }
             );
diff --git a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistCreationServiceTests.cs b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistCreationServiceTests.cs
index 246a5f20e6..4117e2d754 100644
--- a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistCreationServiceTests.cs
+++ b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistCreationServiceTests.cs
@@ -261,11 +261,11 @@ private void SetupFakesForCreate()
             ApplicationChecklistEntryTypeId.CLEARING_HOUSE
         };
         A.CallTo(() => _applicationRepository.GetBpnAndChecklistCheckForApplicationIdAsync(ApplicationWithBpnId))
-            .ReturnsLazily(() => new ValueTuple<string?, IEnumerable<ApplicationChecklistEntryTypeId>>("testbpn", new List<ApplicationChecklistEntryTypeId>()));
+            .Returns(("testbpn", Enumerable.Empty<ApplicationChecklistEntryTypeId>()));
         A.CallTo(() => _applicationRepository.GetBpnAndChecklistCheckForApplicationIdAsync(ApplicationWithoutBpnId))
-            .ReturnsLazily(() => new ValueTuple<string?, IEnumerable<ApplicationChecklistEntryTypeId>>(null, new List<ApplicationChecklistEntryTypeId>()));
+            .Returns((null, Enumerable.Empty<ApplicationChecklistEntryTypeId>()));
         A.CallTo(() => _applicationRepository.GetBpnAndChecklistCheckForApplicationIdAsync(ApplicationWithChecklist))
-            .ReturnsLazily(() => new ValueTuple<string?, IEnumerable<ApplicationChecklistEntryTypeId>>("123", checklist));
+            .Returns(("123", checklist));
 
         A.CallTo(() => _portalRepositories.GetInstance<IApplicationRepository>()).Returns(_applicationRepository);
         A.CallTo(() => _portalRepositories.GetInstance<IApplicationChecklistRepository>()).Returns(_applicationChecklistRepository);
diff --git a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs
index f1c8fb6a9b..56365fbb03 100644
--- a/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs
+++ b/tests/processes/ApplicationChecklist.Library.Tests/ApplicationChecklistServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -171,7 +170,7 @@ public async Task VerifyChecklistEntry_InvalidApplicationId_Throws()
 
         // (bool IsValidApplicationId, bool IsSubmitted, Guid? ProcessId, IEnumerable<(ApplicationChecklistEntryTypeId TypeId, ApplicationChecklistEntryStatusId StatusId)
         A.CallTo(() => _applicationChecklistRepository.GetChecklistProcessStepData(A<Guid>._, A<IEnumerable<ApplicationChecklistEntryTypeId>>._, A<IEnumerable<ProcessStepTypeId>>._))
-            .Returns((VerifyChecklistData?)null);
+            .Returns<VerifyChecklistData?>(null);
 
         var Act = () => _service.VerifyChecklistEntryAndProcessSteps(applicationId, entryTypeId, entryStatusIds, processStepTypeId, entryTypeIds, processStepTypeIds);
 
diff --git a/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationHandlerTests.cs b/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationHandlerTests.cs
index 99f3314b53..711dd8f387 100644
--- a/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationHandlerTests.cs
+++ b/tests/processes/NetworkRegistration.Library.Tests/NetworkRegistrationHandlerTests.cs
@@ -86,7 +86,7 @@ public async Task SynchronizeUser_WithoutOspName_ThrowsUnexpectedConditionExcept
     {
         // Arrange
         A.CallTo(() => _networkRepository.GetOspCompanyName(NetworkRegistrationId))
-            .Returns((string?)null);
+            .Returns<string?>(null);
 
         // Act
         async Task Act() => await _sut.SynchronizeUser(NetworkRegistrationId).ConfigureAwait(false);
@@ -175,8 +175,8 @@ public async Task SynchronizeUser_WithDisplayNameNull_ThrowsConflictException()
         A.CallTo(() => _userProvisioningService.GetRoleDatas(A<IEnumerable<UserRoleConfig>>._))
             .Returns(Enumerable.Repeat(new UserRoleData(UserRoleIds, "cl1", "Company Admin"), 1).ToAsyncEnumerable());
         A.CallTo(() => _provisioningManager.GetUserByUserName(user1.CompanyUserId.ToString())).Returns(user1Id);
-        A.CallTo(() => _provisioningManager.GetUserByUserName(user2.CompanyUserId.ToString())).Returns((string?)null);
-        A.CallTo(() => _provisioningManager.GetIdentityProviderDisplayName("idp1")).Returns((string?)null);
+        A.CallTo(() => _provisioningManager.GetUserByUserName(user2.CompanyUserId.ToString())).Returns<string?>(null);
+        A.CallTo(() => _provisioningManager.GetIdentityProviderDisplayName("idp1")).Returns<string?>(null);
 
         // Act
         async Task Act() => await _sut.SynchronizeUser(NetworkRegistrationId).ConfigureAwait(false);
@@ -213,8 +213,8 @@ public async Task SynchronizeUser_WithValidData_ReturnsExpected()
         A.CallTo(() => _userProvisioningService.GetRoleDatas(A<IEnumerable<UserRoleConfig>>._))
             .Returns(Enumerable.Repeat(new UserRoleData(UserRoleIds, "cl1", "Company Admin"), 1).ToAsyncEnumerable());
         A.CallTo(() => _provisioningManager.GetUserByUserName(user1.CompanyUserId.ToString())).Returns(user1Id);
-        A.CallTo(() => _provisioningManager.GetUserByUserName(user2.CompanyUserId.ToString())).Returns((string?)null);
-        A.CallTo(() => _provisioningManager.GetUserByUserName(user3.CompanyUserId.ToString())).Returns((string?)null);
+        A.CallTo(() => _provisioningManager.GetUserByUserName(user2.CompanyUserId.ToString())).Returns<string?>(null);
+        A.CallTo(() => _provisioningManager.GetUserByUserName(user3.CompanyUserId.ToString())).Returns<string?>(null);
         A.CallTo(() => _provisioningManager.GetIdentityProviderDisplayName("idp1"))
             .Returns("DisplayName for Idp1");
         A.CallTo(() => _provisioningManager.GetIdentityProviderDisplayName("idp2"))
@@ -297,7 +297,7 @@ public async Task RemoveKeycloakUser_WithIamUserIdNull_ReturnsExpected()
                 identity.Id,
             }.ToAsyncEnumerable());
         A.CallTo(() => _provisioningManager.GetUserByUserName(A<string>._))
-            .Returns((string?)null);
+            .Returns<string?>(null);
         A.CallTo(() => _userRepository.AttachAndModifyIdentity(A<Guid>._, A<Action<Identity>>._, A<Action<Identity>>._))
             .Invokes((Guid _, Action<Identity>? initialize, Action<Identity> setOptionalFields) =>
             {
diff --git a/tests/processes/OfferSubscription.Executor.Tests/OfferSubscriptionProcessTypeExecutorTests.cs b/tests/processes/OfferSubscription.Executor.Tests/OfferSubscriptionProcessTypeExecutorTests.cs
index 8bccc15a31..538a867ac4 100644
--- a/tests/processes/OfferSubscription.Executor.Tests/OfferSubscriptionProcessTypeExecutorTests.cs
+++ b/tests/processes/OfferSubscription.Executor.Tests/OfferSubscriptionProcessTypeExecutorTests.cs
@@ -317,22 +317,22 @@ public void GetExecutableStepTypeIds_ReturnsExpected()
     private void SetupFakes()
     {
         A.CallTo(() => _offerSubscriptionRepository.GetOfferSubscriptionDataForProcessIdAsync(_failingProcessId))
-            .ReturnsLazily(() => _failingSubscriptionId);
+            .Returns(_failingSubscriptionId);
         A.CallTo(() => _offerSubscriptionRepository.GetOfferSubscriptionDataForProcessIdAsync(_processId))
-            .ReturnsLazily(() => _subscriptionId);
+            .Returns(_subscriptionId);
         A.CallTo(() => _offerSubscriptionRepository.GetOfferSubscriptionDataForProcessIdAsync(A<Guid>.That.Not.Matches(x => x == _processId || x == _failingProcessId)))
-            .ReturnsLazily(() => Guid.Empty);
+            .Returns(Guid.Empty);
 
         A.CallTo(() => _offerProviderBusinessLogic.TriggerProvider(_subscriptionId, A<CancellationToken>._))
-            .ReturnsLazily(() => new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(new[] { ProcessStepTypeId.START_AUTOSETUP }, ProcessStepStatusId.DONE, true, null));
+            .Returns((new[] { ProcessStepTypeId.START_AUTOSETUP }, ProcessStepStatusId.DONE, true, null));
         A.CallTo(() => _offerSetupService.CreateClient(_subscriptionId))
-            .ReturnsLazily(() => new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(new[] { ProcessStepTypeId.OFFERSUBSCRIPTION_TECHNICALUSER_CREATION }, ProcessStepStatusId.DONE, true, null));
+            .Returns((new[] { ProcessStepTypeId.OFFERSUBSCRIPTION_TECHNICALUSER_CREATION }, ProcessStepStatusId.DONE, true, null));
         A.CallTo(() => _offerSetupService.CreateTechnicalUser(_subscriptionId, A<IEnumerable<UserRoleConfig>>._))
-            .ReturnsLazily(() => new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(new[] { ProcessStepTypeId.ACTIVATE_SUBSCRIPTION }, ProcessStepStatusId.DONE, true, null));
+            .Returns((new[] { ProcessStepTypeId.ACTIVATE_SUBSCRIPTION }, ProcessStepStatusId.DONE, true, null));
         A.CallTo(() => _offerSetupService.ActivateSubscription(_subscriptionId, A<IEnumerable<UserRoleConfig>>._, A<IEnumerable<UserRoleConfig>>._, A<string>._))
-            .ReturnsLazily(() => new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(new[] { ProcessStepTypeId.TRIGGER_PROVIDER_CALLBACK }, ProcessStepStatusId.DONE, true, null));
+            .Returns((new[] { ProcessStepTypeId.TRIGGER_PROVIDER_CALLBACK }, ProcessStepStatusId.DONE, true, null));
         A.CallTo(() => _offerProviderBusinessLogic.TriggerProviderCallback(_subscriptionId, A<CancellationToken>._))
-            .ReturnsLazily(() => new ValueTuple<IEnumerable<ProcessStepTypeId>?, ProcessStepStatusId, bool, string?>(null, ProcessStepStatusId.DONE, true, null));
+            .Returns((null, ProcessStepStatusId.DONE, true, null));
     }
 
     #endregion
diff --git a/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs b/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs
index d5cf7bdfdc..64671074fb 100644
--- a/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs
+++ b/tests/processes/OfferSubscription.Library.Tests/OfferSubscriptionProcessServiceTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -71,7 +70,7 @@ public async Task VerifySubscriptionAndProcessSteps()
         IEnumerable<ProcessStep>? processSteps = null;
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, false));
+            .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .ReturnsLazily((Guid id, IEnumerable<ProcessStepTypeId> processStepTypes) =>
             {
@@ -106,9 +105,9 @@ public async Task VerifySubscriptionAndProcessSteps_InvalidSubscriptionId_Throws
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(false, false));
+            .Returns((false, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
-            .Returns((VerifyProcessData?)null);
+            .Returns<VerifyProcessData?>(null);
 
         var Act = () => _service.VerifySubscriptionAndProcessSteps(subscriptionId, processStepTypeId, processStepTypeIds, true);
 
@@ -131,7 +130,7 @@ public async Task VerifySubscriptionAndProcessSteps_WithActive_Throws()
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, true));
+            .Returns((true, true));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyProcessData(process, null));
 
@@ -154,7 +153,7 @@ public async Task VerifySubscriptionAndProcessSteps_WithProcessNull_Throws()
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, false));
+            .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyProcessData(null, null));
 
@@ -179,7 +178,7 @@ public async Task VerifySubscriptionAndProcessSteps_LockedProcess_Throws()
         var processStepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(Enum.GetValues<ProcessStepTypeId>().Length - 2).ToImmutableArray();
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, false));
+            .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyProcessData(process, null));
 
@@ -203,7 +202,7 @@ public async Task VerifySubscriptionAndProcessSteps_WithoutProcessSteps_Throws()
         IEnumerable<ProcessStepTypeId>? processStepTypeIds = null;
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, false));
+            .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyProcessData(process, null));
 
@@ -228,7 +227,7 @@ public async Task VerifySubscriptionAndProcessSteps_UnexpectedProcessStepData_Th
         var processSteps = new ProcessStep[] { new(Guid.NewGuid(), processStepTypeId, ProcessStepStatusId.SKIPPED, process.Id, DateTimeOffset.UtcNow) };
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, false));
+            .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyProcessData(process, processSteps));
 
@@ -253,7 +252,7 @@ public async Task VerifySubscriptionAndProcessSteps_NoEligibleProcessStep_Throws
         var processSteps = _fixture.CreateMany<ProcessStepTypeId>(5).Where(typeId => typeId != processStepTypeId).Select(typeId => new ProcessStep(Guid.NewGuid(), typeId, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow)).ToImmutableArray();
 
         A.CallTo(() => _offerSubscriptionsRepository.IsActiveOfferSubscription(A<Guid>._))
-            .Returns(new ValueTuple<bool, bool>(true, false));
+            .Returns((true, false));
         A.CallTo(() => _offerSubscriptionsRepository.GetProcessStepData(A<Guid>._, A<IEnumerable<ProcessStepTypeId>>._))
             .Returns(new VerifyProcessData(process, processSteps));
 
diff --git a/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs b/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
index 20bbcef940..e9b0a222cb 100644
--- a/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
+++ b/tests/processes/Processes.Library.Tests/ManualProcessDataExtensionsTests.cs
@@ -83,7 +83,7 @@ public void CreateManualProcessData_ReturnsExpected()
     public void CreateManualProcessData_WithNullVerifyProcessData_Throws()
     {
         // Arrange
-        var sut = (VerifyProcessData?)null;
+        var sut = default(VerifyProcessData?);
 
         var Act = () => sut.CreateManualProcessData(_fixture.Create<ProcessStepTypeId>(), _portalRepositories, _getProcessEntityName);
 
@@ -99,7 +99,7 @@ public void CreateManualProcessData_WithNullProcess_Throws()
     {
         // Arrange
         var sut = _fixture.Build<VerifyProcessData>()
-            .With(x => x.Process, (Process?)null)
+            .With(x => x.Process, default(Process?))
             .Create();
 
         var Act = () => sut.CreateManualProcessData(_fixture.Create<ProcessStepTypeId>(), _portalRepositories, _getProcessEntityName);
@@ -135,11 +135,10 @@ public void CreateManualProcessData_WithNullProcessSteps_Throws()
     {
         // Arrange
         var process = new Process(Guid.NewGuid(), _fixture.Create<ProcessTypeId>(), Guid.NewGuid()) { LockExpiryDate = null };
-        var processSteps = _fixture.CreateMany<(Guid ProcessStepId, DateTimeOffset Now)>(5).Select(x => new ProcessStep(x.ProcessStepId, _fixture.Create<ProcessStepTypeId>(), ProcessStepStatusId.TODO, process.Id, x.Now)).ToImmutableArray();
 
         var sut = _fixture.Build<VerifyProcessData>()
             .With(x => x.Process, process)
-            .With(x => x.ProcessSteps, (IEnumerable<ProcessStep>?)null)
+            .With(x => x.ProcessSteps, default(IEnumerable<ProcessStep>?))
             .Create();
 
         var Act = () => sut.CreateManualProcessData(_fixture.Create<ProcessStepTypeId>(), _portalRepositories, _getProcessEntityName);
@@ -467,7 +466,7 @@ public void FinalizeProcessStep_ReturnsExpected(bool locked)
         var version = Guid.NewGuid();
         var process = _fixture.Build<Process>()
             .With(x => x.Version, version)
-            .With(x => x.LockExpiryDate, locked ? DateTimeOffset.UtcNow : (DateTimeOffset?)null)
+            .With(x => x.LockExpiryDate, locked ? DateTimeOffset.UtcNow : default(DateTimeOffset?))
             .Create();
         var stepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(3).ToImmutableArray();
         var before = DateTimeOffset.UtcNow.AddDays(-1);
diff --git a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
index f159bc2dd7..73efef21ae 100644
--- a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
+++ b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutorTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -80,13 +79,13 @@ public void GetRegisteredProcessTypeIds_ReturnsExpected()
     public async Task ExecuteProcess_WithInvalidProcessTypeId_Throws()
     {
         // Arrange
-        var Act = async () => await _sut.ExecuteProcess(Guid.NewGuid(), (ProcessTypeId)default, CancellationToken.None).ToListAsync().ConfigureAwait(false);
+        var Act = async () => await _sut.ExecuteProcess(Guid.NewGuid(), default, CancellationToken.None).ToListAsync().ConfigureAwait(false);
 
         // Act
         var result = await Assert.ThrowsAsync<UnexpectedConditionException>(Act).ConfigureAwait(false);
 
         // Assert
-        result.Message.Should().Be($"processType {(ProcessTypeId)default} is not a registered executable processType.");
+        result.Message.Should().Be($"processType {default(ProcessTypeId)} is not a registered executable processType.");
     }
 
     [Theory]
diff --git a/tests/provisioning/Provisioning.Library.Tests/Extensions/RoleManagerTests.cs b/tests/provisioning/Provisioning.Library.Tests/Extensions/RoleManagerTests.cs
index 88a9079e7e..1c98ccc027 100644
--- a/tests/provisioning/Provisioning.Library.Tests/Extensions/RoleManagerTests.cs
+++ b/tests/provisioning/Provisioning.Library.Tests/Extensions/RoleManagerTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -109,7 +108,7 @@ public async Task AddRolesToClientAsync_WithInvalidClient_NothingGetsCalled()
             "test"
         };
         var client = "notvalid";
-        var httpTest = new HttpTest();
+        using var httpTest = new HttpTest();
         httpTest.RespondWithJson(new { access_token = "123" }).RespondWithJson(new List<Client>());
 
         // Act
diff --git a/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs b/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs
index 33355250df..764a9c7a79 100644
--- a/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs
+++ b/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs
@@ -108,7 +108,7 @@ public async Task SetupClientAsync_CallsExpected()
         const string url = "https://newurl.com";
         const string newClientId = "cl1";
         using var httpTest = new HttpTest();
-        A.CallTo(() => _provisioningDbAccess.GetNextClientSequenceAsync()).ReturnsLazily(() => 1);
+        A.CallTo(() => _provisioningDbAccess.GetNextClientSequenceAsync()).Returns(1);
         httpTest.WithAuthorization()
             .WithCreateClient(newClientId)
             .WithGetClientSecretAsync(newClientId, new Credentials { Value = "super-secret" });
diff --git a/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceAuxiliaryMethodsTests.cs b/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceAuxiliaryMethodsTests.cs
index 02eb5b7307..0046619b62 100644
--- a/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceAuxiliaryMethodsTests.cs
+++ b/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceAuxiliaryMethodsTests.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -58,7 +57,7 @@ public UserProvisioningServiceAuxiliaryMethodsTests()
             _resultComposer.Create());
 
         A.CallTo(() => _identityProviderRepository.GetCompanyNameIdpAliaseUntrackedAsync(A<Guid>._, A<Guid?>._, A<IdentityProviderCategoryId>._, A<IdentityProviderTypeId>._)).Returns(
-            _sharedIdpComposer.With(x => x.IdpAliase, new[] { _fixture.Create<ValueTuple<Guid, string>>() }).Create());
+            _sharedIdpComposer.With(x => x.IdpAliase, new[] { _fixture.Create<(Guid, string)>() }).Create());
     }
 
     #region GetCompanyNameIdpAliasData
@@ -80,9 +79,9 @@ public async void TestCompanyNameIdpAliaswithNullCompanyNameAndEmailDataFixtureS
             .Returns(_resultComposer.With(
                 x => x.CompanyUser,
                     _fixture.Build<(Guid CompanyUserId, string? FirstName, string? LastName, string? Email)>()
-                        .With(x => x.FirstName, (string?)null)
-                        .With(x => x.LastName, (string?)null)
-                        .With(x => x.Email, (string?)null)
+                        .With(x => x.FirstName, default(string?))
+                        .With(x => x.LastName, default(string?))
+                        .With(x => x.Email, default(string?))
                         .Create())
                 .Create());
         var sut = new UserProvisioningService(null!, _portalRepositories);
@@ -116,7 +115,7 @@ public async void TestCompanyNameIdpAliasDataIdpAliasNullThrows()
             .Returns(_resultComposer.With(
                 x => x.IdentityProvider,
                     _fixture.Build<(string? IdpAlias, bool IsSharedIdp)>()
-                        .With(x => x.IdpAlias, (string?)null)
+                        .With(x => x.IdpAlias, default(string?))
                         .Create())
                 .Create());
 
@@ -137,7 +136,7 @@ public async void TestCompanyNameIdpAliasDataCompanyNameNullThrows()
             .Returns(_resultComposer.With(
                 x => x.Company,
                     _fixture.Build<(Guid CompanyId, string? CompanyName, string? BusinessPartnerNumber)>()
-                        .With(x => x.CompanyName, (string?)null)
+                        .With(x => x.CompanyName, default(string?))
                         .With(x => x.CompanyId, companyId)
                         .Create())
                 .Create());
@@ -168,11 +167,10 @@ public async void TestGetCompanyNameSharedIdpAliasDataFixtureSetup()
     public async void TestGetCompanyNameSharedIdpwithNullCompanyNameAndEmailAliasDataFixtureSetup()
     {
         // Arrange
-        var data = new ValueTuple<(Guid, string?, string?), (Guid, string?, string?, string?), IEnumerable<(Guid Id, string Alias)>>(
-            new ValueTuple<Guid, string?, string?>(Guid.NewGuid(), _fixture.Create<string>(), _fixture.Create<string>()),
-            new ValueTuple<Guid, string?, string?, string?>(Guid.NewGuid(), null, null, null),
-            _fixture.CreateMany<ValueTuple<Guid, string>>(1)
-
+        var data = (
+            (Guid.NewGuid(), _fixture.Create<string?>(), _fixture.Create<string?>()),
+            (Guid.NewGuid(), default(string?), default(string?), default(string?)),
+            _fixture.CreateMany<(Guid, string)>(1)
         );
 
         A.CallTo(() => _identityProviderRepository.GetCompanyNameIdpAliaseUntrackedAsync(A<Guid>._, A<Guid?>._, A<IdentityProviderCategoryId>._, A<IdentityProviderTypeId>._))
@@ -190,7 +188,7 @@ public async void TestGetCompanyNameSharedIdpwithNullCompanyNameAndEmailAliasDat
     [Fact]
     public async void TestGetCompanyNameSharedIdpAliasDataNotFound()
     {
-        ((Guid, string?, string?), (Guid, string?, string?, string?), IEnumerable<(Guid Id, string Alias)>) notfound = default;
+        var notfound = default(((Guid, string?, string?), (Guid, string?, string?, string?), IEnumerable<(Guid Id, string Alias)>));
 
         A.CallTo(() => _identityProviderRepository.GetCompanyNameIdpAliaseUntrackedAsync(A<Guid>._, A<Guid?>._, A<IdentityProviderCategoryId>._, A<IdentityProviderTypeId>._))
             .Returns(notfound);
@@ -206,7 +204,7 @@ public async void TestGetCompanyNameSharedIdpAliasDataNotFound()
     [Fact]
     public async void TestGetCompanyNameSharedIdpAliasDataForApplicationIdNotFound()
     {
-        ((Guid, string?, string?), (Guid, string?, string?, string?), IEnumerable<(Guid Id, string Alias)>) notfound = default;
+        var notfound = default(((Guid, string?, string?), (Guid, string?, string?, string?), IEnumerable<(Guid Id, string Alias)>));
 
         A.CallTo(() => _identityProviderRepository.GetCompanyNameIdpAliaseUntrackedAsync(A<Guid>._, A<Guid?>._, A<IdentityProviderCategoryId>._, A<IdentityProviderTypeId>._))
             .Returns(notfound);
@@ -258,7 +256,7 @@ public async void TestGetCompanyNameSharedIdpAliasDataCompanyNameNullThrows()
             .Returns(_sharedIdpComposer
                 .With(x => x.Company,
                     _fixture.Build<(Guid CompanyId, string? CompanyName, string? BusinessPartnerNumber)>()
-                        .With(x => x.CompanyName, (string?)null)
+                        .With(x => x.CompanyName, default(string?))
                         .With(x => x.CompanyId, companyId)
                         .Create())
                 .Create());
diff --git a/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceCreateUsersTests.cs b/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceCreateUsersTests.cs
index 44e85d495c..28dd36da41 100644
--- a/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceCreateUsersTests.cs
+++ b/tests/provisioning/Provisioning.Library.Tests/UserProvisioningServiceCreateUsersTests.cs
@@ -162,7 +162,7 @@ public async Task TestCreateUsersRolesAssignmentError()
             .Returns(iamUserId);
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(iamUserId, A<IDictionary<string, IEnumerable<string>>>._))
-            .Returns(new[] { (Client: _clientId, Roles: Enumerable.Empty<string>()) }.ToAsyncEnumerable());
+            .Returns(new (string, IEnumerable<string>, Exception?)[] { (_clientId, Enumerable.Empty<string>(), new Exception("some error")) }.ToAsyncEnumerable());
 
         var result = await sut.CreateOwnCompanyIdpUsersAsync(
             _companyNameIdpAliasData,
@@ -176,7 +176,7 @@ public async Task TestCreateUsersRolesAssignmentError()
         var error = result.ElementAt(_indexSpecialUser).Error;
         error.Should().NotBeNull();
         error.Should().BeOfType(typeof(ConflictException));
-        error!.Message.Should().Be($"invalid role data [{string.Join(", ", specialUser.RoleDatas.Select(roleData => $"clientId: {roleData.ClientClientId}, role: {roleData.UserRoleText}"))}] has not been assigned in keycloak");
+        error!.Message.Should().Be($"invalid role data [{string.Join(", ", specialUser.RoleDatas.Select(roleData => $"clientId: {roleData.ClientClientId}, role: {roleData.UserRoleText}, error: some error"))}] has not been assigned in keycloak");
     }
 
     [Fact]
@@ -519,7 +519,7 @@ private void SetupProvisioningManager()
             .ReturnsLazily(() => _fixture.Create<string>());
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(A<string>._, A<IDictionary<string, IEnumerable<string>>>._))
-            .ReturnsLazily((string _, IDictionary<string, IEnumerable<string>> clientRoles) => clientRoles.Select(x => (Client: x.Key, Roles: x.Value)).ToAsyncEnumerable());
+            .ReturnsLazily((string _, IDictionary<string, IEnumerable<string>> clientRoles) => clientRoles.Select(x => (Client: x.Key, Roles: x.Value, Error: default(Exception?))).ToAsyncEnumerable());
     }
 
     private IEnumerable<UserCreationRoleDataIdpInfo> CreateUserCreationInfoIdp(Func<UserCreationRoleDataIdpInfo>? createInvalidUser = null)
diff --git a/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs b/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs
index 5a115ada2d..0e071d7f6b 100644
--- a/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs
+++ b/tests/registration/ApplicationActivation.Library.Tests/ApplicationActivationTests.cs
@@ -368,15 +368,8 @@ public async Task HandleApplicationActivation_WithoutNetworkRegistrationId_Throw
         };
         var userRoleData = new UserRoleData[] { new(UserRoleId, ClientId, "Company Admin") };
 
-        var processSteps = new List<ProcessStep>();
         var companyUserAssignedRole = _fixture.Create<IdentityAssignedRole>();
         var companyUserAssignedBusinessPartner = _fixture.Create<CompanyUserAssignedBusinessPartner>();
-        var companyApplication = _fixture.Build<CompanyApplication>()
-            .With(x => x.ApplicationStatusId, CompanyApplicationStatusId.SUBMITTED)
-            .Create();
-        var company = _fixture.Build<Company>()
-            .With(x => x.CompanyStatusId, CompanyStatusId.PENDING)
-            .Create();
         SetupFakes(clientRoleNames, userRoleData, companyUserAssignedRole, companyUserAssignedBusinessPartner);
         SetupForDelete();
 
@@ -629,7 +622,7 @@ public async Task HandleApplicationActivation_WithUnassignedRoles_ThrowsUnexpect
 
         //Assert
         var ex = await Assert.ThrowsAsync<UnexpectedConditionException>(Act);
-        ex.Message.Should().Be("inconsistent data, roles not assigned in keycloak: client: catenax-portal, roles: [IT Admin]");
+        ex.Message.Should().Be("inconsistent data, roles not assigned in keycloak: client: catenax-portal, roles: [IT Admin], error: ");
 
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsForApprovalAsync(Id)).MustHaveHappenedOnceExactly();
         A.CallTo(() => _applicationRepository.GetInvitedUsersDataByApplicationIdUntrackedAsync(Id)).MustHaveHappenedOnceExactly();
@@ -697,7 +690,7 @@ public async Task HandleApplicationActivation_WithoutCompanyApplication_ThrowsCo
             Enumerable.Empty<ProcessStepTypeId>());
 
         A.CallTo(() => _applicationRepository.GetCompanyAndApplicationDetailsForApprovalAsync(applicationId))
-            .Returns(((Guid, string, string?, IEnumerable<string>, CompanyApplicationTypeId, Guid?))default);
+            .Returns<(Guid, string, string?, IEnumerable<string>, CompanyApplicationTypeId, Guid?)>(default);
 
         //Act
         async Task Action() => await _sut.HandleApplicationActivation(context, CancellationToken.None).ConfigureAwait(false);
@@ -989,11 +982,11 @@ private void SetupFakes(
             .Returns(CentralUserId3);
 
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(CentralUserId1, A<IDictionary<string, IEnumerable<string>>>.That.Matches(x => x[ClientId].First() == clientRoleNames.First(x => x.ClientId == ClientId).UserRoleNames.First())))
-            .Returns(clientRoleNames.Select(x => (Client: x.ClientId, Roles: x.UserRoleNames)).ToAsyncEnumerable());
+            .Returns(clientRoleNames.Select(x => (x.ClientId, x.UserRoleNames, default(Exception?))).ToAsyncEnumerable());
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(CentralUserId2, A<IDictionary<string, IEnumerable<string>>>.That.Matches(x => x[ClientId].First() == clientRoleNames.First(x => x.ClientId == ClientId).UserRoleNames.First())))
-            .Returns(clientRoleNames.Select(x => (Client: x.ClientId, Roles: x.UserRoleNames)).ToAsyncEnumerable());
+            .Returns(clientRoleNames.Select(x => (x.ClientId, x.UserRoleNames, default(Exception?))).ToAsyncEnumerable());
         A.CallTo(() => _provisioningManager.AssignClientRolesToCentralUserAsync(CentralUserId3, A<IDictionary<string, IEnumerable<string>>>.That.Matches(x => x[ClientId].First() == clientRoleNames.First(x => x.ClientId == ClientId).UserRoleNames.First())))
-            .Returns(clientRoleNames.Select(x => (Client: x.ClientId, Roles: x.UserRoleNames)).ToAsyncEnumerable());
+            .Returns(clientRoleNames.Select(x => (x.ClientId, x.UserRoleNames, default(Exception?))).ToAsyncEnumerable());
 
         A.CallTo(() => _provisioningManager.AddBpnAttributetoUserAsync(CentralUserId1, businessPartnerNumbers))
             .Returns(Task.CompletedTask);
@@ -1035,17 +1028,16 @@ async IAsyncEnumerable<Guid> CreateNotificationsUserIds(IEnumerable<Guid> userId
                 Guid _,
                 bool? done) =>
             {
-                foreach (var notificationData in notifications)
-                {
-                    var notification = new Notification(Guid.NewGuid(), Guid.NewGuid(),
-                        DateTimeOffset.UtcNow, notificationData.notificationTypeId, false)
-                    {
-                        CreatorUserId = creatorId,
-                        Content = notificationData.content,
-                        Done = done
-                    };
-                    _notifications.Add(notification);
-                }
+                _notifications.AddRange(
+                    notifications.Select(notificationData =>
+                        new Notification(Guid.NewGuid(), Guid.NewGuid(),
+                            DateTimeOffset.UtcNow, notificationData.notificationTypeId, false)
+                        {
+                            CreatorUserId = creatorId,
+                            Content = notificationData.content,
+                            Done = done
+                        }));
+
                 return CreateNotificationsUserIds(new[] {
                     CompanyUserId1,
                     CompanyUserId2,
diff --git a/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs b/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
index c9d70b1f6f..80e8a7e410 100644
--- a/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
+++ b/tests/registration/Registration.Service.Tests/BusinessLogic/NetworkBusinessLogicTests.cs
@@ -114,7 +114,7 @@ public async Task Submit_WithNotExistingSubmitData_ThrowsNotFoundException()
         // Arrange
         var data = _fixture.Create<PartnerSubmitData>();
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns(new ValueTuple<bool, IEnumerable<ValueTuple<Guid, CompanyApplicationStatusId, string?>>, IEnumerable<ValueTuple<CompanyRoleId, IEnumerable<Guid>>>, Guid?>());
+            .Returns<(bool, IEnumerable<(Guid, CompanyApplicationStatusId, string?)>, IEnumerable<(CompanyRoleId, IEnumerable<Guid>)>, Guid?)>(default);
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -130,7 +130,7 @@ public async Task Submit_WithoutCompanyApplications_ThrowsConflictException()
         // Arrange
         var data = _fixture.Create<PartnerSubmitData>();
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, Enumerable.Empty<ValueTuple<Guid, CompanyApplicationStatusId, string?>>(), Enumerable.Empty<ValueTuple<CompanyRoleId, IEnumerable<Guid>>>(), null));
+            .Returns((true, Enumerable.Empty<(Guid, CompanyApplicationStatusId, string?)>(), Enumerable.Empty<(CompanyRoleId, IEnumerable<Guid>)>(), null));
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -146,7 +146,7 @@ public async Task Submit_WithMultipleCompanyApplications_ThrowsConflictException
         // Arrange
         var data = _fixture.Create<PartnerSubmitData>();
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, _fixture.CreateMany<ValueTuple<Guid, CompanyApplicationStatusId, string?>>(2), Enumerable.Empty<ValueTuple<CompanyRoleId, IEnumerable<Guid>>>(), null));
+            .Returns((true, _fixture.CreateMany<(Guid, CompanyApplicationStatusId, string?)>(2), Enumerable.Empty<(CompanyRoleId, IEnumerable<Guid>)>(), null));
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -163,7 +163,7 @@ public async Task Submit_WithWrongApplicationStatus_ThrowsConflictException()
         var applicationId = Guid.NewGuid();
         var data = _fixture.Create<PartnerSubmitData>();
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, Enumerable.Repeat<ValueTuple<Guid, CompanyApplicationStatusId, string?>>((applicationId, CompanyApplicationStatusId.VERIFY, null), 1), Enumerable.Empty<ValueTuple<CompanyRoleId, IEnumerable<Guid>>>(), Guid.NewGuid()));
+            .Returns((true, Enumerable.Repeat<(Guid, CompanyApplicationStatusId, string?)>((applicationId, CompanyApplicationStatusId.VERIFY, null), 1), Enumerable.Empty<(CompanyRoleId, IEnumerable<Guid>)>(), Guid.NewGuid()));
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -183,12 +183,12 @@ public async Task Submit_WithOneMissingAgreement_ThrowsConflictException()
         var data = new PartnerSubmitData(
             new[] { CompanyRoleId.APP_PROVIDER },
             new[] { new AgreementConsentData(agreementId, ConsentStatusId.ACTIVE) });
-        var companyRoleIds = new ValueTuple<CompanyRoleId, IEnumerable<Guid>>[]
+        var companyRoleIds = new (CompanyRoleId, IEnumerable<Guid>)[]
         {
             (CompanyRoleId.APP_PROVIDER, new [] {agreementId, notExistingAgreementId})
         };
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, Enumerable.Repeat<ValueTuple<Guid, CompanyApplicationStatusId, string?>>((applicationId, CompanyApplicationStatusId.CREATED, null), 1), companyRoleIds, Guid.NewGuid()));
+            .Returns((true, Enumerable.Repeat<(Guid, CompanyApplicationStatusId, string?)>((applicationId, CompanyApplicationStatusId.CREATED, null), 1), companyRoleIds, Guid.NewGuid()));
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -212,12 +212,12 @@ public async Task Submit_WithOneInactiveAgreement_ThrowsConflictException()
                 new AgreementConsentData(agreementId, ConsentStatusId.ACTIVE),
                 new AgreementConsentData(inactiveAgreementId, ConsentStatusId.INACTIVE),
             });
-        var companyRoleIds = new ValueTuple<CompanyRoleId, IEnumerable<Guid>>[]
+        var companyRoleIds = new (CompanyRoleId, IEnumerable<Guid>)[]
         {
             (CompanyRoleId.APP_PROVIDER, new [] {agreementId, inactiveAgreementId})
         };
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, Enumerable.Repeat<ValueTuple<Guid, CompanyApplicationStatusId, string?>>((applicationId, CompanyApplicationStatusId.CREATED, null), 1), companyRoleIds, Guid.NewGuid()));
+            .Returns((true, Enumerable.Repeat<(Guid, CompanyApplicationStatusId, string?)>((applicationId, CompanyApplicationStatusId.CREATED, null), 1), companyRoleIds, Guid.NewGuid()));
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -241,12 +241,12 @@ public async Task Submit_WithoutProcessId_ThrowsConflictException()
                 new AgreementConsentData(agreementId, ConsentStatusId.ACTIVE),
                 new AgreementConsentData(agreementId1, ConsentStatusId.ACTIVE),
             });
-        var companyRoleIds = new ValueTuple<CompanyRoleId, IEnumerable<Guid>>[]
+        var companyRoleIds = new (CompanyRoleId, IEnumerable<Guid>)[]
         {
             (CompanyRoleId.APP_PROVIDER, new [] {agreementId, agreementId1})
         };
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, Enumerable.Repeat<ValueTuple<Guid, CompanyApplicationStatusId, string?>>((applicationId, CompanyApplicationStatusId.CREATED, "https://callback.url"), 1), companyRoleIds, null));
+            .Returns((true, Enumerable.Repeat<(Guid, CompanyApplicationStatusId, string?)>((applicationId, CompanyApplicationStatusId.CREATED, "https://callback.url"), 1), companyRoleIds, null));
 
         // Act
         async Task Act() => await _sut.Submit(data).ConfigureAwait(false);
@@ -275,12 +275,12 @@ public async Task Submit_WithValidData_CallsExpected()
                 new AgreementConsentData(agreementId, ConsentStatusId.ACTIVE),
                 new AgreementConsentData(agreementId1, ConsentStatusId.ACTIVE),
             });
-        var companyRoleIds = new ValueTuple<CompanyRoleId, IEnumerable<Guid>>[]
+        var companyRoleIds = new (CompanyRoleId, IEnumerable<Guid>)[]
         {
             (CompanyRoleId.APP_PROVIDER, new [] {agreementId, agreementId1})
         };
         A.CallTo(() => _networkRepository.GetSubmitData(_identity.CompanyId))
-            .Returns((true, Enumerable.Repeat<ValueTuple<Guid, CompanyApplicationStatusId, string?>>((applicationId, CompanyApplicationStatusId.CREATED, "https://callback.url"), 1), companyRoleIds, submitProcessId));
+            .Returns((true, Enumerable.Repeat<(Guid, CompanyApplicationStatusId, string?)>((applicationId, CompanyApplicationStatusId.CREATED, "https://callback.url"), 1), companyRoleIds, submitProcessId));
         A.CallTo(() => _applicationRepository.AttachAndModifyCompanyApplication(applicationId, A<Action<CompanyApplication>>._))
             .Invokes((Guid _, Action<CompanyApplication> setOptionalFields) =>
             {
@@ -352,12 +352,12 @@ public async Task DeclineOsp_WithoutExisting_ThrowsNotFoundException()
         var notExistingId = Guid.NewGuid();
         var data = _fixture.Create<DeclineOspData>();
         A.CallTo(() => _networkRepository.GetDeclineDataForApplicationId(notExistingId, CompanyApplicationTypeId.EXTERNAL, A<IEnumerable<CompanyApplicationStatusId>>._, IdentityCompanyId))
-            .Returns(new ValueTuple<bool, bool, bool, bool,
+            .Returns<(bool, bool, bool, bool,
                 (
                     (CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
                     IEnumerable<(Guid, InvitationStatusId)>,
                     VerifyProcessData
-                )>());
+                )?)>(default);
 
         // Act
         async Task Act() => await _sut.DeclineOsp(notExistingId, data).ConfigureAwait(false);
@@ -374,17 +374,11 @@ public async Task DeclineOsp_WithWrongCompany_ThrowsForbiddenException()
         var applcationId = Guid.NewGuid();
         var data = _fixture.Create<DeclineOspData>();
         A.CallTo(() => _networkRepository.GetDeclineDataForApplicationId(applcationId, CompanyApplicationTypeId.EXTERNAL, A<IEnumerable<CompanyApplicationStatusId>>._, IdentityCompanyId))
-            .Returns(new ValueTuple<bool, bool, bool, bool,
-                (
-                (CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
-                IEnumerable<(Guid, InvitationStatusId)>,
-                VerifyProcessData
-                )>(
-                true,
-                true,
-                true,
-                false,
-                default));
+            .Returns((true, true, true, false,
+                default(
+                    ((CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
+                     IEnumerable<(Guid, InvitationStatusId)>,
+                     VerifyProcessData))));
 
         // Act
         async Task Act() => await _sut.DeclineOsp(applcationId, data).ConfigureAwait(false);
@@ -401,18 +395,11 @@ public async Task DeclineOsp_WithInternalApplication_ThrowsConflictException()
         var applicationId = Guid.NewGuid();
         var data = _fixture.Create<DeclineOspData>();
         A.CallTo(() => _networkRepository.GetDeclineDataForApplicationId(applicationId, CompanyApplicationTypeId.EXTERNAL, A<IEnumerable<CompanyApplicationStatusId>>._, IdentityCompanyId))
-            .Returns(new ValueTuple<bool, bool, bool, bool,
-                (
-                (CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
-                IEnumerable<(Guid, InvitationStatusId)>,
-                VerifyProcessData
-                )>(
-                true,
-                false,
-                true,
-                true,
-                default
-            ));
+            .Returns((true, false, true, true,
+                default(
+                    ((CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
+                     IEnumerable<(Guid, InvitationStatusId)>,
+                     VerifyProcessData))));
 
         // Act
         async Task Act() => await _sut.DeclineOsp(applicationId, data).ConfigureAwait(false);
@@ -429,17 +416,11 @@ public async Task DeclineOsp_WithInvalidApplicationState_ThrowsConflictException
         var applicationId = Guid.NewGuid();
         var data = _fixture.Create<DeclineOspData>();
         A.CallTo(() => _networkRepository.GetDeclineDataForApplicationId(applicationId, CompanyApplicationTypeId.EXTERNAL, A<IEnumerable<CompanyApplicationStatusId>>._, IdentityCompanyId))
-            .Returns(new ValueTuple<bool, bool, bool, bool,
-                (
-                (CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
-                IEnumerable<(Guid, InvitationStatusId)>,
-                VerifyProcessData
-                )>(
-                true,
-                true,
-                false,
-                true,
-                default));
+            .Returns((true, true, false, true,
+                default(
+                    ((CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
+                      IEnumerable<(Guid, InvitationStatusId)>,
+                      VerifyProcessData))));
 
         // Act
         async Task Act() => await _sut.DeclineOsp(applicationId, data).ConfigureAwait(false);
@@ -459,7 +440,7 @@ public async Task DeclineOsp_WithValid_ExecutesExpected()
         var identityId = Guid.NewGuid();
         var currentVersion = Guid.NewGuid();
         var process = _fixture.Build<Process>()
-            .With(x => x.LockExpiryDate, (DateTimeOffset?)null)
+            .With(x => x.LockExpiryDate, default(DateTimeOffset?))
             .With(x => x.Version, currentVersion).Create();
         var currentProcessStep = new ProcessStep(Guid.NewGuid(), ProcessStepTypeId.MANUAL_DECLINE_OSP, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
         var removeUsersProcessStep = new ProcessStep(Guid.NewGuid(), ProcessStepTypeId.REMOVE_KEYCLOAK_USERS, ProcessStepStatusId.TODO, process.Id, DateTimeOffset.UtcNow);
@@ -467,18 +448,10 @@ public async Task DeclineOsp_WithValid_ExecutesExpected()
         var existingProcessSteps = new[] { currentProcessStep, removeUsersProcessStep, otherProcessStep };
         var data = _fixture.Create<DeclineOspData>();
         A.CallTo(() => _networkRepository.GetDeclineDataForApplicationId(application.Id, CompanyApplicationTypeId.EXTERNAL, A<IEnumerable<CompanyApplicationStatusId>>._, IdentityCompanyId))
-            .Returns(new ValueTuple<bool, bool, bool, bool,
+            .Returns((true, true, true, true,
                 (
-                (CompanyStatusId, IEnumerable<(Guid, UserStatusId)>),
-                IEnumerable<(Guid, InvitationStatusId)>,
-                VerifyProcessData
-                )>(true,
-                true,
-                true,
-                true,
-                new ValueTuple<ValueTuple<CompanyStatusId, IEnumerable<(Guid, UserStatusId)>>, IEnumerable<(Guid, InvitationStatusId)>, VerifyProcessData>(
-                    new(company.CompanyStatusId, Enumerable.Repeat(new ValueTuple<Guid, UserStatusId>(identityId, UserStatusId.ACTIVE), 1)),
-                    Enumerable.Repeat(new ValueTuple<Guid, InvitationStatusId>(invitation.Id, invitation.InvitationStatusId), 1),
+                    (company.CompanyStatusId, Enumerable.Repeat((identityId, UserStatusId.ACTIVE), 1)),
+                    Enumerable.Repeat((invitation.Id, invitation.InvitationStatusId), 1),
                     new VerifyProcessData(process, existingProcessSteps)
                 )
             ));
@@ -493,7 +466,7 @@ public async Task DeclineOsp_WithValid_ExecutesExpected()
                 initialize?.Invoke(company);
                 modify.Invoke(company);
             });
-        A.CallTo(() => _invitationRepository.AttachAndModifyInvitations(A<IEnumerable<ValueTuple<Guid, Action<Invitation>?, Action<Invitation>>>>._))
+        A.CallTo(() => _invitationRepository.AttachAndModifyInvitations(A<IEnumerable<(Guid, Action<Invitation>?, Action<Invitation>)>>._))
             .Invokes((IEnumerable<(Guid InvitationId, Action<Invitation>? Initialize, Action<Invitation> Modify)> invitationData) =>
             {
                 var initial = invitationData.Select(x =>
@@ -504,7 +477,7 @@ public async Task DeclineOsp_WithValid_ExecutesExpected()
                 ).ToList();
                 initial.ForEach(x => x.modify(x.Invitation));
             });
-        A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<ValueTuple<Guid, Action<ProcessStep>?, Action<ProcessStep>>>>._))
+        A.CallTo(() => _processStepRepository.AttachAndModifyProcessSteps(A<IEnumerable<(Guid, Action<ProcessStep>?, Action<ProcessStep>)>>._))
             .Invokes((IEnumerable<(Guid ProcessStepId, Action<ProcessStep>? Initialize, Action<ProcessStep> Modify)> processSteps) =>
             {
                 var initial = processSteps.Select(x =>
@@ -559,19 +532,19 @@ private void SetupRepos()
             .Returns((false, ""));
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(_identity.CompanyId))
-            .Returns((IdpId, (string?)"test-alias"));
+            .Returns((IdpId, "test-alias"));
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(NoAliasIdpCompanyId))
-            .Returns((IdpId, (string?)null));
+            .Returns((IdpId, null));
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(NoIdpCompanyId))
-            .Returns(((Guid, string?))default);
+            .Returns<(Guid, string?)>(default);
 
         A.CallTo(() => _identityProviderRepository.GetSingleManagedIdentityProviderAliasDataUntracked(MultiIdpCompanyId))
             .Throws(new InvalidOperationException("Sequence contains more than one element."));
 
         A.CallTo(() => _identityProviderRepository.GetManagedIdentityProviderAliasDataUntracked(A<Guid>.That.Matches(x => x == _identity.CompanyId || x == NoIdpCompanyId), A<IEnumerable<Guid>>._))
-            .Returns(new[] { (IdpId, (string?)"test-alias") }.ToAsyncEnumerable());
+            .Returns(new (Guid, string?)[] { (IdpId, "test-alias") }.ToAsyncEnumerable());
 
         A.CallTo(() => _userProvisioningService.GetRoleDatas(A<IEnumerable<UserRoleConfig>>._))
             .Returns(new[] { new UserRoleData(UserRoleId, "cl1", "Company Admin") }.ToAsyncEnumerable());
diff --git a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
index aca2bbf783..6ebce514b4 100644
--- a/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
+++ b/tests/registration/Registration.Service.Tests/BusinessLogic/RegistrationBusinessLogicTest.cs
@@ -191,8 +191,7 @@ public async Task GetCompanyBpdmDetailDataByBusinessPartnerNumber_WithValidBpn_R
         var streetNumber = _fixture.Create<string>();
         var zipCode = _fixture.Create<string>();
 
-        var bpdmIdentifiers = uniqueIdSeed.Select(x =>
-            ((string TechnicalKey, string Value))(x.BpdmIdentifierId.ToString(), x.Value));
+        var bpdmIdentifiers = uniqueIdSeed.Select(x => (TechnicalKey: x.BpdmIdentifierId.ToString(), x.Value));
         var validIdentifiers = uniqueIdSeed.Skip(2).Take(2).Select(x => (x.BpdmIdentifierId, x.UniqueIdentifierId));
 
         var bpdmAddress = _fixture.Build<BpdmLegalEntityAddress>()
@@ -223,7 +222,7 @@ public async Task GetCompanyBpdmDetailDataByBusinessPartnerNumber_WithValidBpn_R
         A.CallTo(() => bpnAccess.FetchLegalEntityByBpn(businessPartnerNumber, token, A<CancellationToken>._))
             .Returns(legalEntity);
         A.CallTo(() => _staticDataRepository.GetCountryAssignedIdentifiers(
-                A<IEnumerable<BpdmIdentifierId>>.That.Matches<IEnumerable<BpdmIdentifierId>>(ids =>
+                A<IEnumerable<BpdmIdentifierId>>.That.Matches(ids =>
                     ids.SequenceEqual(uniqueIdSeed.Select(seed => seed.BpdmIdentifierId))), country))
             .Returns((true, validIdentifiers));
 
@@ -246,7 +245,7 @@ public async Task GetCompanyBpdmDetailDataByBusinessPartnerNumber_WithValidBpn_R
         A.CallTo(() => bpnAccess.FetchLegalEntityByBpn(businessPartnerNumber, token, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
         A.CallTo(() => _staticDataRepository.GetCountryAssignedIdentifiers(
-                A<IEnumerable<BpdmIdentifierId>>.That.Matches<IEnumerable<BpdmIdentifierId>>(ids =>
+                A<IEnumerable<BpdmIdentifierId>>.That.Matches(ids =>
                     ids.SequenceEqual(uniqueIdSeed.Select(seed => seed.BpdmIdentifierId))), country))
             .MustHaveHappenedOnceExactly();
 
@@ -387,14 +386,15 @@ public async Task GetCompanyWithAddressAsync_WithValidApplication_GetsData()
             _identityService,
             _dateTimeProvider);
 
-        A.CallTo(() =>
-                _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, _identity.CompanyId, null))
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(A<Guid>._, A<Guid>._, A<Guid?>._))
             .Returns(data);
 
         // Act
         var result = await sut.GetCompanyDetailData(applicationId).ConfigureAwait(false);
 
         // Assert
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, _identity.CompanyId, null))
+            .MustHaveHappenedOnceExactly();
         result.Should().NotBeNull();
         result.UniqueIds.Should().HaveSameCount(data.UniqueIds);
     }
@@ -404,7 +404,6 @@ public async Task GetCompanyWithAddressAsync_WithInvalidApplication_ThrowsNotFou
     {
         //Arrange
         var applicationId = _fixture.Create<Guid>();
-        var userId = _fixture.Create<string>();
         var sut = new RegistrationBusinessLogic(
             _options,
             null!,
@@ -416,9 +415,8 @@ public async Task GetCompanyWithAddressAsync_WithInvalidApplication_ThrowsNotFou
             _identityService,
             _dateTimeProvider);
 
-        A.CallTo(() =>
-                _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, _identity.CompanyId, null))
-            .Returns((CompanyApplicationDetailData?)null);
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(A<Guid>._, A<Guid>._, A<Guid?>._))
+            .Returns<CompanyApplicationDetailData?>(null);
 
         // Act
         async Task Act() => await sut.GetCompanyDetailData(applicationId).ConfigureAwait(false);
@@ -426,6 +424,8 @@ public async Task GetCompanyWithAddressAsync_WithInvalidApplication_ThrowsNotFou
         // Assert
         var ex = await Assert.ThrowsAsync<NotFoundException>(Act);
         ex.Message.Should().Be($"CompanyApplication {applicationId} not found");
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, _identity.CompanyId, null))
+            .MustHaveHappenedOnceExactly();
     }
 
     [Fact]
@@ -444,8 +444,7 @@ public async Task GetCompanyWithAddressAsync_WithInvalidUser_ThrowsForbiddenExce
             _identityService,
             _dateTimeProvider);
 
-        A.CallTo(() =>
-                _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, _identity.CompanyId, null))
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(A<Guid>._, A<Guid>._, A<Guid?>._))
             .Returns(_fixture.Build<CompanyApplicationDetailData>().With(x => x.IsUserOfCompany, false).Create());
 
         // Act
@@ -454,6 +453,8 @@ public async Task GetCompanyWithAddressAsync_WithInvalidUser_ThrowsForbiddenExce
         // Assert
         var ex = await Assert.ThrowsAsync<ForbiddenException>(Act);
         ex.Message.Should().Be($"The users company is not assigned with CompanyApplication {applicationId}");
+        A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, _identity.CompanyId, null))
+            .MustHaveHappenedOnceExactly();
     }
 
     #endregion
@@ -525,7 +526,7 @@ public async Task SetCompanyWithAddressAsync_WithInvalidApplicationId_ThrowsNotF
             null, null, null, Enumerable.Empty<CompanyUniqueIdData>());
 
         A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, A<Guid>._, companyId))
-            .ReturnsLazily(() => (CompanyApplicationDetailData?)null);
+            .Returns<CompanyApplicationDetailData?>(null);
 
         // Act
         async Task Act() => await sut.SetCompanyDetailDataAsync(applicationId, companyData).ConfigureAwait(false);
@@ -561,8 +562,7 @@ public async Task SetCompanyWithAddressAsync_WithoutCompanyUserId_ThrowsForbidde
             _dateTimeProvider);
 
         A.CallTo(() => _applicationRepository.GetCompanyApplicationDetailDataAsync(applicationId, A<Guid>._, companyId))
-            .ReturnsLazily(() =>
-                _fixture.Build<CompanyApplicationDetailData>().With(x => x.IsUserOfCompany, false).Create());
+            .Returns(_fixture.Build<CompanyApplicationDetailData>().With(x => x.IsUserOfCompany, false).Create());
 
         // Act
         async Task Act() => await sut.SetCompanyDetailDataAsync(applicationId, companyData).ConfigureAwait(false);
@@ -683,7 +683,7 @@ public async Task SetCompanyWithAddressAsync_ModifyCompany()
         A.CallTo(() => identityData.CompanyId).Returns(companyId);
         A.CallTo(() => _identityService.IdentityData).Returns(identityData);
         var companyData = _fixture.Build<CompanyDetailData>()
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .With(x => x.CompanyId, companyId)
             .With(x => x.CountryAlpha2Code, _alpha2code)
             .Create();
@@ -746,21 +746,21 @@ public async Task SetCompanyWithAddressAsync_WithoutInitialCompanyAddress_Create
 
         A.CallTo(() => _identityService.IdentityData).Returns(identityData);
         var companyData = _fixture.Build<CompanyDetailData>()
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .With(x => x.CompanyId, companyId)
             .With(x => x.CountryAlpha2Code, _alpha2code)
             .Create();
 
         var existingData = _fixture.Build<CompanyApplicationDetailData>()
             .With(x => x.CompanyId, companyId)
-            .With(x => x.AddressId, (Guid?)null)
-            .With(x => x.City, (string)null!)
-            .With(x => x.CountryAlpha2Code, (string)null!)
-            .With(x => x.Region, (string)null!)
-            .With(x => x.Streetadditional, (string)null!)
-            .With(x => x.Streetname, (string)null!)
-            .With(x => x.Streetnumber, (string)null!)
-            .With(x => x.Zipcode, (string)null!)
+            .With(x => x.AddressId, default(Guid?))
+            .With(x => x.City, default(string?))
+            .With(x => x.CountryAlpha2Code, default(string?))
+            .With(x => x.Region, default(string?))
+            .With(x => x.Streetadditional, default(string?))
+            .With(x => x.Streetname, default(string?))
+            .With(x => x.Streetnumber, default(string?))
+            .With(x => x.Zipcode, default(string?))
             .With(x => x.IsUserOfCompany, true)
             .Create();
 
@@ -843,7 +843,7 @@ public async Task SetCompanyWithAddressAsync_WithInitialCompanyAddress_ModifyAdd
         A.CallTo(() => identityData.CompanyId).Returns(companyId);
 
         var companyData = _fixture.Build<CompanyDetailData>()
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .With(x => x.CompanyId, companyId)
             .With(x => x.CountryAlpha2Code, _alpha2code)
             .Create();
@@ -943,7 +943,7 @@ public async Task SetCompanyWithAddressAsync_WithUniqueIdentifiers_CreateModifyD
             .With(x => x.UniqueIdentifierId, uniqueIdentifiers.ElementAt(2)).Create(); // shall create new
 
         var companyData = _fixture.Build<CompanyDetailData>()
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .With(x => x.CompanyId, companyId)
             .With(x => x.CountryAlpha2Code, _alpha2code)
             .With(x => x.UniqueIds, new[] { firstIdData, secondIdData, thirdIdData })
@@ -1025,7 +1025,7 @@ public async Task SetCompanyWithAddressAsync_WithInvalidCountryCode_Throws()
     {
         //Arrange
         var companyData = _fixture.Build<CompanyDetailData>()
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .With(x => x.CountryAlpha2Code, _alpha2code)
             .Create();
         var identityData = A.Fake<IIdentityData>();
@@ -1069,7 +1069,7 @@ public async Task SetCompanyWithAddressAsync_WithInvalidUniqueIdentifiers_Throws
         A.CallTo(() => _identityService.IdentityData).Returns(identityData);
 
         var companyData = _fixture.Build<CompanyDetailData>()
-            .With(x => x.BusinessPartnerNumber, (string?)null)
+            .With(x => x.BusinessPartnerNumber, default(string?))
             .With(x => x.CountryAlpha2Code, _alpha2code)
             .With(x => x.UniqueIds,
                 identifiers.Select(id =>
@@ -1155,7 +1155,7 @@ public async Task SetOwnCompanyApplicationStatusAsync_WithInvalidApplication_Thr
             _dateTimeProvider);
 
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserDataAsync(A<Guid>._, A<Guid>._))
-            .ReturnsLazily(() => new ValueTuple<bool, CompanyApplicationStatusId>());
+            .Returns<(bool, CompanyApplicationStatusId)>(default);
 
         // Act
         async Task Act() =>
@@ -1189,7 +1189,7 @@ public async Task SetOwnCompanyApplicationStatusAsync_WithInvalidStatus_ThrowsAr
             _dateTimeProvider);
         var existingStatus = CompanyApplicationStatusId.CREATED;
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserDataAsync(A<Guid>._, A<Guid>._))
-            .ReturnsLazily(() => new ValueTuple<bool, CompanyApplicationStatusId>(true, existingStatus));
+            .Returns((true, existingStatus));
         var status = CompanyApplicationStatusId.VERIFY;
 
         // Act
@@ -1244,7 +1244,7 @@ public async Task SetOwnCompanyApplicationStatusAsync_WithValidData_SavesChanges
             _dateTimeProvider);
 
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserDataAsync(A<Guid>._, A<Guid>._))
-            .ReturnsLazily(() => new ValueTuple<bool, CompanyApplicationStatusId>(true, currentStatus));
+            .Returns((true, currentStatus));
 
         // Act
         await sut.SetOwnCompanyApplicationStatusAsync(applicationId, expectedStatus).ConfigureAwait(false);
@@ -1695,7 +1695,7 @@ public async Task GetUploadedDocumentsAsync_InvalidApplication_ThrowsNotFound()
         A.CallTo(() => _identityService.IdentityData).Returns(identity);
 
         A.CallTo(() => _documentRepository.GetUploadedDocumentsAsync(applicationId, DocumentTypeId.APP_CONTRACT, identity.IdentityId))
-            .Returns(((bool, IEnumerable<UploadDocuments>))default);
+            .Returns<(bool, IEnumerable<UploadDocuments>)>(default);
 
         var sut = new RegistrationBusinessLogic(
             _options,
@@ -1758,7 +1758,7 @@ public async Task SubmitRoleConsentsAsync_WithNotExistingApplication_ThrowsNotFo
         // Arrange
         var notExistingId = _fixture.Create<Guid>();
         A.CallTo(() => _companyRolesRepository.GetCompanyRoleAgreementConsentDataAsync(notExistingId))
-            .ReturnsLazily(() => (CompanyRoleAgreementConsentData?)null);
+            .Returns<CompanyRoleAgreementConsentData?>(null);
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -1778,7 +1778,7 @@ public async Task SubmitRoleConsentsAsync_WithWrongCompanyUser_ThrowsForbiddenEx
         var applicationStatusId = _fixture.Create<CompanyApplicationStatusId>();
         var data = new CompanyRoleAgreementConsentData(Guid.NewGuid(), applicationStatusId, _fixture.CreateMany<CompanyRoleId>(2), _fixture.CreateMany<ConsentData>(5));
         A.CallTo(() => _companyRolesRepository.GetCompanyRoleAgreementConsentDataAsync(applicationId))
-            .ReturnsLazily(() => data);
+            .Returns(data);
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -1803,10 +1803,10 @@ public async Task SubmitRoleConsentsAsync_WithInvalidRoles_ThrowsControllerArgum
         };
         var companyRoleAssignedAgreements = new List<(CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)>
         {
-            new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(CompanyRoleId.APP_PROVIDER, _fixture.CreateMany<AgreementStatusData>(5)),
+            (CompanyRoleId.APP_PROVIDER, _fixture.CreateMany<AgreementStatusData>(5)),
         };
         A.CallTo(() => _companyRolesRepository.GetCompanyRoleAgreementConsentDataAsync(applicationId))
-            .ReturnsLazily(() => data);
+            .Returns(data);
         A.CallTo(() => _companyRolesRepository.GetAgreementAssignedCompanyRolesUntrackedAsync(roleIds))
             .Returns(companyRoleAssignedAgreements.ToAsyncEnumerable());
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
@@ -1830,22 +1830,20 @@ public async Task SubmitRoleConsentsAsync_WithoutAllRolesConsentGiven_ThrowsCont
             {
                 CompanyRoleId.APP_PROVIDER,
             },
-            new[]
+            new AgreementConsentStatus[]
             {
-                new AgreementConsentStatus(agreementIds1, ConsentStatusId.ACTIVE),
-                new AgreementConsentStatus(agreementIds2, ConsentStatusId.INACTIVE)
+                new(agreementIds1, ConsentStatusId.ACTIVE),
+                new(agreementIds2, ConsentStatusId.INACTIVE)
             });
         var applicationId = _fixture.Create<Guid>();
         var applicationStatusId = _fixture.Create<CompanyApplicationStatusId>();
         var data = new CompanyRoleAgreementConsentData(_identity.CompanyId, applicationStatusId, new[] { CompanyRoleId.APP_PROVIDER }, new List<ConsentData>());
-        var companyRoleAssignedAgreements = new List<(CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)>
+        var companyRoleAssignedAgreements = new (CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)[]
         {
-            new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(CompanyRoleId.APP_PROVIDER,
-                new[]{new AgreementStatusData(agreementIds1, AgreementStatusId.ACTIVE),
-                new AgreementStatusData(agreementIds2, AgreementStatusId.ACTIVE)})
+            (CompanyRoleId.APP_PROVIDER, new AgreementStatusData[]{ new(agreementIds1, AgreementStatusId.ACTIVE), new(agreementIds2, AgreementStatusId.ACTIVE) })
         };
         A.CallTo(() => _companyRolesRepository.GetCompanyRoleAgreementConsentDataAsync(applicationId))
-            .ReturnsLazily(() => data);
+            .Returns(data);
         A.CallTo(() => _companyRolesRepository.GetAgreementAssignedCompanyRolesUntrackedAsync(A<IEnumerable<CompanyRoleId>>._))
             .Returns(companyRoleAssignedAgreements.ToAsyncEnumerable());
 
@@ -1900,14 +1898,14 @@ public async Task SubmitRoleConsentsAsync_WithValidData_CallsExpected()
             new[] {
                 new ConsentData(consentId, ConsentStatusId.INACTIVE, agreementId_1)
             });
-        var companyRoleAssignedAgreements = new List<(CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)>
+        var companyRoleAssignedAgreements = new (CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)[]
         {
-            new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(CompanyRoleId.APP_PROVIDER,
-                new [] { new AgreementStatusData(agreementId_1, AgreementStatusId.ACTIVE), new AgreementStatusData(agreementId_2, AgreementStatusId.ACTIVE) }),
-            new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(CompanyRoleId.ACTIVE_PARTICIPANT,
-                new [] { new AgreementStatusData(agreementId_1, AgreementStatusId.INACTIVE) }),
-            new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(CompanyRoleId.SERVICE_PROVIDER,
-                new [] { new AgreementStatusData(agreementId_1, AgreementStatusId.INACTIVE), new AgreementStatusData(agreementId_3, AgreementStatusId.INACTIVE) }),
+            (CompanyRoleId.APP_PROVIDER,
+                new AgreementStatusData[] { new(agreementId_1, AgreementStatusId.ACTIVE), new(agreementId_2, AgreementStatusId.ACTIVE) }),
+            (CompanyRoleId.ACTIVE_PARTICIPANT,
+                new AgreementStatusData[] { new(agreementId_1, AgreementStatusId.INACTIVE) }),
+            (CompanyRoleId.SERVICE_PROVIDER,
+                new AgreementStatusData[] { new(agreementId_1, AgreementStatusId.INACTIVE), new(agreementId_3, AgreementStatusId.INACTIVE) }),
         };
         A.CallTo(() => _dateTimeProvider.OffsetNow).Returns(now);
         A.CallTo(() => _companyRolesRepository.GetCompanyRoleAgreementConsentDataAsync(applicationId))
@@ -1976,14 +1974,15 @@ public async Task SubmitRoleConsentsAsync_WithextraAgreement_ThrowsControllerArg
         var applicationStatusId = _fixture.Create<CompanyApplicationStatusId>();
 
         var data = new CompanyRoleAgreementConsentData(_identity.CompanyId, applicationStatusId, new[] { CompanyRoleId.APP_PROVIDER }, new List<ConsentData>());
-        var companyRoleAssignedAgreements = new List<(CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)>
+        var companyRoleAssignedAgreements = new (CompanyRoleId CompanyRoleId, IEnumerable<AgreementStatusData> AgreementIds)[]
         {
-            new ValueTuple<CompanyRoleId, IEnumerable<AgreementStatusData>>(CompanyRoleId.APP_PROVIDER,
-                new[]{new AgreementStatusData(agreementIds1, AgreementStatusId.ACTIVE),
-                new AgreementStatusData(agreementIds2, AgreementStatusId.ACTIVE)})
+            (CompanyRoleId.APP_PROVIDER,
+                new AgreementStatusData[]{
+                    new(agreementIds1, AgreementStatusId.ACTIVE),
+                    new(agreementIds2, AgreementStatusId.ACTIVE)})
         };
         A.CallTo(() => _companyRolesRepository.GetCompanyRoleAgreementConsentDataAsync(applicationId))
-            .ReturnsLazily(() => data);
+            .Returns(data);
         A.CallTo(() => _companyRolesRepository.GetAgreementAssignedCompanyRolesUntrackedAsync(A<IEnumerable<CompanyRoleId>>._))
             .Returns(companyRoleAssignedAgreements.ToAsyncEnumerable());
 
@@ -2014,7 +2013,7 @@ public async Task SubmitRegistrationAsync_WithNotExistingApplication_ThrowsNotFo
             }
         };
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(A<Guid>._, A<Guid>._, A<IEnumerable<DocumentTypeId>>._))
-            .Returns((CompanyApplicationUserEmailData?)null);
+            .Returns<CompanyApplicationUserEmailData?>(null);
         var sut = new RegistrationBusinessLogic(Options.Create(settings), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2042,9 +2041,9 @@ public async Task SubmitRegistrationAsync_WithDocumentId_Success()
         var stepTypeIds = _fixture.CreateMany<ProcessStepTypeId>(3).ToImmutableArray();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIds);
         A.CallTo(() => _dateTimeProvider.OffsetNow).Returns(now);
@@ -2184,9 +2183,9 @@ public async Task SubmitRegistrationAsync_InvalidStatus_ThrowsForbiddenException
             new(Guid.NewGuid(),DocumentStatusId.PENDING),
             new(Guid.NewGuid(),DocumentStatusId.INACTIVE)
         };
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var settings = new RegistrationSettings
         {
@@ -2230,9 +2229,9 @@ public async Task SubmitRegistrationAsync_AlreadyClosed_ThrowsForbiddenException
             new(Guid.NewGuid(),DocumentStatusId.PENDING),
             new(Guid.NewGuid(),DocumentStatusId.INACTIVE)
         };
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIds);
         var settings = new RegistrationSettings
@@ -2269,9 +2268,9 @@ public async Task SubmitRegistrationAsync_WithNotExistingCompanyUser_ThrowsForbi
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIds);
         var settings = new RegistrationSettings
@@ -2308,9 +2307,9 @@ public async Task SubmitRegistrationAsync_WithNotExistingStreetName_ThrowsConfli
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), string.Empty, "Munich", "Germany", uniqueIds, companyRoleIds);
         var settings = new RegistrationSettings
@@ -2345,13 +2344,13 @@ public async Task SubmitRegistrationAsync_WithNotExistingAddressId_ThrowsConflic
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData("Test Company", null, "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIds);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
+            .Returns(new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2376,9 +2375,9 @@ public async Task SubmitRegistrationAsync_WithNotExistingCompanyName_ThrowsConfl
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData(string.Empty, Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIds);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
@@ -2406,14 +2405,14 @@ public async Task SubmitRegistrationAsync_WithNotExistingUniqueId_ThrowsConflict
         A.CallTo(() => _identityService.IdentityData).Returns(identityData);
         var applicationId = _fixture.Create<Guid>();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
-         {
-             new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
-         };
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
+        {
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
+        };
         var uniqueIdentifierData = Enumerable.Empty<UniqueIdentifierId>();
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIdentifierData, companyRoleIds);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
+            .Returns(new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2437,14 +2436,14 @@ public async Task SubmitRegistrationAsync_WithNotExistingCompanyRoleId_ThrowsCon
         A.CallTo(() => _identityService.IdentityData).Returns(identityData);
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
-         {
-             new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
-         };
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
+        {
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
+        };
         var companyRoleIdData = Enumerable.Empty<CompanyRoleId>();
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIdData);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
+            .Returns(new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2472,7 +2471,7 @@ public async Task SubmitRegistrationAsync_WithNotExistingAgreementandConsent_Thr
         var agreementConsents = Enumerable.Empty<(Guid, ConsentStatusId)>();
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", "Germany", uniqueIds, companyRoleIds);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
+            .Returns(new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2497,13 +2496,13 @@ public async Task SubmitRegistrationAsync_WithNotExistingCity_ThrowsConflictExce
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", string.Empty, "Germany", uniqueIds, companyRoleIds);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
+            .Returns(new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2528,14 +2527,14 @@ public async Task SubmitRegistrationAsync_WithNotExistingCountry_ThrowsConflictE
         var applicationId = _fixture.Create<Guid>();
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
-         {
-             new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
-         };
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
+        {
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
+        };
 
         var companyData = new CompanyData("Test Company", Guid.NewGuid(), "Strabe Street", "Munich", string.Empty, uniqueIds, companyRoleIds);
         A.CallTo(() => _applicationRepository.GetOwnCompanyApplicationUserEmailDataAsync(applicationId, userId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
+            .Returns(new CompanyApplicationUserEmailData(CompanyApplicationStatusId.VERIFY, true, _fixture.Create<string>(), Enumerable.Empty<DocumentStatusData>(), companyData, agreementConsents));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), _mailingService, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2555,9 +2554,9 @@ public async Task SubmitRegistrationAsync_WithUserEmail_SendsMail()
         var now = DateTimeOffset.Now;
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         IEnumerable<DocumentStatusData> documents = new DocumentStatusData[]{
             new(
@@ -2605,9 +2604,9 @@ public async Task SubmitRegistrationAsync_WithoutUserEmail_DoesntSendMail()
         var now = DateTimeOffset.Now;
         var uniqueIds = _fixture.CreateMany<UniqueIdentifierId>(3).ToImmutableArray();
         var companyRoleIds = _fixture.CreateMany<CompanyRoleId>(3).ToImmutableArray();
-        var agreementConsents = new List<(Guid AgreementId, ConsentStatusId ConsentStatusId)>
+        var agreementConsents = new (Guid AgreementId, ConsentStatusId ConsentStatusId)[]
         {
-            new ValueTuple<Guid, ConsentStatusId>(Guid.NewGuid(), ConsentStatusId.ACTIVE),
+            (Guid.NewGuid(), ConsentStatusId.ACTIVE),
         };
         IEnumerable<DocumentStatusData> documents = new DocumentStatusData[]{
             new(
@@ -2689,7 +2688,7 @@ public async Task GetCompanyIdentifiers_InvalidCountry_Throws()
     {
         // Arrange
         A.CallTo(() => _staticDataRepository.GetCompanyIdentifiers(A<string>._))
-            .Returns(((IEnumerable<UniqueIdentifierId> IdentifierIds, bool IsValidCountry))default);
+            .Returns<(IEnumerable<UniqueIdentifierId>, bool)>(default);
 
         var sut = new RegistrationBusinessLogic(
             _options,
@@ -2826,7 +2825,7 @@ public async Task GetRegistrationDocumentAsync_ReturnsExpectedResult()
         var documentId = Guid.NewGuid();
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentAsync(documentId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, bool, MediaTypeId>(content, "test.json", true, MediaTypeId.JSON));
+            .Returns((content, "test.json", true, MediaTypeId.JSON));
         var sut = new RegistrationBusinessLogic(_options, null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         //Act
@@ -2845,7 +2844,7 @@ public async Task GetRegistrationDocumentAsync_WithInvalidDocumentTypeId_ThrowsN
         var documentId = Guid.NewGuid();
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentAsync(documentId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, bool, MediaTypeId>(content, "test.json", false, MediaTypeId.JSON));
+            .Returns((content, "test.json", false, MediaTypeId.JSON));
         var sut = new RegistrationBusinessLogic(_options, null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         //Act
@@ -2861,9 +2860,8 @@ public async Task GetRegistrationDocumentAsync_WithInvalidDocumentId_ThrowsNotFo
     {
         // Arrange
         var documentId = Guid.NewGuid();
-        var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentAsync(documentId, A<IEnumerable<DocumentTypeId>>._))
-            .ReturnsLazily(() => new ValueTuple<byte[], string, bool, MediaTypeId>());
+            .Returns<(byte[], string, bool, MediaTypeId)>(default);
         var sut = new RegistrationBusinessLogic(_options, null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         //Act
@@ -2883,9 +2881,9 @@ public async Task GetDocumentAsync_WithValidData_ReturnsExpected()
         var documentId = Guid.NewGuid();
         var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentIdWithCompanyUserCheckAsync(documentId, _identity.IdentityId))
-            .ReturnsLazily(() => new ValueTuple<Guid, bool>(documentId, true));
+            .Returns((documentId, true));
         A.CallTo(() => _documentRepository.GetDocumentByIdAsync(documentId))
-            .ReturnsLazily(() => new Document(documentId, content, content, "test.pdf", MediaTypeId.PDF, DateTimeOffset.UtcNow, DocumentStatusId.LOCKED, DocumentTypeId.APP_CONTRACT));
+            .Returns(new Document(documentId, content, content, "test.pdf", MediaTypeId.PDF, DateTimeOffset.UtcNow, DocumentStatusId.LOCKED, DocumentTypeId.APP_CONTRACT));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2902,9 +2900,8 @@ public async Task GetDocumentAsync_WithoutDocument_ThrowsNotFoundException()
     {
         // Arrange
         var documentId = Guid.NewGuid();
-        var content = new byte[7];
         A.CallTo(() => _documentRepository.GetDocumentIdWithCompanyUserCheckAsync(documentId, _identity.IdentityId))
-            .ReturnsLazily(() => new ValueTuple<Guid, bool>(Guid.Empty, false));
+            .Returns((Guid.Empty, false));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2921,7 +2918,7 @@ public async Task GetDocumentAsync_WithWrongUser_ThrowsForbiddenException()
         // Arrange
         var documentId = Guid.NewGuid();
         A.CallTo(() => _documentRepository.GetDocumentIdWithCompanyUserCheckAsync(documentId, _identity.IdentityId))
-            .ReturnsLazily(() => new ValueTuple<Guid, bool>(documentId, false));
+            .Returns((documentId, false));
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
@@ -2947,6 +2944,7 @@ public async Task SetInvitationStatusAsync_ReturnsExpected()
         var application = _fixture.Build<CompanyApplication>()
             .With(x => x.Id, _existingApplicationId)
             .Create();
+        var retval = _fixture.Create<int>();
 
         A.CallTo(() => _dateTimeProvider.OffsetNow).Returns(now);
         A.CallTo(() => _invitationRepository.GetInvitationStatusAsync(_identity.IdentityId))
@@ -2956,12 +2954,14 @@ public async Task SetInvitationStatusAsync_ReturnsExpected()
             {
                 setOptionalFields.Invoke(application);
             });
+        A.CallTo(() => _portalRepositories.SaveAsync()).Returns(retval);
         var sut = new RegistrationBusinessLogic(_options, null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         // Act
         var result = await sut.SetInvitationStatusAsync().ConfigureAwait(false);
 
         // Assert
+        result.Should().Be(retval);
         A.CallTo(() => _invitationRepository.GetInvitationStatusAsync(_identity.IdentityId)).MustHaveHappenedOnceExactly();
         A.CallTo(() => _applicationRepository.AttachAndModifyCompanyApplication(A<Guid>._, A<Action<CompanyApplication>>._)).MustHaveHappenedOnceExactly();
         invitation.InvitationStatusId.Should().Be(InvitationStatusId.ACCEPTED);
@@ -2973,11 +2973,11 @@ public async Task SetInvitationStatusAsync_Throws_ForbiddenException()
     {
         // Arrange
         A.CallTo(() => _invitationRepository.GetInvitationStatusAsync(A<Guid>._))
-            .Returns((Invitation)null!);
+            .Returns<Invitation?>(null);
         var sut = new RegistrationBusinessLogic(_options, null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
         //Act
-        var Act = async () => await sut.SetInvitationStatusAsync().ConfigureAwait(false);
+        var Act = sut.SetInvitationStatusAsync;
 
         // Assert
         var result = await Assert.ThrowsAsync<ForbiddenException>(Act).ConfigureAwait(false);
@@ -3082,7 +3082,7 @@ public async Task DeleteRegistrationDocumentAsync_Throws_NotFoundException()
     {
         // Arrange;
         A.CallTo(() => _documentRepository.GetDocumentDetailsForApplicationUntrackedAsync(A<Guid>._, _identity.CompanyId, A<IEnumerable<CompanyApplicationStatusId>>._))
-            .Returns(new ValueTuple<Guid, DocumentStatusId, bool, DocumentTypeId, bool, IEnumerable<Guid>>());
+            .Returns<(Guid, DocumentStatusId, bool, DocumentTypeId, bool, IEnumerable<Guid>)>(default);
 
         var sut = new RegistrationBusinessLogic(Options.Create(new RegistrationSettings()), null!, null!, null!, null!, _portalRepositories, null!, _identityService, _dateTimeProvider);
 
@@ -3207,7 +3207,6 @@ public async Task DeleteRegistrationDocumentAsync_Throws_ControllerArgumentExcep
 
     private void SetupRepositories()
     {
-        var invitedUserRole = _fixture.CreateMany<string>(2).AsEnumerable();
         var invitedUser = _fixture.CreateMany<(InvitationStatusId InvitationStatus, string? EmailId, IEnumerable<string> Roles)>(1).ToAsyncEnumerable();
 
         A.CallTo(() => _invitationRepository.GetInvitedUserDetailsUntrackedAsync(_existingApplicationId))
@@ -3283,7 +3282,7 @@ private void SetupFakesForInvitation()
         A.CallTo(() => _processLine(A<UserCreationRoleDataIdpInfo>._)).ReturnsLazily(
             (UserCreationRoleDataIdpInfo creationInfo) => _fixture.Build<(Guid CompanyUserId, string UserName, string? Password, Exception? Error)>()
                 .With(x => x.UserName, creationInfo.UserName)
-                .With(x => x.Error, (Exception?)null)
+                .With(x => x.Error, default(Exception?))
                 .Create());
     }
 
@@ -3296,8 +3295,8 @@ public async Task Foo()
     {
         // Arrange
         var applicationId = Guid.NewGuid();
-        var data = ("Acme Corp", (string?)"Tony", (string?)"Stark", (string?)"t.stark@acme.corp", new[] {
-            (applicationId, CompanyApplicationStatusId.CREATED, new (string?, string?, string?)[] {
+        var data = ("Acme Corp", "Tony", "Stark", "t.stark@acme.corp", new (Guid, CompanyApplicationStatusId, IEnumerable<(string?, string?, string?)>)[] {
+            (applicationId, CompanyApplicationStatusId.CREATED, new(string?, string?, string?)[] {
                 ("Test", "User", "t.user@acme.corp"),
                 (null, null, "foo@bar.org")
             }.AsEnumerable())
diff --git a/tests/registration/Registration.Service.Tests/Controller/RegistrationControllerTest.cs b/tests/registration/Registration.Service.Tests/Controller/RegistrationControllerTest.cs
index 3985c90f5d..d7ddb99757 100644
--- a/tests/registration/Registration.Service.Tests/Controller/RegistrationControllerTest.cs
+++ b/tests/registration/Registration.Service.Tests/Controller/RegistrationControllerTest.cs
@@ -59,38 +59,16 @@ public async Task Get_WhenThereAreInvitedUsers_ShouldReturnActionResultOfInvited
     {
         //Arrange
         var id = new Guid("7eab8e16-8298-4b41-953b-515745423658");
-        var invitedUserMapper = _fixture.CreateMany<InvitedUser>(3).ToAsyncEnumerable();
+        var invitedUserMapper = _fixture.CreateMany<InvitedUser>(3);
         A.CallTo(() => _registrationBusinessLogicFake.GetInvitedUsersAsync(id))
-            .Returns(invitedUserMapper);
+            .Returns(invitedUserMapper.ToAsyncEnumerable());
 
         //Act
-        var result = this._controller.GetInvitedUsersAsync(id);
-        await foreach (var item in result)
-        {
-            //Assert
-            A.CallTo(() => _registrationBusinessLogicFake.GetInvitedUsersAsync(id)).MustHaveHappenedOnceExactly();
-            Assert.NotNull(item);
-            Assert.IsType<InvitedUser>(item);
-        }
-    }
-
-    [Fact]
-    public async Task GetInvitedUsersDetail_WhenIdisNull_ShouldThrowException()
-    {
-        //Arrange
-        var id = new Guid("7eab8e16-8298-4b41-953b-515745423658");
-        var invitedUserMapper = _fixture.CreateMany<InvitedUser>(3).ToAsyncEnumerable();
-        A.CallTo(() => _registrationBusinessLogicFake.GetInvitedUsersAsync(id))
-            .Returns(invitedUserMapper);
-
-        //Act
-        var result = this._controller.GetInvitedUsersAsync(Guid.Empty);
+        var result = await _controller.GetInvitedUsersAsync(id).ToListAsync().ConfigureAwait(false);
 
         //Assert
-        await foreach (var item in result)
-        {
-            A.CallTo(() => _registrationBusinessLogicFake.GetInvitedUsersAsync(Guid.Empty)).Throws(new Exception());
-        }
+        A.CallTo(() => _registrationBusinessLogicFake.GetInvitedUsersAsync(id)).MustHaveHappenedOnceExactly();
+        result.Should().HaveSameCount(invitedUserMapper).And.ContainInOrder(invitedUserMapper);
     }
 
     [Fact]
@@ -109,8 +87,7 @@ public async Task GetUploadedDocumentsAsync_ReturnsExpectedResult()
         //Assert
         A.CallTo(() => _registrationBusinessLogicFake.GetUploadedDocumentsAsync(applicationId, DocumentTypeId.APP_CONTRACT)).MustHaveHappenedOnceExactly();
 
-        result.Should().HaveSameCount(uploadDocuments);
-        result.Should().ContainInOrder(uploadDocuments);
+        result.Should().HaveSameCount(uploadDocuments).And.ContainInOrder(uploadDocuments);
     }
 
     [Fact]
@@ -123,7 +100,7 @@ public async Task SubmitCompanyRoleConsentToAgreementsAsync_WithValidData_Return
             .Returns(1);
 
         //Act
-        var result = await this._controller.SubmitCompanyRoleConsentToAgreementsAsync(applicationId, data).ConfigureAwait(false);
+        var result = await _controller.SubmitCompanyRoleConsentToAgreementsAsync(applicationId, data).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _registrationBusinessLogicFake.SubmitRoleConsentAsync(applicationId, data)).MustHaveHappenedOnceExactly();
@@ -134,21 +111,16 @@ public async Task SubmitCompanyRoleConsentToAgreementsAsync_WithValidData_Return
     public async Task GetCompanyIdentifiers_WithValidData_ReturnsExpected()
     {
         // Arrange
-        var applicationId = _fixture.Create<Guid>();
         var data = _fixture.CreateMany<UniqueIdentifierData>(1);
         A.CallTo(() => _registrationBusinessLogicFake.GetCompanyIdentifiers("DE"))
             .Returns(data);
 
         //Act
-        var result = await this._controller.GetCompanyIdentifiers("DE").ConfigureAwait(false);
+        var result = await _controller.GetCompanyIdentifiers("DE").ConfigureAwait(false);
 
         // Assert
-        foreach (var item in result)
-        {
-            A.CallTo(() => _registrationBusinessLogicFake.GetCompanyIdentifiers("DE")).MustHaveHappenedOnceExactly();
-            Assert.NotNull(item);
-            Assert.IsType<UniqueIdentifierData?>(item);
-        }
+        A.CallTo(() => _registrationBusinessLogicFake.GetCompanyIdentifiers("DE")).MustHaveHappenedOnceExactly();
+        result.Should().HaveSameCount(data).And.ContainInOrder(data);
     }
 
     [Fact]
@@ -163,7 +135,7 @@ public async Task GetDocumentContentFileAsync_WithValidData_ReturnsOk()
             .Returns((fileName, content, contentType));
 
         //Act
-        var result = await this._controller.GetDocumentContentFileAsync(id).ConfigureAwait(false);
+        var result = await _controller.GetDocumentContentFileAsync(id).ConfigureAwait(false);
 
         //Assert
         A.CallTo(() => _registrationBusinessLogicFake.GetDocumentContentAsync(id)).MustHaveHappenedOnceExactly();
@@ -181,7 +153,7 @@ public async Task GetRegistrationDocumentAsync_WithValidData_ReturnsExpected()
             .Returns(new ValueTuple<string, byte[], string>("test.json", content, "application/json"));
 
         //Act
-        var result = await this._controller.GetRegistrationDocumentAsync(documentId).ConfigureAwait(false);
+        var result = await _controller.GetRegistrationDocumentAsync(documentId).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _registrationBusinessLogicFake.GetRegistrationDocumentAsync(documentId)).MustHaveHappenedOnceExactly();
@@ -199,7 +171,7 @@ public async Task InviteNewUserAsync_WithValidData_ReturnsExpected()
             .Returns(1);
 
         //Act
-        var result = await this._controller.InviteNewUserAsync(applicationId, creationInfo).ConfigureAwait(false);
+        var result = await _controller.InviteNewUserAsync(applicationId, creationInfo).ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _registrationBusinessLogicFake.InviteNewUserAsync(applicationId, creationInfo)).MustHaveHappenedOnceExactly();
@@ -215,7 +187,7 @@ public async Task GetApplicationsWithStatusAsync_WithValidData_ReturnsExpected()
             .Returns(companyApplicationWithStatus.ToAsyncEnumerable());
 
         //Act
-        var result = await this._controller.GetApplicationsWithStatusAsync().ToListAsync().ConfigureAwait(false);
+        var result = await _controller.GetApplicationsWithStatusAsync().ToListAsync().ConfigureAwait(false);
 
         // Assert
         A.CallTo(() => _registrationBusinessLogicFake.GetAllApplicationsForUserWithStatus()).MustHaveHappenedOnceExactly();
diff --git a/tests/shared/Tests.Shared/FormFileHelper.cs b/tests/shared/Tests.Shared/FormFileHelper.cs
index 5dcb24f44b..23361cc24b 100644
--- a/tests/shared/Tests.Shared/FormFileHelper.cs
+++ b/tests/shared/Tests.Shared/FormFileHelper.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
diff --git a/tests/shared/Tests.Shared/IntegrationTests/EndpointSetup/InformationEndpoints.cs b/tests/shared/Tests.Shared/IntegrationTests/EndpointSetup/InformationEndpoints.cs
index c4f51bd60d..102aca3c9c 100644
--- a/tests/shared/Tests.Shared/IntegrationTests/EndpointSetup/InformationEndpoints.cs
+++ b/tests/shared/Tests.Shared/IntegrationTests/EndpointSetup/InformationEndpoints.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2021, 2023 BMW Group AG
  * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -30,12 +29,12 @@ public class InformationEndpoints
 
     public InformationEndpoints(HttpClient client)
     {
-        this._client = client;
+        _client = client;
     }
 
     public async Task<HttpResponseMessage> Get()
     {
-        var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}info");
-        return await this._client.SendAsync(request);
+        using var request = new HttpRequestMessage(HttpMethod.Get, $"{Path}info");
+        return await _client.SendAsync(request);
     }
 }
diff --git a/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs b/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs
index 20d099acc1..c92d421efa 100644
--- a/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs
+++ b/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs
@@ -70,8 +70,8 @@ public MandatoryIdentityClaimHandlerTests()
         A.CallTo(() => _portalRepositories.GetInstance<IIdentityRepository>()).Returns(_identityRepository);
         A.CallTo(() => _portalRepositories.GetInstance<IServiceAccountRepository>()).Returns(_serviceAccountRepository);
 
-        A.CallTo(() => _serviceAccountRepository.GetServiceAccountDataByClientId(A<string>._)).Returns(default((Guid, Guid)));
-        A.CallTo(() => _identityRepository.GetActiveIdentityDataByUserEntityId(A<string>._)).Returns(default((Guid, IdentityTypeId, Guid)));
+        A.CallTo(() => _serviceAccountRepository.GetServiceAccountDataByClientId(A<string>._)).Returns<(Guid, Guid)>(default);
+        A.CallTo(() => _identityRepository.GetActiveIdentityDataByUserEntityId(A<string>._)).Returns<(Guid, IdentityTypeId, Guid)>(default);
         A.CallTo(() => _identityRepository.GetActiveCompanyIdByIdentityId(A<Guid>._)).Returns(Guid.Empty);
 
         A.CallTo(() => _serviceAccountRepository.GetServiceAccountDataByClientId(_clientId)).Returns((_serviceAccountId, _serviceAccountCompanyId));