diff --git a/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts b/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts
index 7a2cb95ab..7877ba686 100644
--- a/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts
+++ b/federation/src/graphql/api/1_0/resolver/AuthenticationResolver.ts
@@ -1,10 +1,12 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Arg, Mutation, Resolver } from 'type-graphql'
 import { federationLogger as logger } from '@/server/logger'
-import { Community as DbCommunity } from 'database'
-import { FederatedCommunity as DbFedCommunity } from 'database'
-import { CommunityLoggingView } from 'database'
-import { FederatedCommunityLoggingView } from 'database'
+import {
+  Community as DbCommunity,
+  FederatedCommunity as DbFedCommunity,
+  CommunityLoggingView,
+  FederatedCommunityLoggingView,
+} from 'database'
 import { LogError } from '@/server/LogError'
 import { OpenConnectionArgs } from '../model/OpenConnectionArgs'
 import { startAuthentication, startOpenConnectionCallback } from '../util/authenticateCommunity'
diff --git a/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.test.ts b/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.test.ts
index 1a9b8a0e0..096469d3c 100644
--- a/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.test.ts
+++ b/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.test.ts
@@ -1,10 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ApolloServerTestClient } from 'apollo-server-testing'
-import { Community as DbCommunity } from 'database'
+import { Community as DbCommunity, User as DbUser, UserContact as DbUserContact } from 'database'
 import CONFIG from '@/config'
-import { User as DbUser } from 'database'
-import { UserContact as DbUserContact } from 'database'
 import { fullName } from '@/graphql/util/fullName'
 import { GraphQLError } from 'graphql'
 import { cleanDB, testEnvironment } from '@test/helpers'
diff --git a/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.ts b/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.ts
index 47b4a41ca..a767d3310 100644
--- a/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.ts
+++ b/federation/src/graphql/api/1_0/resolver/SendCoinsResolver.ts
@@ -1,8 +1,10 @@
 import { Arg, Mutation, Resolver } from 'type-graphql'
 import { federationLogger as logger } from '@/server/logger'
-import { PendingTransactionLoggingView } from 'database'
-import { Community as DbCommunity } from 'database'
-import { PendingTransaction as DbPendingTransaction } from 'database'
+import {
+  PendingTransactionLoggingView,
+  Community as DbCommunity,
+  PendingTransaction as DbPendingTransaction,
+} from 'database'
 import { SendCoinsArgs } from '../model/SendCoinsArgs'
 import { LogError } from '@/server/LogError'
 import { PendingTransactionState } from '../enum/PendingTransactionState'
diff --git a/federation/src/graphql/api/1_0/util/authenticateCommunity.ts b/federation/src/graphql/api/1_0/util/authenticateCommunity.ts
index 6e64dd761..75ace5d18 100644
--- a/federation/src/graphql/api/1_0/util/authenticateCommunity.ts
+++ b/federation/src/graphql/api/1_0/util/authenticateCommunity.ts
@@ -1,6 +1,10 @@
 import { OpenConnectionArgs } from '../model/OpenConnectionArgs'
-import { Community as DbCommunity } from 'database'
-import { FederatedCommunity as DbFedCommunity } from 'database'
+import {
+  Community as DbCommunity,
+  FederatedCommunity as DbFedCommunity,
+  CommunityLoggingView,
+  FederatedCommunityLoggingView,
+} from 'database'
 import { federationLogger as logger } from '@/server/logger'
 import { OpenConnectionCallbackArgs } from '../model/OpenConnectionCallbackArgs'
 // eslint-disable-next-line camelcase
@@ -9,8 +13,6 @@ import { AuthenticationClientFactory } from '@/client/AuthenticationClientFactor
 // eslint-disable-next-line camelcase
 import { AuthenticationClient as V1_0_AuthenticationClient } from '@/client/1_0/AuthenticationClient'
 import { AuthenticationArgs } from '../model/AuthenticationArgs'
-import { CommunityLoggingView } from 'database'
-import { FederatedCommunityLoggingView } from 'database'
 
 export async function startOpenConnectionCallback(
   args: OpenConnectionArgs,
diff --git a/federation/src/graphql/api/1_0/util/revertSettledReceiveTransaction.ts b/federation/src/graphql/api/1_0/util/revertSettledReceiveTransaction.ts
index 7f14bc07c..1370c965f 100644
--- a/federation/src/graphql/api/1_0/util/revertSettledReceiveTransaction.ts
+++ b/federation/src/graphql/api/1_0/util/revertSettledReceiveTransaction.ts
@@ -3,10 +3,16 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { getConnection } from 'typeorm'
-import { Community as DbCommunity } from 'database'
-import { PendingTransaction as DbPendingTransaction } from 'database'
-import { Transaction as dbTransaction } from 'database'
-import { User as DbUser } from 'database'
+import {
+  Community as DbCommunity,
+  PendingTransaction as DbPendingTransaction,
+  Transaction as dbTransaction,
+  User as DbUser,
+  CommunityLoggingView,
+  UserLoggingView,
+  PendingTransactionLoggingView,
+  TransactionLoggingView,
+} from 'database'
 
 import { PendingTransactionState } from '../enum/PendingTransactionState'
 
@@ -15,10 +21,6 @@ import { federationLogger as logger } from '@/server/logger'
 
 import { getLastTransaction } from '@/graphql/util/getLastTransaction'
 import { TRANSACTIONS_LOCK } from '@/graphql/util/TRANSACTIONS_LOCK'
-import { CommunityLoggingView } from 'database'
-import { UserLoggingView } from 'database'
-import { PendingTransactionLoggingView } from 'database'
-import { TransactionLoggingView } from 'database'
 
 export async function revertSettledReceiveTransaction(
   homeCom: DbCommunity,
diff --git a/federation/src/graphql/api/1_0/util/settlePendingReceiveTransaction.ts b/federation/src/graphql/api/1_0/util/settlePendingReceiveTransaction.ts
index 06d89247b..f532fc680 100644
--- a/federation/src/graphql/api/1_0/util/settlePendingReceiveTransaction.ts
+++ b/federation/src/graphql/api/1_0/util/settlePendingReceiveTransaction.ts
@@ -3,15 +3,15 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { getConnection } from 'typeorm'
-import { 
-  Community as DbCommunity, 
-  CommunityLoggingView, 
-  PendingTransaction as DbPendingTransaction, 
-  PendingTransactionLoggingView, 
-  Transaction as dbTransaction, 
-  TransactionLoggingView, 
-  User as DbUser, 
-  UserLoggingView 
+import {
+  Community as DbCommunity,
+  CommunityLoggingView,
+  PendingTransaction as DbPendingTransaction,
+  PendingTransactionLoggingView,
+  Transaction as dbTransaction,
+  TransactionLoggingView,
+  User as DbUser,
+  UserLoggingView,
 } from 'database'
 
 import { PendingTransactionState } from '../enum/PendingTransactionState'
diff --git a/federation/src/graphql/api/1_0/util/storeForeignUser.ts b/federation/src/graphql/api/1_0/util/storeForeignUser.ts
index b70cc5b8f..a501ead93 100644
--- a/federation/src/graphql/api/1_0/util/storeForeignUser.ts
+++ b/federation/src/graphql/api/1_0/util/storeForeignUser.ts
@@ -1,8 +1,7 @@
-import { User as DbUser } from 'database'
+import { User as DbUser, UserLoggingView } from 'database'
 
 import { federationLogger as logger } from '@/server/logger'
 import { SendCoinsArgs } from '../model/SendCoinsArgs'
-import { UserLoggingView } from 'database'
 import { SendCoinsArgsLoggingView } from '../logger/SendCoinsArgsLogging.view'
 
 export async function storeForeignUser(args: SendCoinsArgs): Promise<boolean> {
diff --git a/federation/src/graphql/util/findUserByIdentifier.ts b/federation/src/graphql/util/findUserByIdentifier.ts
index d99302cc0..7f5e8e329 100644
--- a/federation/src/graphql/util/findUserByIdentifier.ts
+++ b/federation/src/graphql/util/findUserByIdentifier.ts
@@ -1,5 +1,4 @@
-import { User as DbUser } from 'database'
-import { UserContact as DbUserContact } from 'database'
+import { User as DbUser, UserContact as DbUserContact } from 'database'
 import { validate, version } from 'uuid'
 
 import { LogError } from '@/server/LogError'