diff --git a/charts/pdp/templates/deployment.yaml b/charts/pdp/templates/deployment.yaml
index 214cea11..ce9293ab 100644
--- a/charts/pdp/templates/deployment.yaml
+++ b/charts/pdp/templates/deployment.yaml
@@ -155,3 +155,15 @@ spec:
         - name: opa-volume
           emptyDir: {}
       {{- end }}
+      {{- with .Values.pdp.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pdp.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pdp.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/pdp/values.yaml b/charts/pdp/values.yaml
index 49aebdf7..38e1e973 100644
--- a/charts/pdp/values.yaml
+++ b/charts/pdp/values.yaml
@@ -42,6 +42,9 @@ pdp:
       port: 443
       index: "<elasticsearch index>"
   debug_mode: false
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
 
 podDisruptionBudget:
   # Automatically enabled when replicas > 1