diff --git a/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml b/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
index 6a309c121..81003c704 100644
--- a/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
@@ -27,6 +27,10 @@ spec:
     checksum/secret: {{ include (print $.Template.BasePath "/omsagent-secret.yaml") . | sha256sum }}
     checksum/config: {{ toYaml .Values.omsagent.resources | sha256sum }}
   spec:
+   dnsConfig:    
+     options:
+       - name: ndots
+         value: "3"     
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
    nodeSelector:
       kubernetes.io/os: windows
diff --git a/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml b/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
index d57c4d82b..3d29ede42 100644
--- a/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
@@ -28,6 +28,10 @@ spec:
     checksum/config: {{ toYaml .Values.omsagent.resources | sha256sum }}
     checksum/logsettings: {{ toYaml .Values.omsagent.logsettings | sha256sum }}
   spec:
+   dnsConfig:    
+     options:
+       - name: ndots
+         value: "3"     
    {{- if .Values.omsagent.rbac }}
    serviceAccountName: omsagent
    {{- end }}
diff --git a/charts/azuremonitor-containers/values.yaml b/charts/azuremonitor-containers/values.yaml
index 907e315d1..b3d029146 100644
--- a/charts/azuremonitor-containers/values.yaml
+++ b/charts/azuremonitor-containers/values.yaml
@@ -58,7 +58,7 @@ omsagent:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
             - labelSelector:
-              matchExpressions:
+              matchExpressions:           
                 - key: kubernetes.io/os
                   operator: In
                   values:
@@ -67,6 +67,10 @@ omsagent:
                   operator: NotIn
                   values:
                     - virtual-kubelet
+                - key: kubernetes.io/arch 
+                  operator: In
+                  values:
+                    - amd64   
           nodeSelectorTerms:
             - labelSelector:
               matchExpressions:
@@ -78,6 +82,10 @@ omsagent:
                   operator: NotIn
                   values:
                     - virtual-kubelet
+                - key: beta.kubernetes.io/arch 
+                  operator: In
+                  values:
+                    - amd64       
   deployment:
     affinity:
       nodeAffinity:
@@ -106,6 +114,10 @@ omsagent:
                   operator: NotIn
                   values:
                     - master
+                - key: kubernetes.io/arch 
+                  operator: In
+                  values:
+                    - amd64       
           nodeSelectorTerms:
             - labelSelector:
               matchExpressions:
@@ -121,6 +133,10 @@ omsagent:
                   operator: NotIn
                   values:
                     - master
+                - key: beta.kubernetes.io/arch 
+                  operator: In
+                  values:
+                    - amd64           
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml
index 013e2a6c0..866ad70e5 100644
--- a/kubernetes/omsagent.yaml
+++ b/kubernetes/omsagent.yaml
@@ -362,6 +362,10 @@ spec:
         schema-versions: "v1"
     spec:
       serviceAccountName: omsagent
+      dnsConfig:    
+        options:
+          - name: ndots
+            value: "3"       
       containers:
         - name: omsagent
           image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11092020"
@@ -675,6 +679,10 @@ spec:
         schema-versions: "v1"
     spec:
      serviceAccountName: omsagent
+     dnsConfig:    
+        options:
+          - name: ndots
+            value: "3"     
      containers:
        - name: omsagent-win
          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod11092020"