diff --git a/terraform/modules/k8s-addons/eks-gha-runner-scale-set-controller.tf b/terraform/modules/k8s-addons/eks-gha-runner-scale-set-controller.tf
index 722067b..7fc1150 100644
--- a/terraform/modules/k8s-addons/eks-gha-runner-scale-set-controller.tf
+++ b/terraform/modules/k8s-addons/eks-gha-runner-scale-set-controller.tf
@@ -15,6 +15,9 @@ resources:
   limits:
     cpu: 20m
     memory: 128Mi
+
+flags:
+  watchSingleNamespace: ""
 VALUES
 }
 
diff --git a/terraform/modules/k8s-addons/eks-gha-runner-scale-set.tf b/terraform/modules/k8s-addons/eks-gha-runner-scale-set.tf
index c267338..8942db5 100644
--- a/terraform/modules/k8s-addons/eks-gha-runner-scale-set.tf
+++ b/terraform/modules/k8s-addons/eks-gha-runner-scale-set.tf
@@ -14,7 +14,7 @@ githubConfigSecret:
   github_token: "${local.kube_github_runner_github_token}"
 
 maxRunners: 5
-minRunners: 0
+minRunners: 1
 
 runnerGroup: "default"