diff --git a/apps/server/src/modules/tool/common/service/common-tool.service.ts b/apps/server/src/modules/tool/common/service/common-tool.service.ts
index 71f643c81ac..1dccc42ab1f 100644
--- a/apps/server/src/modules/tool/common/service/common-tool.service.ts
+++ b/apps/server/src/modules/tool/common/service/common-tool.service.ts
@@ -5,8 +5,12 @@ import { ContextExternalTool } from '../../context-external-tool/domain';
 import { ToolConfigurationStatus } from '../enum';
 import { ToolVersion } from '../interface';
 
+// TODO N21-1337 remove class when tool versioning is removed
 @Injectable()
 export class CommonToolService {
+	/**
+	 * @deprecated use ToolVersionService
+	 */
 	determineToolConfigurationStatus(
 		externalTool: ExternalTool,
 		schoolExternalTool: SchoolExternalTool,
diff --git a/apps/server/src/modules/tool/context-external-tool/service/tool-version-service.spec.ts b/apps/server/src/modules/tool/context-external-tool/service/tool-version-service.spec.ts
index dbc5ea7fe77..33c77ecb7ea 100644
--- a/apps/server/src/modules/tool/context-external-tool/service/tool-version-service.spec.ts
+++ b/apps/server/src/modules/tool/context-external-tool/service/tool-version-service.spec.ts
@@ -122,10 +122,24 @@ describe('ToolVersionService', () => {
 					contextExternalTool
 				);
 
-				expect(schoolExternalToolValidationService.validate).toHaveBeenCalledWith(schoolExternalTool);
-				expect(contextExternalToolValidationService.validate).toHaveBeenCalledWith(contextExternalTool);
 				expect(status).toEqual(ToolConfigurationStatus.LATEST);
 			});
+
+			it('should call schoolExternalToolValidationService', async () => {
+				const { externalTool, schoolExternalTool, contextExternalTool } = setup();
+
+				await service.determineToolConfigurationStatus(externalTool, schoolExternalTool, contextExternalTool);
+
+				expect(schoolExternalToolValidationService.validate).toHaveBeenCalledWith(schoolExternalTool);
+			});
+
+			it('should call contextExternalToolValidationService', async () => {
+				const { externalTool, schoolExternalTool, contextExternalTool } = setup();
+
+				await service.determineToolConfigurationStatus(externalTool, schoolExternalTool, contextExternalTool);
+
+				expect(schoolExternalToolValidationService.validate).toHaveBeenCalledWith(schoolExternalTool);
+			});
 		});
 
 		describe('when FEATURE_COMPUTE_TOOL_STATUS_WITHOUT_VERSIONS_ENABLED is true and validation throws an error', () => {
@@ -159,9 +173,23 @@ describe('ToolVersionService', () => {
 					contextExternalTool
 				);
 
+				expect(status).toEqual(ToolConfigurationStatus.OUTDATED);
+			});
+
+			it('should call schoolExternalToolValidationService', async () => {
+				const { externalTool, schoolExternalTool, contextExternalTool } = setup();
+
+				await service.determineToolConfigurationStatus(externalTool, schoolExternalTool, contextExternalTool);
+
 				expect(schoolExternalToolValidationService.validate).toHaveBeenCalledWith(schoolExternalTool);
+			});
+
+			it('should call contextExternalToolValidationService', async () => {
+				const { externalTool, schoolExternalTool, contextExternalTool } = setup();
+
+				await service.determineToolConfigurationStatus(externalTool, schoolExternalTool, contextExternalTool);
+
 				expect(contextExternalToolValidationService.validate).toHaveBeenCalledWith(contextExternalTool);
-				expect(status).toEqual(ToolConfigurationStatus.OUTDATED);
 			});
 		});
 	});
diff --git a/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.spec.ts b/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.spec.ts
index 819e0dfcbf8..b8c2789322d 100644
--- a/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.spec.ts
+++ b/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.spec.ts
@@ -53,6 +53,7 @@ describe('SchoolExternalToolService', () => {
 		toolFearures = module.get(ToolFeatures);
 	});
 
+	// TODO N21-1337 refactor setup into the describe blocks
 	const legacySetup = () => {
 		const schoolExternalTool: SchoolExternalTool = schoolExternalToolFactory.build();
 		const externalTool: ExternalTool = externalToolFactory.buildWithId();
diff --git a/apps/server/src/modules/tool/tool-config.ts b/apps/server/src/modules/tool/tool-config.ts
index 2b0af584e53..1405f0c7a1d 100644
--- a/apps/server/src/modules/tool/tool-config.ts
+++ b/apps/server/src/modules/tool/tool-config.ts
@@ -6,7 +6,7 @@ export interface IToolFeatures {
 	ctlToolsTabEnabled: boolean;
 	ltiToolsTabEnabled: boolean;
 	contextConfigurationEnabled: boolean;
-	// TODO N21-1337
+	// TODO N21-1337 refactor after feature flag is removed
 	toolStatusWithoutVersions: boolean;
 	maxExternalToolLogoSizeInBytes: number;
 	backEndUrl: string;
@@ -17,7 +17,7 @@ export default class ToolConfiguration {
 		ctlToolsTabEnabled: Configuration.get('FEATURE_CTL_TOOLS_TAB_ENABLED') as boolean,
 		ltiToolsTabEnabled: Configuration.get('FEATURE_LTI_TOOLS_TAB_ENABLED') as boolean,
 		contextConfigurationEnabled: Configuration.get('FEATURE_CTL_CONTEXT_CONFIGURATION_ENABLED') as boolean,
-		// TODO N21-1337
+		// TODO N21-1337 refactor after feature flag is removed
 		toolStatusWithoutVersions: Configuration.get('FEATURE_COMPUTE_TOOL_STATUS_WITHOUT_VERSIONS_ENABLED') as boolean,
 		maxExternalToolLogoSizeInBytes: Configuration.get('CTL_TOOLS__EXTERNAL_TOOL_MAX_LOGO_SIZE_IN_BYTES') as number,
 		backEndUrl: Configuration.get('PUBLIC_BACKEND_URL') as string,