diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml
index b6a5e529..c62005ff 100644
--- a/charts/lagoon-logging/Chart.yaml
+++ b/charts/lagoon-logging/Chart.yaml
@@ -36,3 +36,5 @@ annotations:
       description: update uselagoon/logs-dispatcher image to v3.4.0
     - kind: added
       description: schedule Logging Pods also on infra nodes
+    - kind: added
+      description: ability to configure toleration/affinity on FluentD deployment 
diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml
index a037df96..b5625d75 100644
--- a/charts/lagoon-logging/templates/logging.yaml
+++ b/charts/lagoon-logging/templates/logging.yaml
@@ -13,6 +13,14 @@ spec:
         fsGroup: 0
     scaling:
       replicas: {{ .Values.fluentdReplicaCount }}
+  {{- with .Values.fluentdAffinity }}
+    affinity:
+      {{- toYaml . | nindent 6 }}
+  {{- end }}
+  {{- with .Values.fluentdTolerations }}
+    tolerations:
+      {{- toYaml . | nindent 6 }}
+  {{- end }}
   {{- with .Values.fluentdMetrics }}
     metrics:
     {{- toYaml . | nindent 6 }}
diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml
index 5307b505..7f7b8621 100644
--- a/charts/lagoon-logging/values.yaml
+++ b/charts/lagoon-logging/values.yaml
@@ -251,6 +251,10 @@ enableDefaultForwarding: true
 # Set how many fluentd pods should be running
 fluentdReplicaCount: 3
 
+fluentdTolerations: []
+
+fluentdAffinity: {}
+
 # Add tolerations to the fluentbit daemonset so that it runs on e.g.
 # load-balancer nodes.
 fluentbitTolerations: