diff --git a/src/Turnierplan.App.Test.Functional/Routes.cs b/src/Turnierplan.App.Test.Functional/Routes.cs
new file mode 100644
index 00000000..9de37e9e
--- /dev/null
+++ b/src/Turnierplan.App.Test.Functional/Routes.cs
@@ -0,0 +1,21 @@
+using Turnierplan.Core.PublicId;
+
+namespace Turnierplan.App.Test.Functional;
+
+internal static class Routes
+{
+    public static class ApiKeys
+    {
+        public static string Delete(PublicId id) => $"/api/api-keys/{id}";
+    }
+
+    public static class Identity
+    {
+        public static string Login() => "/api/identity/login";
+    }
+
+    public static class Users
+    {
+        public static string Delete(Guid id) => $"/api/users/{id}";
+    }
+}
diff --git a/src/Turnierplan.App.Test.Functional/Scenarios.cs b/src/Turnierplan.App.Test.Functional/Scenarios.cs
new file mode 100644
index 00000000..a8c1ea09
--- /dev/null
+++ b/src/Turnierplan.App.Test.Functional/Scenarios.cs
@@ -0,0 +1,58 @@
+using FluentAssertions;
+using FluentAssertions.Extensions;
+using Turnierplan.Core.ApiKey;
+using Turnierplan.Core.Extensions;
+using Turnierplan.Core.Organization;
+using Turnierplan.Core.RoleAssignment;
+using Turnierplan.Core.Tournament;
+using Turnierplan.Core.User;
+using Xunit;
+
+namespace Turnierplan.App.Test.Functional;
+
+public sealed class Scenarios
+{
+    private readonly TestServer _testServer = new();
+
+    [Fact]
+    public async Task When_ApiKey_And_User_Are_Deleted_The_Role_Assignments_Are_Also_Removed()
+    {
+        var (apiKeyId, userId) = _testServer.ExecuteContextAction(db =>
+        {
+            var user = new User(string.Empty);
+            db.Users.Add(user);
+
+            var org = new Organization(string.Empty);
+            db.Organizations.Add(org);
+
+            var key = new ApiKey(org, string.Empty, null, DateTime.UtcNow + 1.Days());
+            db.ApiKeys.Add(key);
+
+            var tournament = new Tournament(org, string.Empty, Visibility.Public);
+            db.Tournaments.Add(tournament);
+
+            org.AddRoleAssignment(Role.Reader, user.AsPrincipal());
+            tournament.AddRoleAssignment(Role.Contributor, user.AsPrincipal());
+            tournament.AddRoleAssignment(Role.Reader, key.AsPrincipal());
+
+            db.SaveChanges();
+
+            return (key.PublicId, user.Id);
+        });
+
+        _testServer.ExecuteContextAction(db => db.OrganizationRoleAssignments.Count()).Should().Be(1);
+        _testServer.ExecuteContextAction(db => db.TournamentRoleAssignments.Count()).Should().Be(2);
+
+        var resp = await _testServer.Client.DeleteAsync(Routes.ApiKeys.Delete(apiKeyId), TestContext.Current.CancellationToken);
+        resp.EnsureSuccessStatusCode();
+
+        _testServer.ExecuteContextAction(db => db.OrganizationRoleAssignments.Count()).Should().Be(1);
+        _testServer.ExecuteContextAction(db => db.TournamentRoleAssignments.Count()).Should().Be(1);
+
+        resp = await _testServer.Client.DeleteAsync(Routes.Users.Delete(userId), TestContext.Current.CancellationToken);
+        resp.EnsureSuccessStatusCode();
+
+        _testServer.ExecuteContextAction(db => db.OrganizationRoleAssignments.Count()).Should().Be(0);
+        _testServer.ExecuteContextAction(db => db.TournamentRoleAssignments.Count()).Should().Be(0);
+    }
+}
diff --git a/src/Turnierplan.App.Test.Functional/TestServer.cs b/src/Turnierplan.App.Test.Functional/TestServer.cs
new file mode 100644
index 00000000..92cb0ca0
--- /dev/null
+++ b/src/Turnierplan.App.Test.Functional/TestServer.cs
@@ -0,0 +1,72 @@
+using System.Net.Http.Json;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Turnierplan.Core.User;
+using Turnierplan.Dal;
+
+namespace Turnierplan.App.Test.Functional;
+
+internal sealed class TestServer
+{
+    private readonly WebApplicationFactory<Program> _application;
+
+    public TestServer()
+    {
+        _application = new WebApplicationFactory<Program>().WithWebHostBuilder(builder =>
+        {
+            builder.ConfigureAppConfiguration(config =>
+            {
+                config.AddInMemoryCollection([
+                    new KeyValuePair<string, string?>("Database:InMemory", "true"),
+                    new KeyValuePair<string, string?>("Identity:UseInsecureCookies", "true")
+                ]);
+            });
+        });
+
+        const string username = "functional_test";
+        const string password = "P@ssw0rd";
+
+        using (var scope = _application.Services.CreateScope())
+        {
+            var ctx = scope.ServiceProvider.GetRequiredService<TurnierplanContext>();
+
+            var user = new User(username)
+            {
+                IsAdministrator = true
+            };
+
+            user.UpdatePassword(scope.ServiceProvider.GetRequiredService<IPasswordHasher<User>>().HashPassword(user, password));
+
+            ctx.Users.Add(user);
+            ctx.SaveChanges();
+        }
+
+        var loginRequest = new HttpRequestMessage(HttpMethod.Post, Routes.Identity.Login())
+        {
+            Content = JsonContent.Create(new { UserName = username, Password = password})
+        };
+
+        Client = _application.CreateClient(new WebApplicationFactoryClientOptions { HandleCookies = true });
+        var loginResponseTask = Client.SendAsync(loginRequest);
+        loginResponseTask.Wait();
+        var loginResponse = loginResponseTask.Result;
+        loginResponse.EnsureSuccessStatusCode();
+    }
+
+    public HttpClient Client { get; }
+
+    public void ExecuteContextAction(Action<TurnierplanContext> action)
+    {
+        using var scope = _application.Services.CreateScope();
+        action(scope.ServiceProvider.GetRequiredService<TurnierplanContext>());
+    }
+
+    public T ExecuteContextAction<T>(Func<TurnierplanContext, T> action)
+    {
+        using var scope = _application.Services.CreateScope();
+        return action(scope.ServiceProvider.GetRequiredService<TurnierplanContext>());
+    }
+}
diff --git a/src/Turnierplan.App.Test.Functional/Turnierplan.App.Test.Functional.csproj b/src/Turnierplan.App.Test.Functional/Turnierplan.App.Test.Functional.csproj
new file mode 100644
index 00000000..fe0ea8e1
--- /dev/null
+++ b/src/Turnierplan.App.Test.Functional/Turnierplan.App.Test.Functional.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../version.xml" />
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <Import Project="../Turnierplan.Test.Common.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Turnierplan.App\Turnierplan.App.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts b/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts
index b4fbdd34..06af01e2 100644
--- a/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts
+++ b/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts
@@ -26,15 +26,32 @@ export const turnierplan = {
     navigationTab: (id: number) => `page-frame-navigation-tab-${id}`,
     title: 'page-frame-title'
   },
+  rbacWidget: {
+    openOffcanvasButton: 'rbac-widget-open-offcanvas-button'
+  },
+  rbacOffcanvas: {
+    doneButton: 'rbac-offcanvas-done-button',
+    assignmentsCount: 'rbac-offcanvas-assignments-count'
+  },
   viewOrganizationPage: {
     tournamentsPageId: 0,
+    apiKeysPageId: 2,
     settingsPageId: 3,
-    newTournamentButton: 'view-organization-page-new-tournament-button'
+    newTournamentButton: 'view-organization-page-new-tournament-button',
+    newApiKeyButton: 'view-organization-page-new-api-key-button',
+    deleteApiKeyButton: (id: string) => `view-organization-page-delete-api-key-button-${id}`
   },
   createTournamentPage: {
     confirmButton: 'create-tournament-page-confirm-button',
     tournamentNameField: 'create-tournament-page-tournament-name-field'
   },
+  createApiKeyPage: {
+    apiKeyNameField: 'create-api-key-page-api-key-name-field',
+    confirmButton: 'create-api-key-page-confirm-button',
+    resultIdField: 'create-api-key-page-result-id-field',
+    resultSecretField: 'create-api-key-page-result-secret-field',
+    doneButton: 'create-api-key-page-done-button'
+  },
   configureTournamentPage: {
     addGroupButton: 'configure-tournament-page-add-group-button',
     shuffleGroupsButton: 'configure-tournament-page-shuffle-groups-button',
diff --git a/src/Turnierplan.App/Client/e2e/pages/rbac-offcanvas.ts b/src/Turnierplan.App/Client/e2e/pages/rbac-offcanvas.ts
new file mode 100644
index 00000000..4cc997b0
--- /dev/null
+++ b/src/Turnierplan.App/Client/e2e/pages/rbac-offcanvas.ts
@@ -0,0 +1,14 @@
+import { Locator, Page } from '@playwright/test';
+import { turnierplan } from '../consts/turnierplan';
+
+export class RbacOffcanvas {
+  constructor(private readonly page: Page) {}
+
+  public getRoleAssignmentsCountLocator(): Locator {
+    return this.page.getByTestId(turnierplan.rbacOffcanvas.assignmentsCount);
+  }
+
+  public async close(): Promise<void> {
+    await this.page.getByTestId(turnierplan.rbacOffcanvas.doneButton).click();
+  }
+}
diff --git a/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts b/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts
index 73ba5271..552f2347 100644
--- a/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts
+++ b/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts
@@ -11,10 +11,38 @@ export class ViewOrganizationPage {
     await this.page.getByTestId(turnierplan.createTournamentPage.confirmButton).click();
   }
 
-  public async deleteOrganization(confirmText: string): Promise<void> {
+  public async createApiKey(name: string): Promise<{ id: string; secret: string }> {
+    await this.page.getByTestId(turnierplan.pageFrame.navigationTab(turnierplan.viewOrganizationPage.apiKeysPageId)).click();
+    await this.page.getByTestId(turnierplan.viewOrganizationPage.newApiKeyButton).click();
+    await this.page.getByTestId(turnierplan.createApiKeyPage.apiKeyNameField).fill(name);
+    await this.page.getByTestId(turnierplan.createApiKeyPage.confirmButton).click();
+
+    await this.page.getByTestId(turnierplan.createApiKeyPage.resultIdField).waitFor({ state: 'visible' });
+    const resultId = await this.page.getByTestId(turnierplan.createApiKeyPage.resultIdField).inputValue();
+    const resultSecret = await this.page.getByTestId(turnierplan.createApiKeyPage.resultSecretField).inputValue();
+
+    await this.page.getByTestId(turnierplan.createApiKeyPage.doneButton).click();
+
+    return { id: resultId, secret: resultSecret };
+  }
+
+  public async deleteApiKeyWithId(id: string, name: string): Promise<void> {
+    await this.page.getByTestId(turnierplan.pageFrame.navigationTab(turnierplan.viewOrganizationPage.apiKeysPageId)).click();
+    await this.page.getByTestId(turnierplan.viewOrganizationPage.deleteApiKeyButton(id)).click();
+    await this.page.getByTestId(turnierplan.deleteWidget.confirmationField).fill(name);
+    await this.page.getByTestId(turnierplan.deleteWidget.deleteButton).click();
+    await this.page.getByTestId(turnierplan.deleteModal.confirmDeleteButton).click();
+  }
+
+  public async deleteOrganization(name: string): Promise<void> {
     await this.page.getByTestId(turnierplan.pageFrame.navigationTab(turnierplan.viewOrganizationPage.settingsPageId)).click();
-    await this.page.getByTestId(turnierplan.deleteWidget.confirmationField).fill(confirmText);
+    await this.page.getByTestId(turnierplan.deleteWidget.confirmationField).fill(name);
     await this.page.getByTestId(turnierplan.deleteWidget.deleteButton).click();
     await this.page.getByTestId(turnierplan.deleteModal.confirmDeleteButton).click();
   }
+
+  public async openRoleAssignments(): Promise<void> {
+    await this.page.getByTestId(turnierplan.pageFrame.navigationTab(turnierplan.viewOrganizationPage.settingsPageId)).click();
+    await this.page.getByTestId(turnierplan.rbacWidget.openOffcanvasButton).click();
+  }
 }
diff --git a/src/Turnierplan.App/Client/e2e/tests/create-and-remove-role-assignments.spec.ts b/src/Turnierplan.App/Client/e2e/tests/create-and-remove-role-assignments.spec.ts
new file mode 100644
index 00000000..ae4e099a
--- /dev/null
+++ b/src/Turnierplan.App/Client/e2e/tests/create-and-remove-role-assignments.spec.ts
@@ -0,0 +1,33 @@
+import { expect, test } from '@playwright/test';
+import { createIdentifier } from '../utils/create-identifier';
+import { LoginPage } from '../pages/login-page';
+import { LandingPage } from '../pages/landing-page';
+import { ViewOrganizationPage } from '../pages/view-organization-page';
+import { RbacOffcanvas } from '../pages/rbac-offcanvas';
+
+test('Create API key, then create and remove role assignment', async ({ page }) => {
+  const organizationName = createIdentifier();
+
+  await new LoginPage(page).login();
+  await new LandingPage(page).createOrganization(organizationName);
+
+  const organizationPage = new ViewOrganizationPage(page);
+  const rbacOffcanvas = new RbacOffcanvas(page);
+
+  await organizationPage.openRoleAssignments();
+  await expect(rbacOffcanvas.getRoleAssignmentsCountLocator()).toHaveText('1 Zuweisung');
+  await rbacOffcanvas.close();
+
+  const apiKeyName = createIdentifier();
+  const apiKeyDetails = await organizationPage.createApiKey(apiKeyName);
+
+  await organizationPage.openRoleAssignments();
+  await expect(rbacOffcanvas.getRoleAssignmentsCountLocator()).toHaveText('2 Zuweisungen');
+  await rbacOffcanvas.close();
+
+  await organizationPage.deleteApiKeyWithId(apiKeyDetails.id, apiKeyName);
+
+  await organizationPage.openRoleAssignments();
+  await expect(rbacOffcanvas.getRoleAssignmentsCountLocator()).toHaveText('1 Zuweisung');
+  await rbacOffcanvas.close();
+});
diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts
index cc9d430c..5ffc1f30 100644
--- a/src/Turnierplan.App/Client/src/app/i18n/de.ts
+++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts
@@ -1393,7 +1393,10 @@ export const de = {
         User: 'Benutzer'
       },
       PrincipalNotFound: 'Der Prinzipal konnte nicht mehr gefunden werden. Wurde der Nutzer/API-Schlüssel gelöscht?',
-      TotalCount: '{{count}} Zuweisungen',
+      TotalCount: {
+        One: '1 Zuweisung',
+        Many: '{{count}} Zuweisungen'
+      },
       Id: 'ID:',
       CreatedAt: 'Erstellt am:',
       Inherited: 'Vererbt durch:',
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.html b/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.html
index 35886acc..935f066c 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.html
+++ b/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.html
@@ -1,6 +1,7 @@
 <div class="p-3">
   <div class="mb-3">
     <tp-action-button
+      [tpE2E]="'rbac-offcanvas-done-button'"
       [title]="'Portal.General.Done'"
       [icon]="'check-circle'"
       [type]="'outline-secondary'"
@@ -26,11 +27,13 @@
         (buttonClick)="showAddRoleAssignmentDialog()" />
     </div>
 
-    @if (roleAssignmentCount > 3) {
-      <div class="mb-2 me-1 small text-end">
-        <span translate="Portal.RbacManagement.TotalCount" [translateParams]="{ count: roleAssignmentCount }"></span>
-      </div>
-    }
+    <div class="mb-2 me-1 small text-end fst-italic" [tpE2E]="'rbac-offcanvas-assignments-count'">
+      @if (roleAssignmentCount === 1) {
+        <span translate="Portal.RbacManagement.TotalCount.One"></span>
+      } @else {
+        <span translate="Portal.RbacManagement.TotalCount.Many" [translateParams]="{ count: roleAssignmentCount }"></span>
+      }
+    </div>
 
     <table class="mb-0 table table-bordered">
       <tbody>
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.ts
index 98cf18cd..d4f96e7f 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.ts
+++ b/src/Turnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.ts
@@ -14,6 +14,7 @@ import { RoleAssignmentDto } from '../../../api/models/role-assignment-dto';
 import { TurnierplanApi } from '../../../api/turnierplan-api';
 import { deleteRoleAssignment } from '../../../api/fn/role-assignments/delete-role-assignment';
 import { getRoleAssignments } from '../../../api/fn/role-assignments/get-role-assignments';
+import { E2eDirective } from '../../../core/directives/e2e.directive';
 
 interface IRbacOffcanvasTarget {
   name: string;
@@ -30,7 +31,8 @@ interface IRbacOffcanvasTarget {
     RbacPrincipalComponent,
     DeleteButtonComponent,
     TranslatePipe,
-    TranslateDatePipe
+    TranslateDatePipe,
+    E2eDirective
   ]
 })
 export class RbacOffcanvasComponent implements OnDestroy {
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.html b/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.html
index 923187b0..ff6003b5 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.html
+++ b/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.html
@@ -10,6 +10,7 @@
 
   <div class="mt-3 d-flex flex-row">
     <tp-action-button
+      [tpE2E]="'rbac-widget-open-offcanvas-button'"
       [type]="'outline-secondary'"
       [icon]="'shield-lock'"
       [title]="'Portal.RbacManagement.ButtonLabel'"
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.ts
index ad6a02af..47f067fc 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.ts
+++ b/src/Turnierplan.App/Client/src/app/portal/components/rbac-widget/rbac-widget.component.ts
@@ -6,6 +6,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { filter } from 'rxjs/operators';
 import { ActionButtonComponent } from '../action-button/action-button.component';
 import { TranslateDirective } from '@ngx-translate/core';
+import { E2eDirective } from '../../../core/directives/e2e.directive';
 
 interface IRbacWidgetTarget {
   name: string;
@@ -15,7 +16,7 @@ interface IRbacWidgetTarget {
 @Component({
   selector: 'tp-rbac-widget',
   templateUrl: './rbac-widget.component.html',
-  imports: [ActionButtonComponent, TranslateDirective]
+  imports: [ActionButtonComponent, TranslateDirective, E2eDirective]
 })
 export class RbacWidgetComponent {
   @Input()
diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.html b/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.html
index 9d9498fd..e865da26 100644
--- a/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.html
+++ b/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.html
@@ -5,7 +5,13 @@
     <div class="mt-4 mb-3">
       <label for="success_apiKey_id" class="form-label" translate="Portal.CreateApiKey.SuccessInformation.Id"></label>
       <div class="input-group">
-        <input id="success_apiKey_id" type="text" class="form-control" readonly [value]="createdApiKey.id" />
+        <input
+          id="success_apiKey_id"
+          type="text"
+          class="form-control"
+          readonly
+          [tpE2E]="'create-api-key-page-result-id-field'"
+          [value]="createdApiKey.id" />
         <span class="input-group-text">
           <tp-copy-to-clipboard [value]="createdApiKey.id" />
         </span>
@@ -15,7 +21,13 @@
     <div class="mb-3">
       <label for="success_apiKey_secret" class="form-label" translate="Portal.CreateApiKey.SuccessInformation.Secret"></label>
       <div class="input-group">
-        <input id="success_apiKey_secret" type="text" class="form-control" readonly [value]="createdApiKey.secret ?? ''" />
+        <input
+          id="success_apiKey_secret"
+          type="text"
+          class="form-control"
+          readonly
+          [tpE2E]="'create-api-key-page-result-secret-field'"
+          [value]="createdApiKey.secret ?? ''" />
         <span class="input-group-text">
           <tp-copy-to-clipboard [value]="createdApiKey.secret ?? ''" />
         </span>
@@ -25,7 +37,11 @@
     <hr />
 
     <div class="d-flex flex-row justify-content-end">
-      <tp-action-button [type]="'success'" [title]="'Portal.General.Done'" [routerLink]="'../..'" />
+      <tp-action-button
+        [tpE2E]="'create-api-key-page-done-button'"
+        [type]="'success'"
+        [title]="'Portal.General.Done'"
+        [routerLink]="'../..'" />
     </div>
   </tp-page-frame>
 } @else {
@@ -38,6 +54,7 @@
           type="text"
           class="form-control"
           formControlName="name"
+          [tpE2E]="'create-api-key-page-api-key-name-field'"
           [ngClass]="nameControl.dirty || nameControl.touched ? (nameControl.invalid ? 'is-invalid' : 'is-valid') : ''" />
         <div class="invalid-feedback" translate="Portal.CreateApiKey.Form.NameInvalid"></div>
         <div class="valid-feedback" translate="Portal.CreateApiKey.Form.NameValid"></div>
@@ -90,6 +107,7 @@
 
     <div class="d-flex flex-row justify-content-end">
       <tp-action-button
+        [tpE2E]="'create-api-key-page-confirm-button'"
         [type]="'success'"
         [title]="'Portal.CreateApiKey.Submit'"
         [disabled]="form.invalid"
diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.ts
index 7e11d711..2a88e234 100644
--- a/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.ts
+++ b/src/Turnierplan.App/Client/src/app/portal/pages/create-api-key/create-api-key.component.ts
@@ -17,6 +17,7 @@ import { ApiKeyDto } from '../../../api/models/api-key-dto';
 import { TurnierplanApi } from '../../../api/turnierplan-api';
 import { getOrganization } from '../../../api/fn/organizations/get-organization';
 import { createApiKey } from '../../../api/fn/api-keys/create-api-key';
+import { E2eDirective } from '../../../core/directives/e2e.directive';
 
 @Component({
   templateUrl: './create-api-key.component.html',
@@ -31,7 +32,8 @@ import { createApiKey } from '../../../api/fn/api-keys/create-api-key';
     FormsModule,
     ReactiveFormsModule,
     NgClass,
-    TranslatePipe
+    TranslatePipe,
+    E2eDirective
   ]
 })
 export class CreateApiKeyComponent {
diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.html b/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.html
index b17db870..cbbe86bd 100644
--- a/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.html
+++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.html
@@ -45,6 +45,7 @@
           @case (2) {
             <tp-action-button
               *tpIsActionAllowed="[organization.id, Actions.GenericWrite]"
+              [tpE2E]="'view-organization-page-new-api-key-button'"
               [title]="'Portal.ViewOrganization.NewApiKey'"
               [type]="'outline-success'"
               [icon]="'plus-circle'"
@@ -218,6 +219,7 @@
                             @if (writeAllowed) {
                               <td class="align-middle" style="width: 1px">
                                 <tp-action-button
+                                  [tpE2E]="['view-organization-page-delete-api-key-button', apiKey.id]"
                                   [icon]="'trash'"
                                   [type]="'outline-danger'"
                                   [mode]="'IconOnly'"
diff --git a/src/Turnierplan.App/Endpoints/ApiKeys/DeleteApiKeyEndpoint.cs b/src/Turnierplan.App/Endpoints/ApiKeys/DeleteApiKeyEndpoint.cs
index 36eedf3c..ab1a16d6 100644
--- a/src/Turnierplan.App/Endpoints/ApiKeys/DeleteApiKeyEndpoint.cs
+++ b/src/Turnierplan.App/Endpoints/ApiKeys/DeleteApiKeyEndpoint.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Turnierplan.App.Security;
+using Turnierplan.Core.Extensions;
 using Turnierplan.Core.PublicId;
 using Turnierplan.Dal.Repositories;
 
@@ -17,6 +18,7 @@ private static async Task<IResult> Handle(
         [FromRoute] PublicId id,
         IApiKeyRepository repository,
         IAccessValidator accessValidator,
+        IServiceProvider serviceProvider,
         CancellationToken cancellationToken)
     {
         var apiKey = await repository.GetByPublicIdAsync(id);
@@ -33,6 +35,13 @@ private static async Task<IResult> Handle(
 
         repository.Remove(apiKey);
 
+        var principal = apiKey.AsPrincipal();
+
+        foreach (var roleAssignmentRepository in serviceProvider.GetServices<IRoleAssignmentRepository>())
+        {
+            await roleAssignmentRepository.RemoveAllByPrincipalAsync(principal);
+        }
+
         await repository.UnitOfWork.SaveChangesAsync(cancellationToken);
 
         return Results.NoContent();
diff --git a/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs b/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs
index a3eaa6c5..39f134bf 100644
--- a/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs
+++ b/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs
@@ -30,16 +30,8 @@ internal sealed class CreateRoleAssignmentEndpoint : EndpointBase<RoleAssignment
 
     private static async Task<IResult> Handle(
         [FromBody] CreateRoleAssignmentEndpointRequest request,
-        IApiKeyRepository apiKeyRepository,
-        IFolderRepository folderRepository,
-        IImageRepository imageRepository,
-        IOrganizationRepository organizationRepository,
-        IPlanningRealmRepository planningRealmRepository,
-        ITournamentRepository tournamentRepository,
-        IUserRepository userRepository,
-        IVenueRepository venueRepository,
-        IAccessValidator accessValidator,
         IServiceProvider serviceProvider,
+        IAccessValidator accessValidator,
         IMapper mapper,
         CancellationToken cancellationToken)
     {
@@ -55,13 +47,13 @@ private static async Task<IResult> Handle(
 
         var task = typeName switch
         {
-            "ApiKey" => CreateRoleAssignmentAsync(request, apiKeyRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<ApiKey>>(), mapper, cancellationToken),
-            "Folder" => CreateRoleAssignmentAsync(request, folderRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<Folder>>(), mapper, cancellationToken),
-            "Image" => CreateRoleAssignmentAsync(request, imageRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<Image>>(), mapper, cancellationToken),
-            "Organization" => CreateRoleAssignmentAsync(request, organizationRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<Organization>>(), mapper, cancellationToken),
-            "PlanningRealm" => CreateRoleAssignmentAsync(request, planningRealmRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<PlanningRealm>>(), mapper, cancellationToken),
-            "Tournament" => CreateRoleAssignmentAsync(request, tournamentRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<Tournament>>(), mapper, cancellationToken),
-            "Venue" => CreateRoleAssignmentAsync(request, venueRepository, targetId, accessValidator, apiKeyRepository, userRepository, serviceProvider.GetRequiredService<IRoleAssignmentRepository<Venue>>(), mapper, cancellationToken),
+            "ApiKey" => CreateRoleAssignmentAsync<ApiKey>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
+            "Folder" => CreateRoleAssignmentAsync<Folder>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
+            "Image" => CreateRoleAssignmentAsync<Image>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
+            "Organization" => CreateRoleAssignmentAsync<Organization>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
+            "PlanningRealm" => CreateRoleAssignmentAsync<PlanningRealm>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
+            "Tournament" => CreateRoleAssignmentAsync<Tournament>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
+            "Venue" => CreateRoleAssignmentAsync<Venue>(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken),
             _ => null
         };
 
@@ -72,16 +64,14 @@ private static async Task<IResult> Handle(
 
     private static async Task<IResult> CreateRoleAssignmentAsync<T>(
         CreateRoleAssignmentEndpointRequest request,
-        IRepositoryWithPublicId<T, long> repository,
-        PublicId targetId,
+        IServiceProvider serviceProvider,
         IAccessValidator accessValidator,
-        IApiKeyRepository apiKeyRepository,
-        IUserRepository userRepository,
-        IRoleAssignmentRepository<T> roleAssignmentRepository,
         IMapper mapper,
+        PublicId targetId,
         CancellationToken cancellationToken)
         where T : Entity<long>, IEntityWithRoleAssignments<T>
     {
+        var repository = serviceProvider.GetRequiredService<IRepositoryWithPublicId<T, long>>();
         var entity = await repository.GetByPublicIdAsync(targetId);
 
         if (entity is null)
@@ -94,7 +84,7 @@ private static async Task<IResult> CreateRoleAssignmentAsync<T>(
             return Results.Forbid();
         }
 
-        var principal = await GetPrincipalAsync(request, apiKeyRepository, userRepository);
+        var principal = await GetPrincipalAsync(request, serviceProvider);
 
         if (principal is null)
         {
@@ -106,6 +96,7 @@ private static async Task<IResult> CreateRoleAssignmentAsync<T>(
             return Results.Conflict("There already exists a role assignment for the specified principal/role combination.");
         }
 
+        var roleAssignmentRepository = serviceProvider.GetRequiredService<IRoleAssignmentRepository<T>>();
         var roleAssignment = entity.AddRoleAssignment(request.Role, principal);
 
         await roleAssignmentRepository.CreateAsync(roleAssignment);
@@ -114,13 +105,11 @@ private static async Task<IResult> CreateRoleAssignmentAsync<T>(
         return Results.Ok(mapper.Map<RoleAssignmentDto>(roleAssignment));
     }
 
-    private static async Task<Principal?> GetPrincipalAsync(
-        CreateRoleAssignmentEndpointRequest request,
-        IApiKeyRepository apiKeyRepository,
-        IUserRepository userRepository)
+    private static async Task<Principal?> GetPrincipalAsync(CreateRoleAssignmentEndpointRequest request, IServiceProvider serviceProvider)
     {
         if (request.ApiKeyId.HasValue)
         {
+            var apiKeyRepository = serviceProvider.GetRequiredService<IApiKeyRepository>();
             var apiKey = await apiKeyRepository.GetByPublicIdAsync(request.ApiKeyId.Value);
 
             return apiKey?.AsPrincipal();
@@ -128,6 +117,7 @@ private static async Task<IResult> CreateRoleAssignmentAsync<T>(
 
         if (request.UserNameOrEmail is not null)
         {
+            var userRepository = serviceProvider.GetRequiredService<IUserRepository>();
             var user = await userRepository.GetByUserNameOrEmailAsync(request.UserNameOrEmail);
 
             return user?.AsPrincipal();
diff --git a/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs b/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs
index bd739911..795d7efb 100644
--- a/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs
+++ b/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs
@@ -1,10 +1,16 @@
 using Microsoft.AspNetCore.Mvc;
 using Turnierplan.App.Helpers;
 using Turnierplan.App.Security;
+using Turnierplan.Core.ApiKey;
 using Turnierplan.Core.Entity;
+using Turnierplan.Core.Folder;
+using Turnierplan.Core.Image;
 using Turnierplan.Core.Organization;
+using Turnierplan.Core.PlanningRealm;
 using Turnierplan.Core.PublicId;
 using Turnierplan.Core.RoleAssignment;
+using Turnierplan.Core.Tournament;
+using Turnierplan.Core.Venue;
 using Turnierplan.Dal.Repositories;
 
 namespace Turnierplan.App.Endpoints.RoleAssignments;
@@ -20,13 +26,7 @@ internal sealed class DeleteRoleAssignmentEndpoint : EndpointBase
     private static async Task<IResult> Handle(
         [FromRoute] string scopeId,
         [FromRoute] string roleAssignmentId,
-        IApiKeyRepository apiKeyRepository,
-        IFolderRepository folderRepository,
-        IImageRepository imageRepository,
-        IOrganizationRepository organizationRepository,
-        IPlanningRealmRepository planningRealmRepository,
-        ITournamentRepository tournamentRepository,
-        IVenueRepository venueRepository,
+        IServiceProvider serviceProvider,
         IAccessValidator accessValidator,
         CancellationToken cancellationToken)
     {
@@ -42,13 +42,13 @@ private static async Task<IResult> Handle(
 
         var task = typeName switch
         {
-            "ApiKey" => DeleteRoleAssignmentAsync(apiKeyRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
-            "Folder" => DeleteRoleAssignmentAsync(folderRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
-            "Image" => DeleteRoleAssignmentAsync(imageRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
-            "Organization" => DeleteRoleAssignmentAsync(organizationRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
-            "PlanningRealm" => DeleteRoleAssignmentAsync(planningRealmRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
-            "Tournament" => DeleteRoleAssignmentAsync(tournamentRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
-            "Venue" => DeleteRoleAssignmentAsync(venueRepository, targetId, accessValidator, roleAssignmentGuid, cancellationToken),
+            "ApiKey" => DeleteRoleAssignmentAsync<ApiKey>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
+            "Folder" => DeleteRoleAssignmentAsync<Folder>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
+            "Image" => DeleteRoleAssignmentAsync<Image>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
+            "Organization" => DeleteRoleAssignmentAsync<Organization>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
+            "PlanningRealm" => DeleteRoleAssignmentAsync<PlanningRealm>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
+            "Tournament" => DeleteRoleAssignmentAsync<Tournament>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
+            "Venue" => DeleteRoleAssignmentAsync<Venue>(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken),
             _ => null
         };
 
@@ -58,13 +58,14 @@ private static async Task<IResult> Handle(
     }
 
     private static async Task<IResult> DeleteRoleAssignmentAsync<T>(
-        IRepositoryWithPublicId<T, long> repository,
-        PublicId targetId,
+        IServiceProvider serviceProvider,
         IAccessValidator accessValidator,
+        PublicId targetId,
         Guid roleAssignmentId,
         CancellationToken cancellationToken)
         where T : Entity<long>, IEntityWithRoleAssignments<T>
     {
+        var repository = serviceProvider.GetRequiredService<IRepositoryWithPublicId<T, long>>();
         var entity = await repository.GetByPublicIdAsync(targetId);
 
         if (entity is null)
diff --git a/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs b/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs
index c05f5c39..2377d317 100644
--- a/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs
+++ b/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs
@@ -3,9 +3,15 @@
 using Turnierplan.App.Mapping;
 using Turnierplan.App.Models;
 using Turnierplan.App.Security;
+using Turnierplan.Core.ApiKey;
 using Turnierplan.Core.Entity;
+using Turnierplan.Core.Folder;
+using Turnierplan.Core.Image;
+using Turnierplan.Core.Organization;
+using Turnierplan.Core.PlanningRealm;
 using Turnierplan.Core.PublicId;
 using Turnierplan.Core.Tournament;
+using Turnierplan.Core.Venue;
 using Turnierplan.Dal.Repositories;
 
 namespace Turnierplan.App.Endpoints.RoleAssignments;
@@ -20,13 +26,7 @@ internal sealed class GetRoleAssignmentsEndpoint : EndpointBase<IEnumerable<Role
 
     private static async Task<IResult> Handle(
         [FromRoute] string scopeId,
-        IApiKeyRepository apiKeyRepository,
-        IFolderRepository folderRepository,
-        IImageRepository imageRepository,
-        IOrganizationRepository organizationRepository,
-        IPlanningRealmRepository planningRealmRepository,
-        ITournamentRepository tournamentRepository,
-        IVenueRepository venueRepository,
+        IServiceProvider serviceProvider,
         IAccessValidator accessValidator,
         IMapper mapper)
     {
@@ -37,13 +37,13 @@ private static async Task<IResult> Handle(
 
         var task = typeName switch
         {
-            "ApiKey" => GetRoleAssignmentsAsync(apiKeyRepository, targetId, accessValidator, mapper),
-            "Folder" => GetRoleAssignmentsAsync(folderRepository, targetId, accessValidator, mapper),
-            "Image" => GetRoleAssignmentsAsync(imageRepository, targetId, accessValidator, mapper),
-            "Organization" => GetRoleAssignmentsAsync(organizationRepository, targetId, accessValidator, mapper),
-            "PlanningRealm" => GetRoleAssignmentsAsync(planningRealmRepository, targetId, accessValidator, mapper),
-            "Tournament" => GetRoleAssignmentsAsync(tournamentRepository, targetId, accessValidator, mapper),
-            "Venue" => GetRoleAssignmentsAsync(venueRepository, targetId, accessValidator, mapper),
+            "ApiKey" => GetRoleAssignmentsAsync<ApiKey>(serviceProvider, accessValidator, mapper, targetId),
+            "Folder" => GetRoleAssignmentsAsync<Folder>(serviceProvider, accessValidator, mapper, targetId),
+            "Image" => GetRoleAssignmentsAsync<Image>(serviceProvider, accessValidator, mapper, targetId),
+            "Organization" => GetRoleAssignmentsAsync<Organization>(serviceProvider, accessValidator, mapper, targetId),
+            "PlanningRealm" => GetRoleAssignmentsAsync<PlanningRealm>(serviceProvider, accessValidator, mapper, targetId),
+            "Tournament" => GetRoleAssignmentsAsync<Tournament>(serviceProvider, accessValidator, mapper, targetId),
+            "Venue" => GetRoleAssignmentsAsync<Venue>(serviceProvider, accessValidator, mapper, targetId),
             _ => null
         };
 
@@ -52,9 +52,10 @@ private static async Task<IResult> Handle(
             : await task;
     }
 
-    private static async Task<IResult> GetRoleAssignmentsAsync<T>(IRepositoryWithPublicId<T, long> repository, PublicId targetId, IAccessValidator accessValidator, IMapper mapper)
+    private static async Task<IResult> GetRoleAssignmentsAsync<T>(IServiceProvider serviceProvider, IAccessValidator accessValidator, IMapper mapper, PublicId targetId)
         where T : Entity<long>, IEntityWithRoleAssignments<T>
     {
+        var repository = serviceProvider.GetRequiredService<IRepositoryWithPublicId<T, long>>();
         var entity = await repository.GetByPublicIdAsync(targetId);
 
         if (entity is null)
diff --git a/src/Turnierplan.App/Endpoints/Users/DeleteUserEndpoint.cs b/src/Turnierplan.App/Endpoints/Users/DeleteUserEndpoint.cs
index f1a089e3..87ffeff4 100644
--- a/src/Turnierplan.App/Endpoints/Users/DeleteUserEndpoint.cs
+++ b/src/Turnierplan.App/Endpoints/Users/DeleteUserEndpoint.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Turnierplan.App.Extensions;
+using Turnierplan.Core.Extensions;
 using Turnierplan.Dal.Repositories;
 
 namespace Turnierplan.App.Endpoints.Users;
@@ -18,6 +19,7 @@ private static async Task<IResult> Handle(
         [FromRoute] Guid id,
         HttpContext context,
         IUserRepository repository,
+        IServiceProvider serviceProvider,
         CancellationToken cancellationToken)
     {
         if (id == context.GetCurrentUserIdOrThrow())
@@ -34,6 +36,13 @@ private static async Task<IResult> Handle(
 
         repository.Remove(user);
 
+        var principal = user.AsPrincipal();
+
+        foreach (var roleAssignmentRepository in serviceProvider.GetServices<IRoleAssignmentRepository>())
+        {
+            await roleAssignmentRepository.RemoveAllByPrincipalAsync(principal);
+        }
+
         await repository.UnitOfWork.SaveChangesAsync(cancellationToken);
 
         return Results.NoContent();
diff --git a/src/Turnierplan.Dal/Extensions/ServiceCollectionExtensions.cs b/src/Turnierplan.Dal/Extensions/ServiceCollectionExtensions.cs
index 0660ece7..4c05efa8 100644
--- a/src/Turnierplan.Dal/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Turnierplan.Dal/Extensions/ServiceCollectionExtensions.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Turnierplan.Core.ApiKey;
+using Turnierplan.Core.Document;
 using Turnierplan.Core.Folder;
 using Turnierplan.Core.Image;
 using Turnierplan.Core.Organization;
@@ -59,6 +60,16 @@ public static void AddTurnierplanDataAccessLayer(this IServiceCollection service
         services.AddScoped<IUserRepository, UserRepository>();
         services.AddScoped<IVenueRepository, VenueRepository>();
 
+        services.AddScoped<IRepositoryWithPublicId<ApiKey, long>>(sp => sp.GetRequiredService<IApiKeyRepository>());
+        services.AddScoped<IRepositoryWithPublicId<Document, long>>(sp => sp.GetRequiredService<IDocumentRepository>());
+        services.AddScoped<IRepositoryWithPublicId<Folder, long>>(sp => sp.GetRequiredService<IFolderRepository>());
+        services.AddScoped<IRepositoryWithPublicId<InvitationLink, long>>(sp => sp.GetRequiredService<IInvitationLinkRepository>());
+        services.AddScoped<IRepositoryWithPublicId<Image, long>>(sp => sp.GetRequiredService<IImageRepository>());
+        services.AddScoped<IRepositoryWithPublicId<Organization, long>>(sp => sp.GetRequiredService<IOrganizationRepository>());
+        services.AddScoped<IRepositoryWithPublicId<PlanningRealm, long>>(sp => sp.GetRequiredService<IPlanningRealmRepository>());
+        services.AddScoped<IRepositoryWithPublicId<Tournament, long>>(sp => sp.GetRequiredService<ITournamentRepository>());
+        services.AddScoped<IRepositoryWithPublicId<Venue, long>>(sp => sp.GetRequiredService<IVenueRepository>());
+
         services.AddScoped<IRoleAssignmentRepository<ApiKey>, ApiKeyRoleAssignmentRepository>();
         services.AddScoped<IRoleAssignmentRepository<Folder>, FolderRoleAssignmentRepository>();
         services.AddScoped<IRoleAssignmentRepository<Image>, ImageRoleAssignmentRepository>();
@@ -66,5 +77,13 @@ public static void AddTurnierplanDataAccessLayer(this IServiceCollection service
         services.AddScoped<IRoleAssignmentRepository<PlanningRealm>, PlanningRealmRoleAssignmentRepository>();
         services.AddScoped<IRoleAssignmentRepository<Tournament>, TournamentRoleAssignmentRepository>();
         services.AddScoped<IRoleAssignmentRepository<Venue>, VenueRoleAssignmentRepository>();
+
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<ApiKey>>());
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<Folder>>());
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<Image>>());
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<Organization>>());
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<PlanningRealm>>());
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<Tournament>>());
+        services.AddScoped<IRoleAssignmentRepository>(sp => sp.GetRequiredService<IRoleAssignmentRepository<Venue>>());
     }
 }
diff --git a/src/Turnierplan.Dal/Repositories/RoleAssignmentRepository.cs b/src/Turnierplan.Dal/Repositories/RoleAssignmentRepository.cs
index 4eb3dc0a..3b959770 100644
--- a/src/Turnierplan.Dal/Repositories/RoleAssignmentRepository.cs
+++ b/src/Turnierplan.Dal/Repositories/RoleAssignmentRepository.cs
@@ -1,3 +1,4 @@
+using Microsoft.EntityFrameworkCore;
 using Turnierplan.Core.ApiKey;
 using Turnierplan.Core.Entity;
 using Turnierplan.Core.Folder;
@@ -10,11 +11,23 @@
 
 namespace Turnierplan.Dal.Repositories;
 
-public interface IRoleAssignmentRepository<T> : IRepository<RoleAssignment<T>, Guid>
+public interface IRoleAssignmentRepository
+{
+    Task RemoveAllByPrincipalAsync(Principal principal);
+}
+
+public interface IRoleAssignmentRepository<T> : IRepository<RoleAssignment<T>, Guid>, IRoleAssignmentRepository
     where T : Entity<long>, IEntityWithRoleAssignments<T>;
 
 internal abstract class RoleAssignmentRepositoryBase<T>(TurnierplanContext context) : RepositoryBase<RoleAssignment<T>, Guid>(context), IRoleAssignmentRepository<T>
-    where T : Entity<long>, IEntityWithRoleAssignments<T>;
+    where T : Entity<long>, IEntityWithRoleAssignments<T>
+{
+    public async Task RemoveAllByPrincipalAsync(Principal principal)
+    {
+        var roleAssignments = await DbSet.Where(x => x.Principal == principal).ToListAsync();
+        DbSet.RemoveRange(roleAssignments);
+    }
+}
 
 internal sealed class ApiKeyRoleAssignmentRepository(TurnierplanContext context) : RoleAssignmentRepositoryBase<ApiKey>(context);
 
diff --git a/src/turnierplan.NET.slnx b/src/turnierplan.NET.slnx
index 03a88477..b163cf28 100644
--- a/src/turnierplan.NET.slnx
+++ b/src/turnierplan.NET.slnx
@@ -5,6 +5,7 @@
   <Folder Name="/Test/">
     <File Path="Turnierplan.Test.Common.props" />
     <Project Path="Turnierplan.Adapter.Test.Functional/Turnierplan.Adapter.Test.Functional.csproj" />
+    <Project Path="Turnierplan.App.Test.Functional/Turnierplan.App.Test.Functional.csproj" />
     <Project Path="Turnierplan.App.Test.Unit/Turnierplan.App.Test.Unit.csproj" />
     <Project Path="Turnierplan.Core.Test.Regression/Turnierplan.Core.Test.Regression.csproj" />
     <Project Path="Turnierplan.Core.Test.Unit/Turnierplan.Core.Test.Unit.csproj" />