diff --git a/arm_exporter.jsonnet b/arm_exporter.jsonnet
index 2b43e7d..eb780e7 100644
--- a/arm_exporter.jsonnet
+++ b/arm_exporter.jsonnet
@@ -72,8 +72,8 @@ local utils = import 'utils.libsonnet';
       daemonset.mixin.metadata.withLabels(podLabels) +
       daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
       daemonset.mixin.spec.template.metadata.withLabels(podLabels) +
-      daemonset.mixin.spec.template.spec.withNodeSelector({ 'beta.kubernetes.io/arch': 'arm64' }) +
-      daemonset.mixin.spec.template.spec.withTolerations([{'operator': 'Exists'}]) +
+      daemonset.mixin.spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.withNodeSelectorTerms([{ matchExpressions: [{ key: 'kubernetes.io/arch', operator: 'In', values: ['arm', 'arm64'] }] }]) +
+      daemonset.mixin.spec.template.spec.withTolerations([{ 'operator': 'Exists' }]) +
       daemonset.mixin.spec.template.spec.withServiceAccountName('arm-exporter') +
       daemonset.mixin.spec.template.spec.withContainers(c),