diff --git a/packages/cardano-services/src/util/DbSyncProvider/DbSyncProvider.ts b/packages/cardano-services/src/util/DbSyncProvider/DbSyncProvider.ts
index f6d057af440..f36688a872a 100644
--- a/packages/cardano-services/src/util/DbSyncProvider/DbSyncProvider.ts
+++ b/packages/cardano-services/src/util/DbSyncProvider/DbSyncProvider.ts
@@ -3,8 +3,9 @@ import { DB_BLOCKS_BEHIND_TOLERANCE, DB_MAX_SAFE_INTEGER, LedgerTipModel, findLe
 import { DEFAULT_HEALTH_CHECK_CACHE_TTL } from '../../Program/options';
 import { InMemoryCache } from '../../InMemoryCache';
 import { Logger } from 'ts-log';
-import { PgConnectionCreator, getPoolClient } from '../../Program';
+import { PgConnectionCreator } from '../../Program/utils';
 import { Pool, PoolClient } from 'pg';
+import { getPoolClient } from '../../Program/services/postgres';
 
 /**
  * Properties that are need to create DbSyncProvider
diff --git a/packages/cardano-services/test/util/DbSyncProvider/DbSyncProvider.test.ts b/packages/cardano-services/test/util/DbSyncProvider/DbSyncProvider.test.ts
index 2b594837d18..df88109f70a 100644
--- a/packages/cardano-services/test/util/DbSyncProvider/DbSyncProvider.test.ts
+++ b/packages/cardano-services/test/util/DbSyncProvider/DbSyncProvider.test.ts
@@ -1,8 +1,14 @@
 import { Connection, createConnectionObject } from '@cardano-ogmios/client';
 import { DbSyncProvider, DbSyncProviderDependencies } from '../../../src/util';
 import { HEALTH_RESPONSE_BODY } from '../../../../ogmios/test/mocks/util';
-import { InMemoryCache, UNLIMITED_CACHE_TTL } from '../../../src';
+import { InMemoryCache, UNLIMITED_CACHE_TTL } from '../../../src/InMemoryCache';
 import { OgmiosCardanoNode } from '@cardano-sdk/ogmios';
+import {
+  PgConnectionCreator,
+  SERVICE_DISCOVERY_BACKOFF_FACTOR_DEFAULT,
+  SERVICE_DISCOVERY_TIMEOUT_DEFAULT,
+  createPgConnectionCreator
+} from '../../../src/Program/utils';
 import { Pool, QueryResult } from 'pg';
 import { Provider } from '@cardano-sdk/core';
 import {