diff --git a/charts/osm/templates/grafana-deployment.yaml b/charts/osm/templates/grafana-deployment.yaml
index 341903d1bd..36c2400d14 100644
--- a/charts/osm/templates/grafana-deployment.yaml
+++ b/charts/osm/templates/grafana-deployment.yaml
@@ -24,6 +24,9 @@ spec:
       {{- include "restricted.securityContext" . | nindent 6 }}
       {{- end }}
       serviceAccountName: osm-grafana
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: grafana
           image: "grafana/grafana:7.0.1"
diff --git a/charts/osm/templates/jaeger-deployment.yaml b/charts/osm/templates/jaeger-deployment.yaml
index ebc19795b3..d6fd621d56 100644
--- a/charts/osm/templates/jaeger-deployment.yaml
+++ b/charts/osm/templates/jaeger-deployment.yaml
@@ -22,6 +22,9 @@ spec:
       {{- include "restricted.securityContext" . | nindent 6 }}
       {{- end }}
       serviceAccountName: jaeger
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
       - name: jaeger
         image: jaegertracing/all-in-one
diff --git a/charts/osm/templates/osm-gateway-deployment.yaml b/charts/osm/templates/osm-gateway-deployment.yaml
index e0ca5c3611..32faf4212f 100644
--- a/charts/osm/templates/osm-gateway-deployment.yaml
+++ b/charts/osm/templates/osm-gateway-deployment.yaml
@@ -17,6 +17,9 @@ spec:
         app: osm-gateway
       name: osm-gateway
     spec:
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       initContainers:
         - name: osm-gateway-init
           image: curlimages/curl
diff --git a/charts/osm/templates/prometheus-deployment.yaml b/charts/osm/templates/prometheus-deployment.yaml
index 3603e703ed..cb758b8b01 100644
--- a/charts/osm/templates/prometheus-deployment.yaml
+++ b/charts/osm/templates/prometheus-deployment.yaml
@@ -22,6 +22,9 @@ spec:
       {{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1") }}
       {{- include "restricted.securityContext" . | nindent 6 }}
       {{- end }}
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
       - name: prometheus
         ports:
diff --git a/cmd/cli/testdata/test-chart/templates/deployment.yaml b/cmd/cli/testdata/test-chart/templates/deployment.yaml
index 0a72443a3a..52d8abab71 100644
--- a/cmd/cli/testdata/test-chart/templates/deployment.yaml
+++ b/cmd/cli/testdata/test-chart/templates/deployment.yaml
@@ -15,6 +15,9 @@ spec:
         testing: test
     spec:
       {{- with .Values.OpenServiceMesh.imagePullSecrets }}
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end}}
diff --git a/demo/deploy-bookbuyer.sh b/demo/deploy-bookbuyer.sh
index b7231f266d..6421d784f4 100755
--- a/demo/deploy-bookbuyer.sh
+++ b/demo/deploy-bookbuyer.sh
@@ -47,7 +47,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: bookbuyer
-
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         # Main container with APP
         - name: bookbuyer
diff --git a/demo/deploy-bookstore-with-same-sa.sh b/demo/deploy-bookstore-with-same-sa.sh
index 20d023774f..5428f3a37f 100755
--- a/demo/deploy-bookstore-with-same-sa.sh
+++ b/demo/deploy-bookstore-with-same-sa.sh
@@ -74,6 +74,9 @@ spec:
         version: $VERSION
     spec:
       serviceAccountName: bookstore
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - image: "${CTR_REGISTRY}/bookstore:${CTR_TAG}"
           imagePullPolicy: Always
diff --git a/demo/deploy-bookstore.sh b/demo/deploy-bookstore.sh
index ad24859dd9..38c4c67e0b 100755
--- a/demo/deploy-bookstore.sh
+++ b/demo/deploy-bookstore.sh
@@ -80,6 +80,9 @@ spec:
         version: $VERSION
     spec:
       serviceAccountName: "$SVC"
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - image: "${CTR_REGISTRY}/bookstore:${CTR_TAG}"
           imagePullPolicy: Always
diff --git a/demo/deploy-bookthief.sh b/demo/deploy-bookthief.sh
index 1693f0e74f..0318de7191 100755
--- a/demo/deploy-bookthief.sh
+++ b/demo/deploy-bookthief.sh
@@ -65,7 +65,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: bookthief
-
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         # Main container with APP
         - name: bookthief
diff --git a/demo/deploy-bookwarehouse.sh b/demo/deploy-bookwarehouse.sh
index eebf7c37be..38ae079988 100755
--- a/demo/deploy-bookwarehouse.sh
+++ b/demo/deploy-bookwarehouse.sh
@@ -59,7 +59,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: bookwarehouse
-
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         # Main container with APP
         - name: bookwarehouse
diff --git a/demo/deploy-tcp-client.sh b/demo/deploy-tcp-client.sh
index cd218548fd..8a190d968b 100755
--- a/demo/deploy-tcp-client.sh
+++ b/demo/deploy-tcp-client.sh
@@ -41,6 +41,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: tcp-client
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
       - name: tcp-client
         image: "${CTR_REGISTRY}/tcp-client:${CTR_TAG}"
diff --git a/demo/deploy-tcp-echo-service.sh b/demo/deploy-tcp-echo-service.sh
index 855282105b..ec2b827baf 100755
--- a/demo/deploy-tcp-echo-service.sh
+++ b/demo/deploy-tcp-echo-service.sh
@@ -59,6 +59,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: tcp-echo
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
       - name: tcp-echo-server
         image: "${CTR_REGISTRY}/tcp-echo-server:${CTR_TAG}"
diff --git a/demo/deploy-vault.sh b/demo/deploy-vault.sh
index 669d0a8e5b..d06e30897b 100755
--- a/demo/deploy-vault.sh
+++ b/demo/deploy-vault.sh
@@ -27,6 +27,9 @@ spec:
       labels:
         app: vault
     spec:
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       terminationGracePeriodSeconds: 10
       containers:
       - name: vault
diff --git a/docs/example/manifests/apps/bookbuyer.yaml b/docs/example/manifests/apps/bookbuyer.yaml
index 83570b8683..4c4c10e0b1 100644
--- a/docs/example/manifests/apps/bookbuyer.yaml
+++ b/docs/example/manifests/apps/bookbuyer.yaml
@@ -26,6 +26,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: bookbuyer
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: bookbuyer
           image: openservicemesh/bookbuyer:v0.9.0
diff --git a/docs/example/manifests/apps/bookstore-v2.yaml b/docs/example/manifests/apps/bookstore-v2.yaml
index 0054dff3f0..350744ff33 100644
--- a/docs/example/manifests/apps/bookstore-v2.yaml
+++ b/docs/example/manifests/apps/bookstore-v2.yaml
@@ -41,6 +41,9 @@ spec:
         app: bookstore-v2
     spec:
       serviceAccountName: bookstore-v2
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: bookstore
           image: openservicemesh/bookstore:v0.9.0
diff --git a/docs/example/manifests/apps/bookstore.yaml b/docs/example/manifests/apps/bookstore.yaml
index 933f260203..467d2940c2 100644
--- a/docs/example/manifests/apps/bookstore.yaml
+++ b/docs/example/manifests/apps/bookstore.yaml
@@ -41,6 +41,9 @@ spec:
         app: bookstore
     spec:
       serviceAccountName: bookstore
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: bookstore
           image: openservicemesh/bookstore:v0.9.0
diff --git a/docs/example/manifests/apps/bookthief.yaml b/docs/example/manifests/apps/bookthief.yaml
index 97a5c47b83..d4e27949de 100644
--- a/docs/example/manifests/apps/bookthief.yaml
+++ b/docs/example/manifests/apps/bookthief.yaml
@@ -25,6 +25,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: bookthief
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: bookthief
           image: openservicemesh/bookthief:v0.9.0
diff --git a/docs/example/manifests/apps/bookwarehouse.yaml b/docs/example/manifests/apps/bookwarehouse.yaml
index 9578c45d71..17f24f69a6 100644
--- a/docs/example/manifests/apps/bookwarehouse.yaml
+++ b/docs/example/manifests/apps/bookwarehouse.yaml
@@ -42,6 +42,9 @@ spec:
         version: v1
     spec:
       serviceAccountName: bookwarehouse
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: bookwarehouse
           image: openservicemesh/bookwarehouse:v0.9.0
diff --git a/docs/example/manifests/opa/deploy-opa-envoy.yaml b/docs/example/manifests/opa/deploy-opa-envoy.yaml
index a67cc4ef42..e797c97d5a 100644
--- a/docs/example/manifests/opa/deploy-opa-envoy.yaml
+++ b/docs/example/manifests/opa/deploy-opa-envoy.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: opa
     spec:
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: opa-envoy
           image: openpolicyagent/opa:0.28.0-envoy
diff --git a/docs/example/manifests/samples/curl/curl.yaml b/docs/example/manifests/samples/curl/curl.yaml
index 22fe0a4d49..726d7d9b13 100644
--- a/docs/example/manifests/samples/curl/curl.yaml
+++ b/docs/example/manifests/samples/curl/curl.yaml
@@ -18,6 +18,9 @@ spec:
         app: curl
     spec:
       serviceAccountName: curl
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
       - image: curlimages/curl
         imagePullPolicy: IfNotPresent
diff --git a/docs/example/manifests/samples/httpbin/httpbin.yaml b/docs/example/manifests/samples/httpbin/httpbin.yaml
index 3d4bc7300c..85b96632a9 100644
--- a/docs/example/manifests/samples/httpbin/httpbin.yaml
+++ b/docs/example/manifests/samples/httpbin/httpbin.yaml
@@ -33,6 +33,9 @@ spec:
         app: httpbin
     spec:
       serviceAccountName: httpbin
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
       - image: kennethreitz/httpbin
         imagePullPolicy: IfNotPresent