diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
index ec4a6df09..ff745a073 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
@@ -27,4 +27,11 @@ data:
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane
     ### <NFD-WORKER-CONF-END-DO-NOT-REMOVE>
+
+    gc:
+      tolerations:
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/master
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml
index 5af87c497..8820e22ce 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml
@@ -967,6 +967,11 @@ data:
           dnsPolicy: ClusterFirstWithHostNet
           securityContext: {}
           serviceAccountName: node-feature-discovery-gc
+          tolerations:
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/master
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/control-plane
 kind: ConfigMap
 metadata:
   creationTimestamp: null
diff --git a/hack/addons/kustomize/nfd/helm-values.yaml b/hack/addons/kustomize/nfd/helm-values.yaml
index 30fae5f8f..19f762ae4 100644
--- a/hack/addons/kustomize/nfd/helm-values.yaml
+++ b/hack/addons/kustomize/nfd/helm-values.yaml
@@ -21,3 +21,10 @@ worker: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
     - effect: NoSchedule
       key: node-role.kubernetes.io/control-plane
 ### <NFD-WORKER-CONF-END-DO-NOT-REMOVE>
+
+gc:
+  tolerations:
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/master
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/control-plane