diff --git a/pkg/deploy/image-puller/imagepuller.go b/pkg/deploy/image-puller/imagepuller.go
index f4bc272a2a..d96f686273 100644
--- a/pkg/deploy/image-puller/imagepuller.go
+++ b/pkg/deploy/image-puller/imagepuller.go
@@ -538,8 +538,8 @@ func GetExpectedKubernetesImagePuller(ctx *deploy.DeployContext) *chev1alpha1.Ku
 				*metav1.NewControllerRef(ctx.CheCluster, ctx.CheCluster.GroupVersionKind()),
 			},
 			Labels: map[string]string{
-				"app.kubernetes.io/part-of": ctx.CheCluster.Name,
-				"app":                       "che",
+				"app.kubernetes.io/part-of": deploy.CheEclipseOrg,
+				"app":                       deploy.DefaultCheFlavor(ctx.CheCluster),
 				"component":                 "kubernetes-image-puller",
 			},
 		},
diff --git a/pkg/deploy/image-puller/imagepuller_test.go b/pkg/deploy/image-puller/imagepuller_test.go
index a3eb9fef55..d6349f9729 100644
--- a/pkg/deploy/image-puller/imagepuller_test.go
+++ b/pkg/deploy/image-puller/imagepuller_test.go
@@ -225,9 +225,9 @@ func TestImagePullerConfiguration(t *testing.T) {
 					Name:            os.Getenv("CHE_FLAVOR") + "-image-puller",
 					Namespace:       namespace,
 					Labels: map[string]string{
-						"app":                       "che",
+						"app":                       os.Getenv("CHE_FLAVOR"),
 						"component":                 "kubernetes-image-puller",
-						"app.kubernetes.io/part-of": os.Getenv("CHE_FLAVOR"),
+						"app.kubernetes.io/part-of": deploy.CheEclipseOrg,
 					},
 					OwnerReferences: []metav1.OwnerReference{
 						{
@@ -752,8 +752,8 @@ func InitImagePuller(options ImagePullerOptions) *chev1alpha1.KubernetesImagePul
 			Namespace:       namespace,
 			ResourceVersion: options.ObjectMetaResourceVersion,
 			Labels: map[string]string{
-				"app.kubernetes.io/part-of": os.Getenv("CHE_FLAVOR"),
-				"app":                       "che",
+				"app.kubernetes.io/part-of": deploy.CheEclipseOrg,
+				"app":                       os.Getenv("CHE_FLAVOR"),
 				"component":                 "kubernetes-image-puller",
 			},
 			OwnerReferences: []metav1.OwnerReference{
@@ -784,8 +784,8 @@ func getDefaultImagePuller() *chev1alpha1.KubernetesImagePuller {
 			Name:      os.Getenv("CHE_FLAVOR") + "-image-puller",
 			Namespace: namespace,
 			Labels: map[string]string{
-				"app.kubernetes.io/part-of": os.Getenv("CHE_FLAVOR"),
-				"app":                       "che",
+				"app.kubernetes.io/part-of": deploy.CheEclipseOrg,
+				"app":                       os.Getenv("CHE_FLAVOR"),
 				"component":                 "kubernetes-image-puller",
 			},
 			OwnerReferences: []metav1.OwnerReference{