diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index d19dd80953..110febe25e 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -1,10 +1,10 @@
 import { flags } from '@oclif/command';
 import fs from 'fs';
 import path from 'path';
+import type { FindOptionsWhere } from 'typeorm';
 import { Credentials, UserSettings } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
 import * as Db from '@/Db';
-import type { ICredentialsDecryptedDb } from '@/Interfaces';
+import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/Interfaces';
 import { BaseCommand } from '../BaseCommand';
 
 export class ExportCredentialsCommand extends BaseCommand {
@@ -105,13 +105,12 @@ export class ExportCredentialsCommand extends BaseCommand {
 			}
 		}
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<ICredentialsDb> = {};
 		if (flags.id) {
 			findQuery.id = flags.id;
 		}
 
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const credentials = await Db.collections.Credentials.find(findQuery);
+		const credentials = await Db.collections.Credentials.findBy(findQuery);
 
 		if (flags.decrypted) {
 			const encryptionKey = await UserSettings.getEncryptionKey();
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 6a3d3cdf52..69f795e5bc 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -1,8 +1,9 @@
 import { flags } from '@oclif/command';
 import fs from 'fs';
 import path from 'path';
-import type { IDataObject } from 'n8n-workflow';
+import type { FindOptionsWhere } from 'typeorm';
 import * as Db from '@/Db';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
 
 export class ExportWorkflowsCommand extends BaseCommand {
@@ -98,7 +99,7 @@ export class ExportWorkflowsCommand extends BaseCommand {
 			}
 		}
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.id) {
 			findQuery.id = flags.id;
 		}
diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts
index 240e56d4fd..da9d37f81c 100644
--- a/packages/cli/src/commands/list/workflow.ts
+++ b/packages/cli/src/commands/list/workflow.ts
@@ -1,6 +1,7 @@
 import { flags } from '@oclif/command';
-import type { IDataObject } from 'n8n-workflow';
+import type { FindOptionsWhere } from 'typeorm';
 import * as Db from '@/Db';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
 
 export class ListWorkflowCommand extends BaseCommand {
@@ -30,12 +31,12 @@ export class ListWorkflowCommand extends BaseCommand {
 			this.error('The --active flag has to be passed using true or false');
 		}
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.active !== undefined) {
 			findQuery.active = flags.active === 'true';
 		}
 
-		const workflows = await Db.collections.Workflow.find(findQuery);
+		const workflows = await Db.collections.Workflow.findBy(findQuery);
 		if (flags.onlyId) {
 			workflows.forEach((workflow) => this.logger.info(workflow.id));
 		} else {
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index a26fd80516..a13721ce66 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -2,8 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable no-console */
 import { flags } from '@oclif/command';
-import type { IDataObject } from 'n8n-workflow';
+import type { FindOptionsWhere } from 'typeorm';
+import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
 import * as Db from '@/Db';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
 
 export class UpdateWorkflowCommand extends BaseCommand {
@@ -43,7 +45,7 @@ export class UpdateWorkflowCommand extends BaseCommand {
 			return;
 		}
 
-		const updateQuery: IDataObject = {};
+		const updateQuery: QueryDeepPartialEntity<WorkflowEntity> = {};
 		if (flags.active === undefined) {
 			console.info('No update flag like "--active=true" has been set!');
 			return;
@@ -56,7 +58,7 @@ export class UpdateWorkflowCommand extends BaseCommand {
 
 		updateQuery.active = flags.active === 'true';
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.id) {
 			this.logger.info(`Deactivating workflow with ID: ${flags.id}`);
 			findQuery.id = flags.id;