diff --git a/Dockerfile b/Dockerfile
index f4831aa13..7f249db94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 
 ARG TARGETOS TARGETARCH
 
-ADD out/${TARGETOS:-linux}_${TARGETARCH:-amd64}/manager /manager
+ADD out/${TARGETOS:-linux}_${TARGETARCH:-amd64}/sail-operator /sail-operator
 ADD resources /var/lib/sail-operator/resources
 
 USER 65532:65532
 WORKDIR /
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["/sail-operator"]
diff --git a/Makefile.core.mk b/Makefile.core.mk
index 2bd53d407..a3afbac6c 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -179,7 +179,7 @@ test.e2e.describe: ## Runs ginkgo outline -format indent over the e2e test to sh
 ##@ Build
 
 .PHONY: build
-build: build-$(TARGET_ARCH) ## Build manager binary.
+build: build-$(TARGET_ARCH) ## Build the sail-operator binary.
 
 .PHONY: run
 run: gen ## Run a controller from your host.
@@ -221,7 +221,7 @@ endif
 # BUILDX_BUILD_ARGS are the additional --build-arg flags passed to the docker buildx build command.
 BUILDX_BUILD_ARGS = --build-arg TARGETOS=$(TARGET_OS)
 
-# PLATFORMS defines the target platforms for  the manager image be build to provide support to multiple
+# PLATFORMS defines the target platforms for the sail-operator image be build to provide support to multiple
 # architectures. (i.e. make docker-buildx IMAGE=myregistry/mypoperator:0.0.1). To use this option you need to:
 # - able to use docker buildx . More info: https://docs.docker.com/build/buildx/
 # - have enable BuildKit, More info: https://docs.docker.com/develop/develop-images/build_enhancements/
@@ -233,8 +233,8 @@ PLATFORM_ARCHITECTURES = $(shell echo ${PLATFORMS} | sed -e 's/,/\ /g' -e 's/lin
 ifndef BUILDX
 define BUILDX
 .PHONY: build-$(1)
-build-$(1): ## Build manager binary for specific architecture.
-	GOARCH=$(1) LDFLAGS="$(LD_FLAGS)" common/scripts/gobuild.sh $(REPO_ROOT)/out/$(TARGET_OS)_$(1)/manager cmd/main.go
+build-$(1): ## Build sail-operator binary for specific architecture.
+	GOARCH=$(1) LDFLAGS="$(LD_FLAGS)" common/scripts/gobuild.sh $(REPO_ROOT)/out/$(TARGET_OS)_$(1)/sail-operator cmd/main.go
 
 .PHONY: build-all
 build-all: build-$(1)
diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml
index 9e416984c..0a577c671 100644
--- a/bundle/manifests/sailoperator.clusterserviceversion.yaml
+++ b/bundle/manifests/sailoperator.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:0.2-latest
-    createdAt: "2024-10-08T13:33:26Z"
+    createdAt: "2024-10-08T15:48:56Z"
     description: Experimental operator for installing Istio service mesh
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -579,7 +579,7 @@ spec:
         serviceAccountName: sail-operator
       deployments:
       - label:
-          app.kubernetes.io/component: manager
+          app.kubernetes.io/component: sail-operator
           app.kubernetes.io/created-by: sailoperator
           app.kubernetes.io/instance: sail-operator
           app.kubernetes.io/managed-by: helm
@@ -614,7 +614,7 @@ spec:
                 images.v1_23_2.istiod: docker.io/istio/pilot:1.23.2
                 images.v1_23_2.proxy: docker.io/istio/proxyv2:1.23.2
                 images.v1_23_2.ztunnel: docker.io/istio/ztunnel:1.23.2
-                kubectl.kubernetes.io/default-container: manager
+                kubectl.kubernetes.io/default-container: sail-operator
               labels:
                 app.kubernetes.io/created-by: sailoperator
                 app.kubernetes.io/part-of: sailoperator
@@ -665,7 +665,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --default-profile=openshift
                 command:
-                - /manager
+                - /sail-operator
                 image: quay.io/maistra-dev/sail-operator:0.2-latest
                 livenessProbe:
                   httpGet:
@@ -673,7 +673,7 @@ spec:
                     port: 8081
                   initialDelaySeconds: 15
                   periodSeconds: 20
-                name: manager
+                name: sail-operator
                 readinessProbe:
                   httpGet:
                     path: /readyz
diff --git a/chart/README.md b/chart/README.md
index e822fed6d..b7b40273e 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -86,7 +86,7 @@ Default configuration values can be changed using one or more `--set <parameter>
     $ kubectl -n sail-operator get deployment --output wide
 
     NAME            READY   UP-TO-DATE   AVAILABLE   AGE    CONTAINERS                IMAGES                                                                                    SELECTOR
-    sail-operator   1/1     1            1           107s   kube-rbac-proxy,manager   gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0,quay.io/maistra-dev/sail-operator:0.1-latest   app.kubernetes.io/created-by=sailoperator,app.kubernetes.io/part-of=sailoperator,control-plane=sail-operator
+    sail-operator   1/1     1            1           107s   kube-rbac-proxy,sail-operator  gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0,quay.io/maistra-dev/sail-operator:0.1-latest   app.kubernetes.io/created-by=sailoperator,app.kubernetes.io/part-of=sailoperator,control-plane=sail-operator
 
     $ kubectl -n sail-operator get pods -o wide
 
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 96d389713..bd8bb0d1e 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/component: manager
+    app.kubernetes.io/component: sail-operator
     app.kubernetes.io/created-by: {{ .Values.name }}
     app.kubernetes.io/instance: {{ .Values.deployment.name }}
     app.kubernetes.io/managed-by: helm
@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        kubectl.kubernetes.io/default-container: manager
+        kubectl.kubernetes.io/default-container: sail-operator
 {{- range $key, $val := .Values.deployment.annotations }}
         {{ $key | quote }}: {{ $val | quote}}
 {{- end }}
@@ -81,7 +81,7 @@ spec:
         - --default-profile=openshift
 {{- end }}
         command:
-        - /manager
+        - /sail-operator
         image: {{ .Values.image }}
 {{- if .Values.proxy.imagePullPolicy }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
@@ -92,7 +92,7 @@ spec:
             port: 8081
           initialDelaySeconds: 15
           periodSeconds: 20
-        name: manager
+        name: sail-operator
         readinessProbe:
           httpGet:
             path: /readyz
diff --git a/cmd/main.go b/cmd/main.go
index 9f4452e8b..d4b48d789 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -120,7 +120,7 @@ func main() {
 		// LeaderElectionReleaseOnCancel: true,
 	})
 	if err != nil {
-		setupLog.Error(err, "unable to start manager")
+		setupLog.Error(err, "unable to start sail-operator manager")
 		os.Exit(1)
 	}
 
@@ -171,9 +171,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	setupLog.Info("starting manager")
+	setupLog.Info("starting sail-operator manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
-		setupLog.Error(err, "problem running manager")
+		setupLog.Error(err, "problem running sail-operator manager")
 		os.Exit(1)
 	}
 }