diff --git a/charts/isdargo/Chart.yaml b/charts/isdargo/Chart.yaml
index 63d0991..6b556f8 100644
--- a/charts/isdargo/Chart.yaml
+++ b/charts/isdargo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: isdargo
-version: 4.1.8
+version: 4.1.9
 appVersion: 4.1.7
 description: "ISD-Argo with v2.5.4 with KeyCloak,RBAC features and Improvements of Kubernetes Job for Delivery Verification, Token Generation changes"
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-argo/main/img/opsmx.png
diff --git a/charts/isdargo/config/oes-sapor/application.yml b/charts/isdargo/config/oes-sapor/application.yml
index c5d2d0b..76a388f 100644
--- a/charts/isdargo/config/oes-sapor/application.yml
+++ b/charts/isdargo/config/oes-sapor/application.yml
@@ -27,6 +27,8 @@ argo:
     newArgoAgentWithoutRolloutsTemplate: newargoagentwithoutrollouts.template
     newArgoAgentWithoutRolloutsWithoutUrlTemplate: newargoagentwithoutrolloutswithouturl.template
 
+controller:
+  token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 secretManagement:
   source:
     config: {{ .Values.secretStore }}
@@ -95,7 +97,6 @@ kubernetes:
     certFile: /opt/opsmx/controller/cert/tls.crt
     keyFile: /opt/opsmx/controller/cert/tls.key
     image: {{ .Values.forwarder.agent.image }}
-    token: xxxxxxxxxxxxxxxxxxxxxxxxx
   template:
     path: /opt/opsmx/controller
     kubectlTemplateFileName: kubeconfig.template
diff --git a/charts/isdargo/isd-minimal-values.yaml b/charts/isdargo/isd-minimal-values.yaml
index d5ff4a6..57dcde4 100755
--- a/charts/isdargo/isd-minimal-values.yaml
+++ b/charts/isdargo/isd-minimal-values.yaml
@@ -2,8 +2,24 @@
 # Update the controller URL which needs to be reachable from other clusters where ArgoCD is running
 # After installation, the DNS must be updated to point this to EXTERNAL-IP of the agent-grpc service
 # kubectl get svc -n opsmx-isd agent-grpc
+###################################
 forwarder:
-  externalName: controller.REPLACE.THIS.WITH.YOURCOMPANY.COM
+  # Update the externalName if only ISD and Argo running in different cluster with DNS if not leave as it is
+  externalName:
+  enabled: true
+  agent:
+    image: quay.io/opsmxpublic/agent-client:v5.1.1
+    serviceType: ClusterIP
+    # Value is also used in sapor configuration for kubernetes.agent.serverHostName
+    host: REPLACE.THIS.WITH.YOURCOMPANY.COM
+  image:
+    repository: quay.io/opsmxpublic/agent-controller
+    tag: v5.1.1
+    pullPolicy: IfNotPresent
+  serverNames:
+    - agent-grpc
+
+  serviceAnnotations: {}
 
 global:
   oesUI:
diff --git a/charts/isdargo/templates/forwarder/oes-forwarder-config.yaml b/charts/isdargo/templates/forwarder/oes-forwarder-config.yaml
index 82c6e5b..9d89fd5 100644
--- a/charts/isdargo/templates/forwarder/oes-forwarder-config.yaml
+++ b/charts/isdargo/templates/forwarder/oes-forwarder-config.yaml
@@ -13,7 +13,7 @@ data:
     agentHostname: {{ .Values.forwarder.agent.host }}
     remoteCommandHostname: {{ .Values.forwarder.agent.host }}
     controlHostname: opsmx-controller-controller1
-    agentAdvertisePort: "443"
+    agentAdvertisePort: 443
     serverNames:
     {{- range .Values.forwarder.serverNames }}
       - {{ . }}
diff --git a/charts/isdargo/values.yaml b/charts/isdargo/values.yaml
index 7aef20e..23f1f9d 100755
--- a/charts/isdargo/values.yaml
+++ b/charts/isdargo/values.yaml
@@ -1814,7 +1814,7 @@ forwarder:
     image: quay.io/opsmxpublic/agent-client:v5.1.1
     serviceType: ClusterIP
     # Value is also used in sapor configuration for kubernetes.agent.serverHostName
-    host: controller.REPLACE.THIS.WITH.YOURCOMPANY.COM
+    host: REPLACE.THIS.WITH.YOURCOMPANY.COM
   image:
     repository: quay.io/opsmxpublic/agent-controller
     tag: v5.1.1