diff --git a/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml b/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml
index d5ac2d06..f9e3ea6e 100644
--- a/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml
+++ b/terraform/layer2-k8s/templates/aws-node-termination-handler-values.yaml
@@ -1,4 +1,14 @@
 enableSpotInterruptionDraining: true
 enableRebalanceMonitoring: true
-nodeSelector:
-  eks.amazonaws.com/capacityType: SPOT
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: eks.amazonaws.com/capacityType
+          operator: In
+          values:
+          - SPOT
+        - key: eks.amazonaws.com/nodegroup
+          operator: DoesNotExist