diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts b/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts
index 90a30fd5891..18b3b5e5e9b 100644
--- a/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts
+++ b/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts
@@ -42,7 +42,7 @@ export class CfTargetImpedanceValidator implements IStageOrTriggerValidator {
           });
         } else if (
           toTest.type === 'cloneServerGroup' &&
-          toTest.targetCluster === stage.cluster &&
+          NameUtils.getClusterName(toTest.application, toTest.stack, toTest.freeFormDetails) === stage.cluster &&
           toTest.region === region
         ) {
           regionFound = true;
diff --git a/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts b/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts
index d03d988fbd7..aef0ce3210b 100644
--- a/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts
+++ b/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts
@@ -42,7 +42,8 @@ export class TargetImpedanceValidator implements IStageOrTriggerValidator {
           });
         } else if (
           toTest.type === 'cloneServerGroup' &&
-          toTest['targetCluster'] === stage['cluster'] &&
+          NameUtils.getClusterName(toTest['application'], toTest['stack'], toTest['freeFormDetails']) ===
+            stage['cluster'] &&
           toTest['region'] === region
         ) {
           regionFound = true;