diff --git a/.gitattributes b/.gitattributes
index 63a9981c0..3d1b6d984 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 pkg/server/api/console/v1/*_resolvers.go -linguist-generated
 pkg/server/api/connect/v1/*_resolvers.go -linguist-generated
-pkg/server/api/trust/v1/*_resolvers.go -linguist-generated
+pkg/server/api/complianceportal/v1/*_resolvers.go -linguist-generated
 pkg/server/api/mcp/v1/v1_resolver.go -linguist-generated
 pkg/server/api/mcp/v1/schema.resolvers.go -linguist-generated
diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml
index 82f8bbfb6..b028fa106 100644
--- a/.github/workflows/make.yaml
+++ b/.github/workflows/make.yaml
@@ -81,7 +81,7 @@ jobs:
         run: |
           go generate ./pkg/server/api/connect/v1
           go generate ./pkg/server/api/console/v1
-          go generate ./pkg/server/api/trust/v1
+          go generate ./pkg/server/api/complianceportal/v1
           go generate ./pkg/server/api/mcp/v1
       - name: "Build binaries"
         env:
@@ -254,7 +254,7 @@ jobs:
         run: |
           go generate ./pkg/server/api/connect/v1
           go generate ./pkg/server/api/console/v1
-          go generate ./pkg/server/api/trust/v1
+          go generate ./pkg/server/api/complianceportal/v1
           go generate ./pkg/server/api/mcp/v1
       - name: "Build probod group binaries"
         env:
@@ -319,7 +319,7 @@ jobs:
         run: |
           go generate ./pkg/server/api/connect/v1
           go generate ./pkg/server/api/console/v1
-          go generate ./pkg/server/api/trust/v1
+          go generate ./pkg/server/api/complianceportal/v1
           go generate ./pkg/server/api/mcp/v1
       - name: "Run gofmt"
         run: |
diff --git a/.github/workflows/release-probod.yaml b/.github/workflows/release-probod.yaml
index 91e4ad563..a59701d40 100644
--- a/.github/workflows/release-probod.yaml
+++ b/.github/workflows/release-probod.yaml
@@ -75,7 +75,7 @@ jobs:
         run: |
           go generate ./pkg/server/api/connect/v1
           go generate ./pkg/server/api/console/v1
-          go generate ./pkg/server/api/trust/v1
+          go generate ./pkg/server/api/complianceportal/v1
           go generate ./pkg/server/api/mcp/v1
       - name: "Build binaries"
         env:
diff --git a/GNUmakefile b/GNUmakefile
index 1263b173f..c56be5715 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -65,8 +65,8 @@ GENERATED= pkg/server/api/connect/v1/schema/schema.go \
 	pkg/server/api/connect/v1/types/types.go \
 	pkg/server/api/console/v1/schema/schema.go \
 	pkg/server/api/console/v1/types/types.go \
-	pkg/server/api/trust/v1/schema/schema.go \
-	pkg/server/api/trust/v1/types/types.go \
+	pkg/server/api/complianceportal/v1/schema/schema.go \
+	pkg/server/api/complianceportal/v1/types/types.go \
 	pkg/server/api/mcp/v1/server/server.go \
 	pkg/server/api/mcp/v1/types/types.go
 
@@ -301,7 +301,7 @@ $(PROBO_AGENT_BIN):
 RELAY_SCHEMAS = \
 	pkg/server/api/connect/v1/schema.graphql \
 	pkg/server/api/console/v1/schema.graphql \
-	pkg/server/api/trust/v1/schema.graphql
+	pkg/server/api/complianceportal/v1/schema.graphql
 
 .PHONY: relay
 relay: $(RELAY_SCHEMAS)
@@ -311,7 +311,7 @@ MERGE_GRAPHQL = contrib/merge-graphql-schema.sh
 
 CONNECT_GQL = $(wildcard pkg/server/api/connect/v1/graphql/*.graphql)
 CONSOLE_GQL = $(wildcard pkg/server/api/console/v1/graphql/*.graphql)
-TRUST_GQL   = $(wildcard pkg/server/api/trust/v1/graphql/*.graphql)
+COMPLIANCEPORTAL_GQL = $(wildcard pkg/server/api/complianceportal/v1/graphql/*.graphql)
 
 pkg/server/api/connect/v1/schema.graphql: pkg/server/api/connect/v1/graphql $(CONNECT_GQL)
 	$(MERGE_GRAPHQL) $@ pkg/server/api/connect/v1/graphql
@@ -319,8 +319,8 @@ pkg/server/api/connect/v1/schema.graphql: pkg/server/api/connect/v1/graphql $(CO
 pkg/server/api/console/v1/schema.graphql: pkg/server/api/console/v1/graphql $(CONSOLE_GQL)
 	$(MERGE_GRAPHQL) $@ pkg/server/api/console/v1/graphql
 
-pkg/server/api/trust/v1/schema.graphql: pkg/server/api/trust/v1/graphql $(TRUST_GQL)
-	$(MERGE_GRAPHQL) $@ pkg/server/api/trust/v1/graphql
+pkg/server/api/complianceportal/v1/schema.graphql: pkg/server/api/complianceportal/v1/graphql $(COMPLIANCEPORTAL_GQL)
+	$(MERGE_GRAPHQL) $@ pkg/server/api/complianceportal/v1/graphql
 
 .PHONY: @probo/console
 @probo/console: NODE_ENV=production
@@ -356,9 +356,9 @@ pkg/server/api/console/v1/schema/schema.go \
 pkg/server/api/console/v1/types/types.go: pkg/server/api/console/v1/gqlgen.yaml pkg/server/api/console/v1/graphql $(CONSOLE_GQL) | pkg/server/api/connect/v1/types/types.go
 	$(GO_GENERATE) ./pkg/server/api/console/v1
 
-pkg/server/api/trust/v1/schema/schema.go \
-pkg/server/api/trust/v1/types/types.go: pkg/server/api/trust/v1/gqlgen.yaml pkg/server/api/trust/v1/graphql $(TRUST_GQL) | pkg/server/api/console/v1/types/types.go
-	$(GO_GENERATE) ./pkg/server/api/trust/v1
+pkg/server/api/complianceportal/v1/schema/schema.go \
+pkg/server/api/complianceportal/v1/types/types.go: pkg/server/api/complianceportal/v1/gqlgen.yaml pkg/server/api/complianceportal/v1/graphql $(COMPLIANCEPORTAL_GQL) | pkg/server/api/console/v1/types/types.go
+	$(GO_GENERATE) ./pkg/server/api/complianceportal/v1
 
 pkg/server/api/mcp/v1/server/server.go \
 pkg/server/api/mcp/v1/types/types.go: pkg/server/api/mcp/v1/specification.yaml pkg/server/api/mcp/v1/mcpgen.yaml
@@ -392,7 +392,7 @@ fmt-go: ## Format Go code
 clean: ## Clean the project (node_modules and build artifacts)
 	$(RM) -rf bin/*
 	$(RM) -rf node_modules
-	$(RM) -rf apps/{console,trust,compliance-portal}/{dist,node_modules}
+	$(RM) -rf apps/{console,compliance-portal,trust}/{dist,node_modules}
 	$(RM) -rf packages/emails/{dist,node_modules}
 	$(RM) -rf sbom-docker.json sbom.json
 	$(RM) -rf coverage.out coverage.html coverage-e2e.out coverage-e2e.html coverage-combined.out coverage-combined.html
@@ -400,7 +400,7 @@ clean: ## Clean the project (node_modules and build artifacts)
 	$(RM) -rf compose/keycloak/certs/cert.pem compose/keycloak/certs/private-key.pem compose/keycloak/probo-realm.json
 	$(RM) -f pkg/server/api/connect/v1/schema/schema.go pkg/server/api/connect/v1/types/types.go
 	$(RM) -f pkg/server/api/console/v1/schema/schema.go pkg/server/api/console/v1/types/types.go
-	$(RM) -f pkg/server/api/trust/v1/schema/schema.go pkg/server/api/trust/v1/types/types.go
+	$(RM) -f pkg/server/api/complianceportal/v1/schema/schema.go pkg/server/api/complianceportal/v1/types/types.go
 	$(RM) -f pkg/server/api/mcp/v1/server/server.go pkg/server/api/mcp/v1/types/types.go
 	$(RM) -f $(RELAY_SCHEMAS)
 	$(RM) -f pkg/llm/registry_gen.go
diff --git a/contrib/claude/go-style.md b/contrib/claude/go-style.md
index c81414cc2..f93503953 100644
--- a/contrib/claude/go-style.md
+++ b/contrib/claude/go-style.md
@@ -152,7 +152,7 @@ import (
 	"go.gearno.de/kit/log"
 	"go.probo.inc/probo/pkg/iam"
 	"go.probo.inc/probo/pkg/probo"
-	"go.probo.inc/probo/pkg/trust"
+	complianceportal_v1 "go.probo.inc/probo/pkg/server/api/complianceportal/v1"
 )
 ```
 
diff --git a/contrib/claude/make.md b/contrib/claude/make.md
index 341eb5c4a..6863f07c8 100644
--- a/contrib/claude/make.md
+++ b/contrib/claude/make.md
@@ -37,7 +37,7 @@ Individual codegen is driven by `go generate`:
 
 - `go generate ./pkg/server/api/console/v1` — Console GraphQL (gqlgen)
 - `go generate ./pkg/server/api/connect/v1` — Connect GraphQL (gqlgen)
-- `go generate ./pkg/server/api/trust/v1` — Trust GraphQL (gqlgen)
+- `go generate ./pkg/server/api/complianceportal/v1` — Compliance portal GraphQL (gqlgen)
 - `go generate ./pkg/server/api/mcp/v1` — MCP (mcpgen)
 - `go generate ./pkg/llm` — LLM model registry from OpenRouter (`make genmodels`)