diff --git a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
index c6a4af19021..0e85be8a13c 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
@@ -956,11 +956,13 @@ export class SourceControlImportService {
 				overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
 			}
 			try {
+				// @ts-ignore Workaround for intermittent typecheck issue with _QueryDeepPartialEntity
 				await this.variablesRepository.upsert({ ...variable }, ['id']);
 			} catch (errorUpsert) {
 				if (isUniqueConstraintError(errorUpsert as Error)) {
 					this.logger.debug(`Variable ${variable.key} already exists, updating instead`);
 					try {
+						// @ts-ignore Workaround for intermittent typecheck issue with _QueryDeepPartialEntity
 						await this.variablesRepository.update({ key: variable.key }, { ...variable });
 					} catch (errorUpdate) {
 						this.logger.debug(`Failed to update variable ${variable.key}, skipping`);
diff --git a/packages/cli/src/modules/mcp/mcp-api-key.service.ts b/packages/cli/src/modules/mcp/mcp-api-key.service.ts
index b3001b4ae69..123e4f473b7 100644
--- a/packages/cli/src/modules/mcp/mcp-api-key.service.ts
+++ b/packages/cli/src/modules/mcp/mcp-api-key.service.ts
@@ -44,6 +44,7 @@ export class McpServerApiKeyService {
 			label: API_KEY_LABEL,
 		});
 
+		// @ts-ignore Workaround for intermittent typecheck issue with _QueryDeepPartialEntity
 		await manager.insert(ApiKey, apiKeyEntity);
 
 		return await manager.findOneByOrFail(ApiKey, { apiKey });