diff --git a/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql b/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
index 9ace4ac1..318e8b22 100644
--- a/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
+++ b/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
@@ -10,10 +10,10 @@ query ($filter: IssueFilter, $first: Int, $after: String) {
         totalCount
         edges {
             node {
-				id
-				primaryName
+               id
+               primaryName
                 type
-				description
+                description
                 metadata {
                     created_at
                     created_by
diff --git a/internal/app/activity/activity_handler.go b/internal/app/activity/activity_handler.go
index a63f92d5..00b3d0bb 100644
--- a/internal/app/activity/activity_handler.go
+++ b/internal/app/activity/activity_handler.go
@@ -138,7 +138,7 @@ func (a *activityHandler) CreateActivity(activity *entity.Activity) (*entity.Act
 	})
 
 	var err error
-	activity.CreatedBy, err = common.GetUserId(a.database, "S0000000")
+	activity.CreatedBy, err = common.GetCurrentUserId(a.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewActivityHandlerError("Internal error while creating activity (GetUserId).")
@@ -165,7 +165,7 @@ func (a *activityHandler) UpdateActivity(activity *entity.Activity) (*entity.Act
 	})
 
 	var err error
-	activity.UpdatedBy, err = common.GetUserId(a.database, "S0000000")
+	activity.UpdatedBy, err = common.GetCurrentUserId(a.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewActivityHandlerError("Internal error while updating activity (GetUserId).")
diff --git a/internal/app/common/user_id.go b/internal/app/common/user_id.go
index 54d450cb..5a2aa442 100644
--- a/internal/app/common/user_id.go
+++ b/internal/app/common/user_id.go
@@ -7,7 +7,11 @@ import (
 	"github.com/cloudoperators/heureka/internal/entity"
 )
 
-func GetUserId(db database.Database, uniqueUserId string) (int64, error) {
+func GetCurrentUserId(db database.Database) (int64, error) {
+	return getUserIdFromDb(db, "S0000000")
+}
+
+func getUserIdFromDb(db database.Database, uniqueUserId string) (int64, error) {
 	filter := &entity.UserFilter{UniqueUserID: []*string{&uniqueUserId}}
 	ids, err := db.GetAllUserIds(filter)
 	if err != nil {
diff --git a/internal/app/component/component_handler.go b/internal/app/component/component_handler.go
index df6fd489..975635c6 100644
--- a/internal/app/component/component_handler.go
+++ b/internal/app/component/component_handler.go
@@ -116,7 +116,7 @@ func (cs *componentHandler) CreateComponent(component *entity.Component) (*entit
 	})
 
 	var err error
-	component.CreatedBy, err = common.GetUserId(cs.database, "S0000000")
+	component.CreatedBy, err = common.GetCurrentUserId(cs.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewUserHandlerError("Internal error while creating component (GetUserId).")
@@ -152,7 +152,7 @@ func (cs *componentHandler) UpdateComponent(component *entity.Component) (*entit
 	})
 
 	var err error
-	component.UpdatedBy, err = common.GetUserId(cs.database, "S0000000")
+	component.UpdatedBy, err = common.GetCurrentUserId(cs.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewUserHandlerError("Internal error while updating component (GetUserId).")
diff --git a/internal/app/component_instance/component_instance_handler.go b/internal/app/component_instance/component_instance_handler.go
index ae13f1f3..129c361d 100644
--- a/internal/app/component_instance/component_instance_handler.go
+++ b/internal/app/component_instance/component_instance_handler.go
@@ -117,7 +117,7 @@ func (ci *componentInstanceHandler) CreateComponentInstance(componentInstance *e
 	})
 
 	var err error
-	componentInstance.CreatedBy, err = common.GetUserId(ci.database, "S0000000")
+	componentInstance.CreatedBy, err = common.GetCurrentUserId(ci.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewComponentInstanceHandlerError("Internal error while creating componentInstance (GetUserId).")
@@ -144,7 +144,7 @@ func (ci *componentInstanceHandler) UpdateComponentInstance(componentInstance *e
 	})
 
 	var err error
-	componentInstance.UpdatedBy, err = common.GetUserId(ci.database, "S0000000")
+	componentInstance.UpdatedBy, err = common.GetCurrentUserId(ci.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewComponentInstanceHandlerError("Internal error while updating componentInstance (GetUserId).")
diff --git a/internal/app/component_version/component_version_handler.go b/internal/app/component_version/component_version_handler.go
index 7663df4e..1ae6b932 100644
--- a/internal/app/component_version/component_version_handler.go
+++ b/internal/app/component_version/component_version_handler.go
@@ -115,7 +115,7 @@ func (cv *componentVersionHandler) CreateComponentVersion(componentVersion *enti
 	})
 
 	var err error
-	componentVersion.CreatedBy, err = common.GetUserId(cv.database, "S0000000")
+	componentVersion.CreatedBy, err = common.GetCurrentUserId(cv.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewComponentVersionHandlerError("Internal error while creating componentVersion (GetUserId).")
@@ -146,7 +146,7 @@ func (cv *componentVersionHandler) UpdateComponentVersion(componentVersion *enti
 	})
 
 	var err error
-	componentVersion.UpdatedBy, err = common.GetUserId(cv.database, "S0000000")
+	componentVersion.UpdatedBy, err = common.GetCurrentUserId(cv.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewComponentVersionHandlerError("Internal error while updating componentVersion (GetUserId).")
diff --git a/internal/app/evidence/evidence_handler.go b/internal/app/evidence/evidence_handler.go
index a7c553de..6363d608 100644
--- a/internal/app/evidence/evidence_handler.go
+++ b/internal/app/evidence/evidence_handler.go
@@ -110,7 +110,7 @@ func (e *evidenceHandler) CreateEvidence(evidence *entity.Evidence) (*entity.Evi
 	})
 
 	var err error
-	evidence.CreatedBy, err = common.GetUserId(e.database, "S0000000")
+	evidence.CreatedBy, err = common.GetCurrentUserId(e.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewEvidenceHandlerError("Internal error while creating evidence (GetUserId).")
@@ -135,7 +135,7 @@ func (e *evidenceHandler) UpdateEvidence(evidence *entity.Evidence) (*entity.Evi
 	})
 
 	var err error
-	evidence.UpdatedBy, err = common.GetUserId(e.database, "S0000000")
+	evidence.UpdatedBy, err = common.GetCurrentUserId(e.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewEvidenceHandlerError("Internal error while updating evidence (GetUserId).")
diff --git a/internal/app/issue/issue_handler.go b/internal/app/issue/issue_handler.go
index 038fb595..be19aff1 100644
--- a/internal/app/issue/issue_handler.go
+++ b/internal/app/issue/issue_handler.go
@@ -171,7 +171,7 @@ func (is *issueHandler) CreateIssue(issue *entity.Issue) (*entity.Issue, error)
 	})
 
 	var err error
-	issue.CreatedBy, err = common.GetUserId(is.database, "S0000000")
+	issue.CreatedBy, err = common.GetCurrentUserId(is.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueHandlerError("Internal error while creating issue (GetUserId).")
@@ -206,7 +206,7 @@ func (is *issueHandler) UpdateIssue(issue *entity.Issue) (*entity.Issue, error)
 	})
 
 	var err error
-	issue.UpdatedBy, err = common.GetUserId(is.database, "S0000000")
+	issue.UpdatedBy, err = common.GetCurrentUserId(is.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueHandlerError("Internal error while updating issue (GetUserId).")
diff --git a/internal/app/issue_match/issue_match_handler.go b/internal/app/issue_match/issue_match_handler.go
index 7fd1b18b..834a0fb8 100644
--- a/internal/app/issue_match/issue_match_handler.go
+++ b/internal/app/issue_match/issue_match_handler.go
@@ -142,7 +142,7 @@ func (im *issueMatchHandler) CreateIssueMatch(issueMatch *entity.IssueMatch) (*e
 	})
 
 	var err error
-	issueMatch.CreatedBy, err = common.GetUserId(im.database, "S0000000")
+	issueMatch.CreatedBy, err = common.GetCurrentUserId(im.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueMatchHandlerError("Internal error while retrieving effective severity (GetUserId).")
@@ -183,7 +183,7 @@ func (im *issueMatchHandler) UpdateIssueMatch(issueMatch *entity.IssueMatch) (*e
 	})
 
 	var err error
-	issueMatch.UpdatedBy, err = common.GetUserId(im.database, "S0000000")
+	issueMatch.UpdatedBy, err = common.GetCurrentUserId(im.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueMatchHandlerError("Internal error while retrieving effective severity (GetUserId).")
diff --git a/internal/app/issue_match_change/issue_match_change_handler.go b/internal/app/issue_match_change/issue_match_change_handler.go
index 76004cc4..e2b32ef0 100644
--- a/internal/app/issue_match_change/issue_match_change_handler.go
+++ b/internal/app/issue_match_change/issue_match_change_handler.go
@@ -114,7 +114,7 @@ func (imc *issueMatchChangeHandler) CreateIssueMatchChange(issueMatchChange *ent
 	})
 
 	var err error
-	issueMatchChange.CreatedBy, err = common.GetUserId(imc.database, "S0000000")
+	issueMatchChange.CreatedBy, err = common.GetCurrentUserId(imc.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueMatchChangeHandlerError("Internal error while creating issueMatchChange (GetUserId).")
@@ -141,7 +141,7 @@ func (imc *issueMatchChangeHandler) UpdateIssueMatchChange(issueMatchChange *ent
 	})
 
 	var err error
-	issueMatchChange.UpdatedBy, err = common.GetUserId(imc.database, "S0000000")
+	issueMatchChange.UpdatedBy, err = common.GetCurrentUserId(imc.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueMatchChangeHandlerError("Internal error while updating issueMatchChange (GetUserId).")
diff --git a/internal/app/issue_repository/issue_repository_handler.go b/internal/app/issue_repository/issue_repository_handler.go
index 94859014..f6e4fded 100644
--- a/internal/app/issue_repository/issue_repository_handler.go
+++ b/internal/app/issue_repository/issue_repository_handler.go
@@ -113,7 +113,7 @@ func (ir *issueRepositoryHandler) CreateIssueRepository(issueRepository *entity.
 	})
 
 	var err error
-	issueRepository.BaseIssueRepository.CreatedBy, err = common.GetUserId(ir.database, "S0000000")
+	issueRepository.BaseIssueRepository.CreatedBy, err = common.GetCurrentUserId(ir.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueRepositoryHandlerError("Internal error while creating issueRepository (GetUserId).")
@@ -150,7 +150,7 @@ func (ir *issueRepositoryHandler) UpdateIssueRepository(issueRepository *entity.
 	})
 
 	var err error
-	issueRepository.BaseIssueRepository.UpdatedBy, err = common.GetUserId(ir.database, "S0000000")
+	issueRepository.BaseIssueRepository.UpdatedBy, err = common.GetCurrentUserId(ir.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueRepositoryHandlerError("Internal error while updating issueRepository (GetUserId).")
diff --git a/internal/app/issue_variant/issue_variant_handler.go b/internal/app/issue_variant/issue_variant_handler.go
index da6afbf1..7f8bfd1f 100644
--- a/internal/app/issue_variant/issue_variant_handler.go
+++ b/internal/app/issue_variant/issue_variant_handler.go
@@ -179,7 +179,7 @@ func (iv *issueVariantHandler) CreateIssueVariant(issueVariant *entity.IssueVari
 	})
 
 	var err error
-	issueVariant.CreatedBy, err = common.GetUserId(iv.database, "S0000000")
+	issueVariant.CreatedBy, err = common.GetCurrentUserId(iv.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueVariantHandlerError("Internal error while creating issueVariant (GetUserId).")
@@ -216,7 +216,7 @@ func (iv *issueVariantHandler) UpdateIssueVariant(issueVariant *entity.IssueVari
 	})
 
 	var err error
-	issueVariant.UpdatedBy, err = common.GetUserId(iv.database, "S0000000")
+	issueVariant.UpdatedBy, err = common.GetCurrentUserId(iv.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewIssueVariantHandlerError("Internal error while updating issueVariant (GetUserId).")
diff --git a/internal/app/service/service_handler.go b/internal/app/service/service_handler.go
index fe6d61ba..72a31f72 100644
--- a/internal/app/service/service_handler.go
+++ b/internal/app/service/service_handler.go
@@ -165,7 +165,7 @@ func (s *serviceHandler) CreateService(service *entity.Service) (*entity.Service
 	})
 
 	var err error
-	service.BaseService.CreatedBy, err = common.GetUserId(s.database, "S0000000")
+	service.BaseService.CreatedBy, err = common.GetCurrentUserId(s.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewServiceHandlerError("Internal error while creating service (GetUserId).")
@@ -201,7 +201,7 @@ func (s *serviceHandler) UpdateService(service *entity.Service) (*entity.Service
 	})
 
 	var err error
-	service.BaseService.UpdatedBy, err = common.GetUserId(s.database, "S0000000")
+	service.BaseService.UpdatedBy, err = common.GetCurrentUserId(s.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewServiceHandlerError("Internal error while updating service (GetUserId).")
diff --git a/internal/app/support_group/support_group_handler.go b/internal/app/support_group/support_group_handler.go
index 34ce5bce..7c3e68c6 100644
--- a/internal/app/support_group/support_group_handler.go
+++ b/internal/app/support_group/support_group_handler.go
@@ -143,7 +143,7 @@ func (sg *supportGroupHandler) CreateSupportGroup(supportGroup *entity.SupportGr
 	}
 
 	var err error
-	supportGroup.CreatedBy, err = common.GetUserId(sg.database, "S0000000")
+	supportGroup.CreatedBy, err = common.GetCurrentUserId(sg.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewSupportGroupHandlerError("Internal error while creating supportGroup (GetUserId).")
@@ -181,7 +181,7 @@ func (sg *supportGroupHandler) UpdateSupportGroup(supportGroup *entity.SupportGr
 	})
 
 	var err error
-	supportGroup.UpdatedBy, err = common.GetUserId(sg.database, "S0000000")
+	supportGroup.UpdatedBy, err = common.GetCurrentUserId(sg.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewSupportGroupHandlerError("Internal error while updating supportGroup (GetUserId).")
diff --git a/internal/app/user/user_handler.go b/internal/app/user/user_handler.go
index 40a05a09..e8ad6461 100644
--- a/internal/app/user/user_handler.go
+++ b/internal/app/user/user_handler.go
@@ -113,7 +113,7 @@ func (u *userHandler) CreateUser(user *entity.User) (*entity.User, error) {
 	})
 
 	var err error
-	user.CreatedBy, err = common.GetUserId(u.database, "S0000000")
+	user.CreatedBy, err = common.GetCurrentUserId(u.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewUserHandlerError("Internal error while creating user (GetUserId).")
@@ -149,7 +149,7 @@ func (u *userHandler) UpdateUser(user *entity.User) (*entity.User, error) {
 	})
 
 	var err error
-	user.UpdatedBy, err = common.GetUserId(u.database, "S0000000")
+	user.UpdatedBy, err = common.GetCurrentUserId(u.database)
 	if err != nil {
 		l.Error(err)
 		return nil, NewUserHandlerError("Internal error while updating user (GetUserId).")
diff --git a/internal/database/mariadb/entity.go b/internal/database/mariadb/entity.go
index 3dbeb3bb..b7b04e2c 100644
--- a/internal/database/mariadb/entity.go
+++ b/internal/database/mariadb/entity.go
@@ -1,10 +1,6 @@
 // SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
 // SPDX-License-Identifier: Apache-2.0
 
-//TODO: add Metadata type for mariadb package
-//TODO: add Metadata converter mariadb - entity
-//TODO: add Metadata converter entity - mariadb
-
 package mariadb
 
 import (
diff --git a/internal/database/mariadb/test/database_manager.go b/internal/database/mariadb/test/database_manager.go
index 90f28d88..8006d2e9 100644
--- a/internal/database/mariadb/test/database_manager.go
+++ b/internal/database/mariadb/test/database_manager.go
@@ -149,7 +149,7 @@ func (dbm *LocalTestDataBaseManager) NewTestSchema() *mariadb.SqlDatabase {
 	dbm.Schemas = append(dbm.Schemas, schemaName)
 	dbm.CurrentSchema = schemaName
 	dbm.Config.DBName = schemaName
-	dbm.Config.AuthType = "none" //TODO: move config stuff to e2e/common
+	dbm.Config.AuthType = "none"
 
 	err := dbm.dbClient.SetupSchema(dbm.Config.Config)
 	if err != nil {
diff --git a/internal/entity/activity.go b/internal/entity/activity.go
index c43aca98..2bb0ffa5 100644
--- a/internal/entity/activity.go
+++ b/internal/entity/activity.go
@@ -53,11 +53,9 @@ type ActivityHasIssue struct {
 }
 
 type ActivityAggregations struct {
-	Metadata
 }
 
 type ActivityFilter struct {
-	Metadata
 	Paginated
 	Status      []*string `json:"status"`
 	ServiceCCRN []*string `json:"service_ccrn"`
diff --git a/internal/entity/common.go b/internal/entity/common.go
index 8610116c..ffa06728 100644
--- a/internal/entity/common.go
+++ b/internal/entity/common.go
@@ -96,7 +96,6 @@ type ResultList struct {
 }
 
 type ListOptions struct {
-	Metadata
 	ShowTotalCount      bool `json:"show_total_count"`
 	ShowPageInfo        bool `json:"show_page_info"`
 	IncludeAggregations bool `json:"include_aggregations"`
@@ -111,7 +110,6 @@ func NewListOptions() *ListOptions {
 }
 
 type PageInfo struct {
-	Metadata
 	HasNextPage     *bool   `json:"has_next_page,omitempty"`
 	HasPreviousPage *bool   `json:"has_previous_page,omitempty"`
 	IsValidPage     *bool   `json:"is_valid_page,omitempty"`
@@ -123,7 +121,6 @@ type PageInfo struct {
 }
 
 type Page struct {
-	Metadata
 	After      *string `json:"after,omitempty"`
 	PageNumber *int    `json:"page_number,omitempty"`
 	IsCurrent  bool    `json:"is_current,omitempty"`
@@ -137,13 +134,11 @@ type List[T interface{}] struct {
 }
 
 type TimeFilter struct {
-	Metadata
 	After  time.Time `json:"after"`
 	Before time.Time `json:"before"`
 }
 
 type Paginated struct {
-	Metadata
 	First *int   `json:"first"`
 	After *int64 `json:"from"`
 }
@@ -155,7 +150,6 @@ func MaxPaginated() Paginated {
 }
 
 type Severity struct {
-	Metadata
 	Value string
 	Score float64
 	Cvss  Cvss
@@ -197,7 +191,6 @@ func NewSeverity(url string) Severity {
 }
 
 type Cvss struct {
-	Metadata
 	Vector        string
 	Base          *metric.Base
 	Temporal      *metric.Temporal
diff --git a/internal/entity/component.go b/internal/entity/component.go
index d6ef9ced..a5d36fcc 100644
--- a/internal/entity/component.go
+++ b/internal/entity/component.go
@@ -19,7 +19,6 @@ type ComponentResult struct {
 }
 
 type ComponentFilter struct {
-	Metadata
 	Paginated
 	CCRN               []*string `json:"ccrn"`
 	Id                 []*int64  `json:"id"`
@@ -27,5 +26,4 @@ type ComponentFilter struct {
 }
 
 type ComponentAggregations struct {
-	Metadata
 }
diff --git a/internal/entity/component_instance.go b/internal/entity/component_instance.go
index 7773de42..a9249a47 100644
--- a/internal/entity/component_instance.go
+++ b/internal/entity/component_instance.go
@@ -4,7 +4,6 @@
 package entity
 
 type ComponentInstanceFilter struct {
-	Metadata
 	Paginated
 	IssueMatchId       []*int64  `json:"issue_match_id"`
 	ServiceId          []*int64  `json:"service_id"`
@@ -16,7 +15,6 @@ type ComponentInstanceFilter struct {
 }
 
 type ComponentInstanceAggregations struct {
-	Metadata
 }
 
 type ComponentInstanceResult struct {
diff --git a/internal/entity/component_version.go b/internal/entity/component_version.go
index ee25bf2e..1d76d1f4 100644
--- a/internal/entity/component_version.go
+++ b/internal/entity/component_version.go
@@ -4,7 +4,6 @@
 package entity
 
 type ComponentVersionFilter struct {
-	Metadata
 	Paginated
 	Id            []*int64  `json:"id"`
 	IssueId       []*int64  `json:"issue_id"`
@@ -14,7 +13,6 @@ type ComponentVersionFilter struct {
 }
 
 type ComponentVersionAggregations struct {
-	Metadata
 }
 
 type ComponentVersionResult struct {
diff --git a/internal/entity/evidence.go b/internal/entity/evidence.go
index e68f93fb..ae6becf5 100644
--- a/internal/entity/evidence.go
+++ b/internal/entity/evidence.go
@@ -55,7 +55,6 @@ type Evidence struct {
 }
 
 type EvidenceFilter struct {
-	Metadata
 	Paginated
 	Id           []*int64 `json:"id"`
 	ActivityId   []*int64 `json:"activity_id"`
@@ -63,7 +62,6 @@ type EvidenceFilter struct {
 	UserId       []*int64 `json:"user_id"`
 }
 type EvidenceAggregations struct {
-	Metadata
 }
 
 type EvidenceResult struct {
diff --git a/internal/entity/issue.go b/internal/entity/issue.go
index 59dc1fe9..44e52129 100644
--- a/internal/entity/issue.go
+++ b/internal/entity/issue.go
@@ -8,7 +8,6 @@ import (
 )
 
 type IssueWithAggregations struct {
-	Metadata
 	IssueAggregations
 	Issue
 }
@@ -51,7 +50,6 @@ type IssueResult struct {
 }
 
 type IssueFilter struct {
-	Metadata
 	Paginated
 	PrimaryName                     []*string   `json:"primary_name"`
 	ServiceCCRN                     []*string   `json:"service_ccrn"`
@@ -68,7 +66,6 @@ type IssueFilter struct {
 }
 
 type IssueAggregations struct {
-	Metadata
 	Activities                    int64
 	IssueMatches                  int64
 	AffectedServices              int64
@@ -91,13 +88,11 @@ type Issue struct {
 }
 
 type IssueCount struct {
-	Metadata
 	Count int64     `json:"count"`
 	Type  IssueType `json:"type"`
 }
 
 type IssueTypeCounts struct {
-	Metadata
 	VulnerabilityCount   int64 `json:"vulnerability_count"`
 	PolicyViolationCount int64 `json:"policy_violation_count"`
 	SecurityEventCount   int64 `json:"security_event_count"`
diff --git a/internal/entity/issue_match.go b/internal/entity/issue_match.go
index 3b311efe..8e020893 100644
--- a/internal/entity/issue_match.go
+++ b/internal/entity/issue_match.go
@@ -55,7 +55,6 @@ type IssueMatch struct {
 }
 
 type IssueMatchFilter struct {
-	Metadata
 	Paginated
 	Id                  []*int64  `json:"id"`
 	AffectedServiceCCRN []*string `json:"affected_service_ccrn"`
diff --git a/internal/entity/issue_match_change.go b/internal/entity/issue_match_change.go
index 69122b36..bbcd54a5 100644
--- a/internal/entity/issue_match_change.go
+++ b/internal/entity/issue_match_change.go
@@ -40,7 +40,6 @@ type IssueMatchChange struct {
 }
 
 type IssueMatchChangeFilter struct {
-	Metadata
 	Paginated
 	Id           []*int64  `json:"id"`
 	ActivityId   []*int64  `json:"activity_id"`
diff --git a/internal/entity/issue_repository.go b/internal/entity/issue_repository.go
index 4ce40a12..4456a549 100644
--- a/internal/entity/issue_repository.go
+++ b/internal/entity/issue_repository.go
@@ -13,7 +13,6 @@ type BaseIssueRepository struct {
 }
 
 type IssueRepositoryFilter struct {
-	Metadata
 	Paginated
 	Id          []*int64  `json:"id"`
 	ServiceId   []*int64  `json:"service_id"`
@@ -35,7 +34,6 @@ func NewIssueRepositoryFilter() *IssueRepositoryFilter {
 }
 
 type IssueRepositoryAggregations struct {
-	Metadata
 }
 
 type IssueRepository struct {
diff --git a/internal/entity/issue_variant.go b/internal/entity/issue_variant.go
index cc4fb5fa..3b891740 100644
--- a/internal/entity/issue_variant.go
+++ b/internal/entity/issue_variant.go
@@ -16,7 +16,6 @@ type IssueVariant struct {
 }
 
 type IssueVariantFilter struct {
-	Metadata
 	Paginated
 	Id                []*int64  `json:"id"`
 	SecondaryName     []*string `json:"secondary_name"`
@@ -42,7 +41,6 @@ func NewIssueVariantFilter() *IssueVariantFilter {
 }
 
 type IssueVariantAggregations struct {
-	Metadata
 }
 
 type IssueVariantResult struct {
diff --git a/internal/entity/service.go b/internal/entity/service.go
index e43f0f02..6143396d 100644
--- a/internal/entity/service.go
+++ b/internal/entity/service.go
@@ -17,7 +17,6 @@ type BaseService struct {
 }
 
 type ServiceAggregations struct {
-	Metadata
 	ComponentInstances int64
 	IssueMatches       int64
 }
@@ -28,7 +27,6 @@ type ServiceWithAggregations struct {
 }
 
 type ServiceFilter struct {
-	Metadata
 	Paginated
 	SupportGroupCCRN    []*string `json:"support_group_ccrn"`
 	Id                  []*int64  `json:"id"`
diff --git a/internal/entity/severity.go b/internal/entity/severity.go
index db979d54..afbef6a3 100644
--- a/internal/entity/severity.go
+++ b/internal/entity/severity.go
@@ -14,7 +14,6 @@ const (
 )
 
 type SeverityFilter struct {
-	Metadata
 	IssueMatchId []*int64 `json:"issue_match_id"`
 	IssueId      []*int64 `json:"issue_id"`
 }
diff --git a/internal/entity/support_group.go b/internal/entity/support_group.go
index 2aece7d5..75382eb3 100644
--- a/internal/entity/support_group.go
+++ b/internal/entity/support_group.go
@@ -12,7 +12,6 @@ type SupportGroup struct {
 }
 
 type SupportGroupFilter struct {
-	Metadata
 	Paginated
 	Id        []*int64  `json:"id"`
 	ServiceId []*int64  `json:"service_id"`
@@ -21,7 +20,6 @@ type SupportGroupFilter struct {
 }
 
 type SupportGroupAggregations struct {
-	Metadata
 }
 
 type SupportGroupResult struct {
diff --git a/internal/entity/user.go b/internal/entity/user.go
index da53a7ac..4f373bcd 100644
--- a/internal/entity/user.go
+++ b/internal/entity/user.go
@@ -20,7 +20,6 @@ type User struct {
 }
 
 type UserFilter struct {
-	Metadata
 	Paginated
 	Name           []*string  `json:"name"`
 	UniqueUserID   []*string  `json:"uniqueUserId"`
@@ -31,7 +30,6 @@ type UserFilter struct {
 }
 
 type UserAggregations struct {
-	Metadata
 }
 
 type UserResult struct {