diff --git a/charts/tiphys/templates/app.yaml b/charts/tiphys/templates/app.yaml
index 13da892..098f964 100644
--- a/charts/tiphys/templates/app.yaml
+++ b/charts/tiphys/templates/app.yaml
@@ -129,7 +129,12 @@ spec:
         tags.datadoghq.com/version: {{ $.Values.datadog.version | quote }}
       {{- end }}
     spec:
+      {{- if $app.service.nodeSelector }}
+      nodeSelector:
+        {{- toYaml $app.service.nodeSelector | nindent 8 }}
+      {{- end }}
       automountServiceAccountToken: false
+      terminationGracePeriodSeconds: {{ default 30 $app.service.terminationGracePeriodSeconds }}
       hostPID: false
       hostIPC: false
       hostNetwork: false