diff --git a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml
index d6a06e73..1f02ef8b 100644
--- a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml
+++ b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml
@@ -10,13 +10,13 @@ tests:
     asserts:
       - equal:
           path: data["argocd.server"]
-          value: argocd-server:80
+          value: argo-cd-server:80
       - equal:
           path: data["redis.server"]
           value: runtime-redis:6379
       - equal:
           path: data["repo.server"]
-          value: argocd-repo-server:8081
+          value: argo-cd-repo-server:8081
 
   - it: Argo Api Gateway Deployment should have valid matchLabel selectors
     template: argo-gateway/deployment.yaml
diff --git a/charts/gitops-runtime/tests/event-reporters_test.yaml b/charts/gitops-runtime/tests/event-reporters_test.yaml
index f9b3c91f..c86c5526 100644
--- a/charts/gitops-runtime/tests/event-reporters_test.yaml
+++ b/charts/gitops-runtime/tests/event-reporters_test.yaml
@@ -37,13 +37,13 @@ tests:
     asserts:
       - equal:
           path: data["argocd.server"]
-          value: argocd-server:80
+          value: argo-cd-server:80
       - equal:
           path: data["redis.server"]
           value: runtime-redis:6379
       - equal:
           path: data["repo.server"]
-          value: argocd-repo-server:8081
+          value: argo-cd-repo-server:8081
 
   - it: Runtime Reporter ConfigMap should have valid redis-ha url
     template: event-reporters/runtime-event-reporter/configmap.yaml
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 0bf3291f..8d68efde 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -106,7 +106,7 @@ global:
           #   name: argocd-token
           #   key: token
         # -- Service name of the ArgoCD server
-        svc: argocd-server
+        svc: argo-cd-server
         # -- Port of the ArgoCD server
         port: 80
         # -- Set if Argo CD is running behind reverse proxy under subpath different from /
@@ -115,7 +115,7 @@ global:
         rootpath: ''
       repoServer:
         # -- Service name of the ArgoCD repo server
-        svc: argocd-repo-server
+        svc: argo-cd-repo-server
         # -- Port of the ArgoCD repo server
         port: 8081
   # -- Configuration for external Argo Rollouts
@@ -264,7 +264,7 @@ sealed-secrets:
 #-----------------------------------------------------------------------------------------------------------------------
 argo-cd:
   enabled: true
-  fullnameOverride: argocd
+  fullnameOverride: argo-cd
   notifications:
     enabled: false
   redis: