diff --git a/pkg/.mockery.yaml b/pkg/.mockery.yaml
index 5f2fd57679..1861862ac5 100644
--- a/pkg/.mockery.yaml
+++ b/pkg/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
diff --git a/pkg/oidc/mocks/oidc_client.go b/pkg/oidc/mocks/oidc_client.go
index 6ad00f6ada..10f8ad8a39 100644
--- a/pkg/oidc/mocks/oidc_client.go
+++ b/pkg/oidc/mocks/oidc_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/protogen/.mockery.yaml b/protogen/.mockery.yaml
index 1cf01bc120..e3b0bab5b7 100644
--- a/protogen/.mockery.yaml
+++ b/protogen/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "{{.InterfaceDir}}/mocks"
 mockname: "{{.InterfaceName}}"
diff --git a/services/antivirus/.mockery.yaml b/services/antivirus/.mockery.yaml
index 8d3a6a1399..c61a87442d 100644
--- a/services/antivirus/.mockery.yaml
+++ b/services/antivirus/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "pkg/{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
diff --git a/services/antivirus/pkg/scanners/mocks/scanner.go b/services/antivirus/pkg/scanners/mocks/scanner.go
index 0e54e6b88c..e7d73743b4 100644
--- a/services/antivirus/pkg/scanners/mocks/scanner.go
+++ b/services/antivirus/pkg/scanners/mocks/scanner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/collaboration/.mockery.yaml b/services/collaboration/.mockery.yaml
index d2820043dc..6e5f2443e2 100644
--- a/services/collaboration/.mockery.yaml
+++ b/services/collaboration/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
diff --git a/services/collaboration/mocks/connector_service.go b/services/collaboration/mocks/connector_service.go
index ee17ddff09..15c337cb27 100644
--- a/services/collaboration/mocks/connector_service.go
+++ b/services/collaboration/mocks/connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/collaboration/mocks/content_connector_service.go b/services/collaboration/mocks/content_connector_service.go
index 37e2b11363..9e9b2af498 100644
--- a/services/collaboration/mocks/content_connector_service.go
+++ b/services/collaboration/mocks/content_connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/collaboration/mocks/file_connector_service.go b/services/collaboration/mocks/file_connector_service.go
index c40b382086..0bf401a7e6 100644
--- a/services/collaboration/mocks/file_connector_service.go
+++ b/services/collaboration/mocks/file_connector_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/collaboration/mocks/gateway_selector.go b/services/collaboration/mocks/gateway_selector.go
index e79ace9e0c..315aba044c 100644
--- a/services/collaboration/mocks/gateway_selector.go
+++ b/services/collaboration/mocks/gateway_selector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
@@ -8,11 +8,11 @@ import (
 )
 
 // Selectable is an autogenerated mock type for the Selectable type
-type Selectable[T interface{}] struct {
+type Selectable[T any] struct {
 	mock.Mock
 }
 
-type Selectable_Expecter[T interface{}] struct {
+type Selectable_Expecter[T any] struct {
 	mock *mock.Mock
 }
 
@@ -57,7 +57,7 @@ func (_m *Selectable[T]) Next(opts ...pool.Option) (T, error) {
 }
 
 // Selectable_Next_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Next'
-type Selectable_Next_Call[T interface{}] struct {
+type Selectable_Next_Call[T any] struct {
 	*mock.Call
 }
 
@@ -93,7 +93,7 @@ func (_c *Selectable_Next_Call[T]) RunAndReturn(run func(...pool.Option) (T, err
 
 // NewSelectable creates a new instance of Selectable. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewSelectable[T interface{}](t interface {
+func NewSelectable[T any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *Selectable[T] {
diff --git a/services/collaboration/mocks/lock_parser.go b/services/collaboration/mocks/lock_parser.go
index 7e6e106886..41f97e05b8 100644
--- a/services/collaboration/mocks/lock_parser.go
+++ b/services/collaboration/mocks/lock_parser.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/.mockery.yaml b/services/graph/.mockery.yaml
index b70759ca20..163e6e23ce 100644
--- a/services/graph/.mockery.yaml
+++ b/services/graph/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
diff --git a/services/graph/mocks/base_graph_provider.go b/services/graph/mocks/base_graph_provider.go
index f1b95ad1ff..46ebdf666b 100644
--- a/services/graph/mocks/base_graph_provider.go
+++ b/services/graph/mocks/base_graph_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/mocks/drive_item_permissions_provider.go b/services/graph/mocks/drive_item_permissions_provider.go
index c34bc71fc2..49be6fd567 100644
--- a/services/graph/mocks/drive_item_permissions_provider.go
+++ b/services/graph/mocks/drive_item_permissions_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/mocks/drives_drive_item_provider.go b/services/graph/mocks/drives_drive_item_provider.go
index 4d07847909..6ee63e4767 100644
--- a/services/graph/mocks/drives_drive_item_provider.go
+++ b/services/graph/mocks/drives_drive_item_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/mocks/gateway_selector.go b/services/graph/mocks/gateway_selector.go
index e79ace9e0c..315aba044c 100644
--- a/services/graph/mocks/gateway_selector.go
+++ b/services/graph/mocks/gateway_selector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
@@ -8,11 +8,11 @@ import (
 )
 
 // Selectable is an autogenerated mock type for the Selectable type
-type Selectable[T interface{}] struct {
+type Selectable[T any] struct {
 	mock.Mock
 }
 
-type Selectable_Expecter[T interface{}] struct {
+type Selectable_Expecter[T any] struct {
 	mock *mock.Mock
 }
 
@@ -57,7 +57,7 @@ func (_m *Selectable[T]) Next(opts ...pool.Option) (T, error) {
 }
 
 // Selectable_Next_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Next'
-type Selectable_Next_Call[T interface{}] struct {
+type Selectable_Next_Call[T any] struct {
 	*mock.Call
 }
 
@@ -93,7 +93,7 @@ func (_c *Selectable_Next_Call[T]) RunAndReturn(run func(...pool.Option) (T, err
 
 // NewSelectable creates a new instance of Selectable. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewSelectable[T interface{}](t interface {
+func NewSelectable[T any](t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *Selectable[T] {
diff --git a/services/graph/mocks/http_client.go b/services/graph/mocks/http_client.go
index 0c29f9e883..96e964d4de 100644
--- a/services/graph/mocks/http_client.go
+++ b/services/graph/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/mocks/permissions.go b/services/graph/mocks/permissions.go
index 60931c7073..586373ec64 100644
--- a/services/graph/mocks/permissions.go
+++ b/services/graph/mocks/permissions.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/mocks/publisher.go b/services/graph/mocks/publisher.go
index 7b9cc6d8f7..4f67dd8063 100644
--- a/services/graph/mocks/publisher.go
+++ b/services/graph/mocks/publisher.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/mocks/role_service.go b/services/graph/mocks/role_service.go
index 1407f3273b..7009aaddc9 100644
--- a/services/graph/mocks/role_service.go
+++ b/services/graph/mocks/role_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/pkg/identity/mocks/backend.go b/services/graph/pkg/identity/mocks/backend.go
index c26ae8b256..a03709ebb3 100644
--- a/services/graph/pkg/identity/mocks/backend.go
+++ b/services/graph/pkg/identity/mocks/backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/pkg/identity/mocks/education_backend.go b/services/graph/pkg/identity/mocks/education_backend.go
index 716f0adde0..6d875a00a3 100644
--- a/services/graph/pkg/identity/mocks/education_backend.go
+++ b/services/graph/pkg/identity/mocks/education_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/graph/pkg/identity/mocks/ldapclient.go b/services/graph/pkg/identity/mocks/ldapclient.go
index dbfad7fa92..4d6f3d1300 100644
--- a/services/graph/pkg/identity/mocks/ldapclient.go
+++ b/services/graph/pkg/identity/mocks/ldapclient.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/invitations/.mockery.yaml b/services/invitations/.mockery.yaml
index 05f63a84ee..84d1859941 100644
--- a/services/invitations/.mockery.yaml
+++ b/services/invitations/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
diff --git a/services/invitations/pkg/backends/keycloak/mocks/client.go b/services/invitations/pkg/backends/keycloak/mocks/client.go
index fff2474a71..dcadd960f2 100644
--- a/services/invitations/pkg/backends/keycloak/mocks/client.go
+++ b/services/invitations/pkg/backends/keycloak/mocks/client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/proxy/.mockery.yaml b/services/proxy/.mockery.yaml
index bfd9534bd9..7491d9e4c4 100644
--- a/services/proxy/.mockery.yaml
+++ b/services/proxy/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
diff --git a/services/proxy/pkg/user/backend/mocks/user_backend.go b/services/proxy/pkg/user/backend/mocks/user_backend.go
index af1aed5a7f..101f8f6f6a 100644
--- a/services/proxy/pkg/user/backend/mocks/user_backend.go
+++ b/services/proxy/pkg/user/backend/mocks/user_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/proxy/pkg/userroles/mocks/user_role_assigner.go b/services/proxy/pkg/userroles/mocks/user_role_assigner.go
index b683b1a4c5..0549f79598 100644
--- a/services/proxy/pkg/userroles/mocks/user_role_assigner.go
+++ b/services/proxy/pkg/userroles/mocks/user_role_assigner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/search/.mockery.yaml b/services/search/.mockery.yaml
index 8faa854b34..b106c9b0d7 100644
--- a/services/search/.mockery.yaml
+++ b/services/search/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 dir: "pkg/{{.PackageName}}/mocks"
 mockname: "{{.InterfaceName}}"
diff --git a/services/search/pkg/content/mocks/extractor.go b/services/search/pkg/content/mocks/extractor.go
index b12f297787..8c3a03b75e 100644
--- a/services/search/pkg/content/mocks/extractor.go
+++ b/services/search/pkg/content/mocks/extractor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/search/pkg/content/mocks/retriever.go b/services/search/pkg/content/mocks/retriever.go
index 9db2b19696..b0b73b20d5 100644
--- a/services/search/pkg/content/mocks/retriever.go
+++ b/services/search/pkg/content/mocks/retriever.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/search/pkg/engine/mocks/engine.go b/services/search/pkg/engine/mocks/engine.go
index 0e3ebe88b3..37c284671f 100644
--- a/services/search/pkg/engine/mocks/engine.go
+++ b/services/search/pkg/engine/mocks/engine.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/search/pkg/search/mocks/searcher.go b/services/search/pkg/search/mocks/searcher.go
index 6be1075729..1ac11e700c 100644
--- a/services/search/pkg/search/mocks/searcher.go
+++ b/services/search/pkg/search/mocks/searcher.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks
 
diff --git a/services/settings/.mockery.yaml b/services/settings/.mockery.yaml
index 08f66a3395..13059caef7 100644
--- a/services/settings/.mockery.yaml
+++ b/services/settings/.mockery.yaml
@@ -1,4 +1,7 @@
+issue-845-fix: True
+resolve-type-alias: False
 with-expecter: true
+disable-version-string: True
 filename: "{{.InterfaceName | snakecase }}.go"
 mockname: "{{.InterfaceName}}"
 outpkg: "mocks"
diff --git a/services/settings/pkg/settings/mocks/manager.go b/services/settings/pkg/settings/mocks/manager.go
index b254d6517c..acd8097766 100644
--- a/services/settings/pkg/settings/mocks/manager.go
+++ b/services/settings/pkg/settings/mocks/manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.53.2. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.
 
 package mocks