diff --git a/deploy/templates/deployment_manager.yaml b/deploy/templates/deployment_manager.yaml
index 93f69e2b..f15ca506 100644
--- a/deploy/templates/deployment_manager.yaml
+++ b/deploy/templates/deployment_manager.yaml
@@ -69,3 +69,7 @@ spec:
       volumes:
       {{- toYaml .Values.manager.volumes | nindent 8 }}
       {{- end}}
+      {{- if .Values.manager.nodeSelector }}
+      nodeSelector:
+      {{- toYaml .Values.manager.nodeSelector | nindent 8 }}
+      {{- end}}
diff --git a/deploy/templates/deployment_registry.yaml b/deploy/templates/deployment_registry.yaml
index 5bbdae6c..2ec4d609 100644
--- a/deploy/templates/deployment_registry.yaml
+++ b/deploy/templates/deployment_registry.yaml
@@ -55,3 +55,7 @@ spec:
       {{- if .Values.registry.tls.enabled }}
       {{- toYaml .Values.registry.tls.volumes | nindent 8 }}
       {{- end}}
+      {{- if .Values.registry.nodeSelector }}
+      nodeSelector:
+      {{- toYaml .Values.registry.nodeSelector | nindent 8 }}
+      {{- end}}
diff --git a/deploy/values.yaml b/deploy/values.yaml
index a7578fae..a05ee58c 100644
--- a/deploy/values.yaml
+++ b/deploy/values.yaml
@@ -28,6 +28,7 @@ registry:
               path: "key.pem"
             - key: "ca.crt"
               path: "ca.pem"
+  nodeSelector: {}
 
 manager:
   replicaCount: 1