diff --git a/charts/flink-operator/Chart.yaml b/charts/flink-operator/Chart.yaml
index dac2096b..bf78fa38 100644
--- a/charts/flink-operator/Chart.yaml
+++ b/charts/flink-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Intalls the Spotify-version of the Flink-on-K8S-Operator
 name: flink-operator
-version: 0.1.0
+version: 0.2.0
 appVersion: v0.3.0
 sources:
   - https://github.com/spotify/flink-on-k8s-operator/releases
diff --git a/charts/flink-operator/README.md b/charts/flink-operator/README.md
index 9a4820ef..3fd2940d 100644
--- a/charts/flink-operator/README.md
+++ b/charts/flink-operator/README.md
@@ -1,6 +1,6 @@
 # flink-operator
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.3.0](https://img.shields.io/badge/AppVersion-v0.3.0-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![AppVersion: v0.3.0](https://img.shields.io/badge/AppVersion-v0.3.0-informational?style=flat-square)
 
 Intalls the Spotify-version of the Flink-on-K8S-Operator
 
@@ -33,6 +33,7 @@ Intalls the Spotify-version of the Flink-on-K8S-Operator
 | leaderElection.name | string | `"flink-operator-lock"` | (`string` The name of the Lease to hold if Leader Election is enabled. |
 | mutatingWebhook.enabled | `bool` | `true` | Whether or not to create the MutatingWebhookConfiguration. Optionally disable-able if you are installing in a non-privileged environment where you cannot create Cluster-scoped resources. |
 | namespaceScoped | `bool` | `false` | If enabled, then the Flink Operator will be scoped to watch only this local namespace. If this is set to `false` then all of the `Roles1 and `RoleBindings` will be namespace scoped. If this is set to True, then they will be converted to `ClusterRoles` and ClusterRoleBindings`. |
+| nodeSelector | `map` | `{}` | Optional nodeSelector for the manager pod |
 | podMonitor.enabled | `bool` | `true` | whether or not to enable pod monitor |
 | rbacProxy.image.repository | `string` | `"gcr.io/kubebuilder/kube-rbac-proxy"` | The Docker Image to pull for the sidecar that provides secure authentication into the Flink Operator pod for the Kubernetes API. |
 | rbacProxy.image.tag | `string` | `"v0.8.0"` | The Docker Tag to use |
diff --git a/charts/flink-operator/templates/deployment.yaml b/charts/flink-operator/templates/deployment.yaml
index b196620a..58e3341a 100644
--- a/charts/flink-operator/templates/deployment.yaml
+++ b/charts/flink-operator/templates/deployment.yaml
@@ -22,6 +22,11 @@ spec:
         runAsNonRoot: false
       serviceAccountName: {{ .Release.Name }}-controller-manager
       terminationGracePeriodSeconds: 10
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        {{- with .Values.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       containers:
       - name: manager
         image: {{ include "flink-operator.imageFqdn" . }}
diff --git a/charts/flink-operator/values.yaml b/charts/flink-operator/values.yaml
index 252da2bd..e00db933 100644
--- a/charts/flink-operator/values.yaml
+++ b/charts/flink-operator/values.yaml
@@ -17,6 +17,9 @@ image:
 # within the controller pod.
 resources:
 
+# -- (`map`) Optional nodeSelector for the manager pod
+nodeSelector: {}
+
 rbacProxy:
   image:
     # -- (`string`) The Docker Image to pull for the sidecar that provides