diff --git a/pkg/infraConfig/service/infraConfigService.go b/pkg/infraConfig/service/infraConfigService.go
index 4b2e1e5e88..0988f9be7b 100644
--- a/pkg/infraConfig/service/infraConfigService.go
+++ b/pkg/infraConfig/service/infraConfigService.go
@@ -730,6 +730,9 @@ func (impl *InfraConfigServiceImpl) sanitizeUpdatableConfigurations(updatableInf
 func (impl *InfraConfigServiceImpl) getAppliedInfraConfigForProfile(appliedProfileConfig, defaultProfileConfig *v1.ProfileBeanDto, variableSnapshots map[string]map[string]string, targetPlatformsList []string) (map[string]*v1.InfraConfig, error) {
 	resp := make(map[string]*v1.InfraConfig)
 	for _, targetPlatform := range targetPlatformsList {
+		if !appliedProfileConfig.GetBuildxDriverType().IsPlatformSupported(targetPlatform) {
+			continue
+		}
 		appliedConfiguration := impl.getAppliedConfigurationForTargetPlatform(appliedProfileConfig, defaultProfileConfig, targetPlatform)
 		infraConfigForTrigger, err := impl.getInfraConfigurationForTrigger(appliedConfiguration)
 		if err != nil {
diff --git a/pkg/infraConfig/units/bean/memory_unit_type.go b/pkg/infraConfig/units/bean/memory_unit_type.go
index 93d7a33f57..1516c979a4 100644
--- a/pkg/infraConfig/units/bean/memory_unit_type.go
+++ b/pkg/infraConfig/units/bean/memory_unit_type.go
@@ -41,6 +41,8 @@ const (
 
 func (memoryUnitStr MemoryUnitStr) GetUnitSuffix() UnitType {
 	switch memoryUnitStr {
+	case MILLIBYTE:
+		return MilliByte
 	case BYTE:
 		return Byte
 	case KIBYTE: