diff --git a/cmd/argocd/commands/headless/headless.go b/cmd/argocd/commands/headless/headless.go
index eca3cb0fb498a2..d952e515766038 100644
--- a/cmd/argocd/commands/headless/headless.go
+++ b/cmd/argocd/commands/headless/headless.go
@@ -18,7 +18,6 @@ import (
 	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes"
 	cache2 "k8s.io/client-go/tools/cache"
@@ -125,18 +124,10 @@ func (c *forwardRepoClientset) NewRepoServerClient() (io.Closer, repoapiclient.R
 			CurrentContext: c.context,
 		}
 		repoServerName := c.repoServerName
-		repoServererviceLabelSelector := common.LabelKeyComponentRepoServer + "=" + common.LabelValueComponentRepoServer
-		repoServerServices, err := c.kubeClientset.CoreV1().Services(c.namespace).List(context.Background(), v1.ListOptions{LabelSelector: repoServererviceLabelSelector})
-		if err != nil {
-			c.err = err
-			return
-		}
-		if len(repoServerServices.Items) > 0 {
-			if repoServerServicelabel, ok := repoServerServices.Items[0].Labels[common.LabelKeyAppName]; ok && repoServerServicelabel != "" {
-				repoServerName = repoServerServicelabel
-			}
-		}
 		repoServerPodLabelSelector := common.LabelKeyAppName + "=" + repoServerName
+		if repoServerName == common.DefaultRepoServerName {
+			repoServerPodLabelSelector = common.LabelKeyComponentRepoServer + "=" + common.LabelValueComponentRepoServer
+		}
 		repoServerPort, err := kubeutil.PortForward(8081, c.namespace, &overrides, repoServerPodLabelSelector)
 		if err != nil {
 			c.err = err
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
index 05f1deaad58fe6..79bdca8acd27b7 100644
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -21308,10 +21308,11 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: argocd-repo-server
+     
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: repo-server
         app.kubernetes.io/name: argocd-repo-server
     spec:
       affinity:
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index 9ce3b1cb4b8247..352229934e06e1 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -22912,6 +22912,7 @@ spec:
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: repo-server
         app.kubernetes.io/name: argocd-repo-server
     spec:
       affinity:
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index 73473875be715f..bf3f8db9772584 100644
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -2033,6 +2033,7 @@ spec:
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: repo-server
         app.kubernetes.io/name: argocd-repo-server
     spec:
       affinity:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 282e6c9f66e7d0..b0c3667f2e2957 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -21957,6 +21957,7 @@ spec:
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: repo-server
         app.kubernetes.io/name: argocd-repo-server
     spec:
       affinity:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index 91826ef8d5620d..e184b908c9ced9 100644
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -1078,6 +1078,7 @@ spec:
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: repo-server
         app.kubernetes.io/name: argocd-repo-server
     spec:
       affinity: