diff --git a/stable/kafka-manager/Chart.yaml b/stable/kafka-manager/Chart.yaml
index 9b3061968fcb..c66027a5e727 100644
--- a/stable/kafka-manager/Chart.yaml
+++ b/stable/kafka-manager/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kafka-manager
-version: 2.3.0
+version: 2.3.1
 appVersion: 1.3.3.22
 kubeVersion: "^1.8.0-0"
 description: A tool for managing Apache Kafka.
diff --git a/stable/kafka-manager/templates/job.yaml b/stable/kafka-manager/templates/job.yaml
index cb6a282cccca..b4c1a62b16bf 100644
--- a/stable/kafka-manager/templates/job.yaml
+++ b/stable/kafka-manager/templates/job.yaml
@@ -24,6 +24,8 @@ spec:
           configMap:
             name: {{ template "kafka-manager.bootstrap.fullname" . }}
             defaultMode: 0744
+      nodeSelector:
+        kubernetes.io/arch: amd64
       containers:
         - name: {{ .Chart.Name }}-bootstrap
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"