diff --git a/apps-devstg/us-east-1/k8s-eks/k8s-components/chart-values/argo-cd.yaml b/apps-devstg/us-east-1/k8s-eks/k8s-components/chart-values/argo-cd.yaml
index dedc5439d..2f3102c09 100644
--- a/apps-devstg/us-east-1/k8s-eks/k8s-components/chart-values/argo-cd.yaml
+++ b/apps-devstg/us-east-1/k8s-eks/k8s-components/chart-values/argo-cd.yaml
@@ -2,7 +2,22 @@ configs:
   cm:
     exec.enabled: "${enableWebTerminal}"
 
+controller:
+  nodeSelector: ${nodeSelector}
+  tolerations: ${tolerations}
+
+dex:
+  nodeSelector: ${nodeSelector}
+  tolerations: ${tolerations}
+
+redis:
+  nodeSelector: ${nodeSelector}
+  tolerations: ${tolerations}
+
 server:
+  nodeSelector: ${nodeSelector}
+  tolerations: ${tolerations}
+
   ingress:
     enabled: true
     annotations:
diff --git a/apps-devstg/us-east-1/k8s-eks/k8s-components/cicd-argo.tf b/apps-devstg/us-east-1/k8s-eks/k8s-components/cicd-argo.tf
index b9981ca7c..33a29c32c 100644
--- a/apps-devstg/us-east-1/k8s-eks/k8s-components/cicd-argo.tf
+++ b/apps-devstg/us-east-1/k8s-eks/k8s-components/cicd-argo.tf
@@ -11,9 +11,18 @@ resource "helm_release" "argocd" {
   version    = "5.8.3"
   values = [
     templatefile("chart-values/argo-cd.yaml", {
-      enableWebTerminal = var.argocd.enableWebTerminal
-      argoHost          = "argocd.${local.environment}.${local.private_base_domain}"
-      ingressClass      = local.private_ingress_class
+      argoHost                   = "argocd.${local.environment}.${local.private_base_domain}",
+      ingressClass               = local.private_ingress_class,
+      enableWebTerminal          = var.argocd.enableWebTerminal,
+      nodeSelector               = jsonencode({ stack = "argocd" }),
+      tolerations = jsonencode([
+        {
+          key      = "stack",
+          operator = "Equal",
+          value    = "argocd",
+          effect   = "NoSchedule"
+        }
+      ])
     }),
     # We are using a different approach here because it is very tricky to render
     # properly the multi-line sshPrivateKey using 'templatefile' function
diff --git a/apps-devstg/us-east-1/k8s-eks/k8s-components/networking-dns.tf b/apps-devstg/us-east-1/k8s-eks/k8s-components/networking-dns.tf
index 37ef120de..59b1c09dd 100644
--- a/apps-devstg/us-east-1/k8s-eks/k8s-components/networking-dns.tf
+++ b/apps-devstg/us-east-1/k8s-eks/k8s-components/networking-dns.tf
@@ -7,7 +7,7 @@ resource "helm_release" "externaldns_private" {
   namespace  = kubernetes_namespace.externaldns[0].id
   repository = "https://charts.bitnami.com/bitnami"
   chart      = "external-dns"
-  version    = "6.4.4"
+  version    = "6.14.4"
   values = [
     templatefile("chart-values/externaldns.yaml", {
       filteredDomain     = local.private_base_domain
@@ -30,7 +30,7 @@ resource "helm_release" "externaldns_public" {
   namespace  = kubernetes_namespace.externaldns[0].id
   repository = "https://charts.bitnami.com/bitnami"
   chart      = "external-dns"
-  version    = "6.4.4"
+  version    = "6.14.4"
   values = [
     templatefile("chart-values/externaldns.yaml", {
       filteredDomain     = local.public_base_domain
diff --git a/apps-devstg/us-east-1/k8s-eks/k8s-components/variables.tf b/apps-devstg/us-east-1/k8s-eks/k8s-components/variables.tf
index 60554939f..76542923c 100644
--- a/apps-devstg/us-east-1/k8s-eks/k8s-components/variables.tf
+++ b/apps-devstg/us-east-1/k8s-eks/k8s-components/variables.tf
@@ -42,12 +42,12 @@ variable "enable_external_secrets" {
 }
 
 variable "argocd" {
-  type    = map(any)
+  type    = any
   default = {}
 }
 
 variable "argo_rollouts" {
-  type    = map(any)
+  type    = any
   default = {}
 }