diff --git a/components/buildless-serverless/api/v1alpha2/function_types.go b/components/buildless-serverless/api/v1alpha2/function_types.go
index fc144d4ef..d5eca3adf 100644
--- a/components/buildless-serverless/api/v1alpha2/function_types.go
+++ b/components/buildless-serverless/api/v1alpha2/function_types.go
@@ -191,7 +191,7 @@ func (f *Function) UpdateCondition(c ConditionType, s metav1.ConditionStatus, r
 const (
 	FunctionNameLabel                    = "serverless.kyma-project.io/function-name"
 	FunctionManagedByLabel               = "serverless.kyma-project.io/managed-by"
-	FunctionControllerValue              = "buildless-function-controller"
+	FunctionControllerValue              = "function-controller"
 	FunctionUUIDLabel                    = "serverless.kyma-project.io/uuid"
 	FunctionResourceLabel                = "serverless.kyma-project.io/resource"
 	FunctionResourceLabelDeploymentValue = "deployment"
diff --git a/components/buildless-serverless/internal/controller/function_controller.go b/components/buildless-serverless/internal/controller/function_controller.go
index 16ec231a3..f1209905d 100644
--- a/components/buildless-serverless/internal/controller/function_controller.go
+++ b/components/buildless-serverless/internal/controller/function_controller.go
@@ -65,7 +65,7 @@ func (fr *FunctionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 // SetupWithManager sets up the controller with the Manager.
 func (fr *FunctionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		Named("buildless-function-controller").
+		Named("function-controller").
 		For(&serverlessv1alpha2.Function{}).
 		WithEventFilter(buildPredicates()).
 		Owns(&appsv1.Deployment{}).
diff --git a/components/buildless-serverless/internal/controller/resources/deployment_test.go b/components/buildless-serverless/internal/controller/resources/deployment_test.go
index c0042c824..7ff89378a 100644
--- a/components/buildless-serverless/internal/controller/resources/deployment_test.go
+++ b/components/buildless-serverless/internal/controller/resources/deployment_test.go
@@ -84,7 +84,7 @@ func TestDeployment_construct(t *testing.T) {
 		expectedLabels := map[string]string{
 			"app": "test-function-name",
 			"serverless.kyma-project.io/function-name": "test-function-name",
-			"serverless.kyma-project.io/managed-by":    "buildless-function-controller",
+			"serverless.kyma-project.io/managed-by":    "function-controller",
 			"serverless.kyma-project.io/resource":      "deployment",
 			"serverless.kyma-project.io/uuid":          "test-uid",
 		}
diff --git a/components/buildless-serverless/internal/controller/resources/service.go b/components/buildless-serverless/internal/controller/resources/service.go
index 5fd16f9fe..c965d878e 100644
--- a/components/buildless-serverless/internal/controller/resources/service.go
+++ b/components/buildless-serverless/internal/controller/resources/service.go
@@ -24,13 +24,24 @@ func NewService(f *serverlessv1alpha2.Function) *Service {
 	return s
 }
 
+func (s *Service) functionLabels() map[string]string {
+	return map[string]string{
+		serverlessv1alpha2.FunctionNameLabel:      s.function.GetName(),
+		serverlessv1alpha2.FunctionManagedByLabel: serverlessv1alpha2.FunctionControllerValue,
+		serverlessv1alpha2.FunctionUUIDLabel:      string(s.function.GetUID()),
+	}
+}
+
 func (s *Service) construct() *corev1.Service {
+	selectorLabes := s.functionLabels()
+	selectorLabes[serverlessv1alpha2.FunctionResourceLabel] = serverlessv1alpha2.FunctionResourceLabelDeploymentValue
+
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      s.function.Name,
 			Namespace: s.function.Namespace,
 			//TODO: do we need to add labels or annotations here?
-			//Labels:      s.functionLabels(),
+			Labels: s.functionLabels(),
 			//Annotations: s.functionAnnotations(),
 		},
 		Spec: corev1.ServiceSpec{
@@ -40,13 +51,7 @@ func (s *Service) construct() *corev1.Service {
 				Port:       80,
 				Protocol:   corev1.ProtocolTCP,
 			}},
-			Selector: map[string]string{
-				// TODO: do we need to add more labels here?
-				serverlessv1alpha2.FunctionNameLabel:      s.function.GetName(),
-				serverlessv1alpha2.FunctionManagedByLabel: serverlessv1alpha2.FunctionControllerValue,
-				serverlessv1alpha2.FunctionResourceLabel:  serverlessv1alpha2.FunctionResourceLabelDeploymentValue,
-				serverlessv1alpha2.FunctionUUIDLabel:      string(s.function.GetUID()),
-			},
+			Selector: selectorLabes,
 		},
 	}
 
diff --git a/components/buildless-serverless/internal/controller/resources/service_test.go b/components/buildless-serverless/internal/controller/resources/service_test.go
index c8b1866b2..b5db0daca 100644
--- a/components/buildless-serverless/internal/controller/resources/service_test.go
+++ b/components/buildless-serverless/internal/controller/resources/service_test.go
@@ -25,6 +25,11 @@ func TestNewService(t *testing.T) {
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-function-name",
 				Namespace: "test-function-namespace",
+				Labels: map[string]string{
+					"serverless.kyma-project.io/function-name": "test-function-name",
+					"serverless.kyma-project.io/managed-by":    "function-controller",
+					"serverless.kyma-project.io/uuid":          "test-uid",
+				},
 			},
 			Spec: corev1.ServiceSpec{
 				Ports: []corev1.ServicePort{{
@@ -35,7 +40,7 @@ func TestNewService(t *testing.T) {
 				}},
 				Selector: map[string]string{
 					"serverless.kyma-project.io/function-name": "test-function-name",
-					"serverless.kyma-project.io/managed-by":    "buildless-function-controller",
+					"serverless.kyma-project.io/managed-by":    "function-controller",
 					"serverless.kyma-project.io/resource":      "deployment",
 					"serverless.kyma-project.io/uuid":          "test-uid",
 				},