diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf
index d84795e..4b7669e 100644
--- a/bootstrap/platform/main.tf
+++ b/bootstrap/platform/main.tf
@@ -106,6 +106,10 @@ EOT
   ]))
 
   prometheus_stack_node_selector = var.prometheus_stack_node_selector
+  argocd_node_selector = {
+    "kubernetes.io/os"      = "linux"
+    "homelab.dev/node-role" = "app"
+  }
 }
 
 resource "helm_release" "calico_crds" {
@@ -663,6 +667,15 @@ resource "helm_release" "argocd" {
   namespace        = var.argocd.namespace
   create_namespace = true
   timeout          = 600
+  wait             = true
+
+  values = [
+    yamlencode({
+      global = {
+        nodeSelector = local.argocd_node_selector
+      }
+    })
+  ]
 }
 
 resource "null_resource" "argocd_ready" {
@@ -672,6 +685,7 @@ resource "null_resource" "argocd_ready" {
     kubeconfig_path = var.kubeconfig_path
     namespace       = var.argocd.namespace
     version         = var.argocd.version
+    node_selector   = jsonencode(local.argocd_node_selector)
   }
 
   provisioner "local-exec" {