diff --git a/charts/fluentd/Chart.yaml b/charts/fluentd/Chart.yaml
index 6d1f5525..2572d9e3 100644
--- a/charts/fluentd/Chart.yaml
+++ b/charts/fluentd/Chart.yaml
@@ -4,8 +4,8 @@ description: A Helm chart for shipping Kubernetes logs via Fluentd.
 keywords:
   - logging
   - fluentd
-version: 0.30.4
-appVersion: 1.5.3
+version: 0.30.5
+appVersion: 1.5.4
 maintainers:
   - name: Yotam loewenbach
     email: yotam.loewenbach@logz.io
\ No newline at end of file
diff --git a/charts/fluentd/README.md b/charts/fluentd/README.md
index edc48ab9..7ce8f3e7 100644
--- a/charts/fluentd/README.md
+++ b/charts/fluentd/README.md
@@ -302,6 +302,8 @@ If needed, the fluentd image can be changed to support windows server 2022 with
 
 
 ## Change log
+- **0.30.5**:
+   - Upgrade fluentd version to `1.17.1`
 - **0.30.4**:
    - Fix `nodeSelector` indentation
 - **0.30.3**:
diff --git a/charts/fluentd/docker_windows/fluentd_windows.dockerfile b/charts/fluentd/docker_windows/fluentd_windows.dockerfile
index abc87077..6cfac207 100644
--- a/charts/fluentd/docker_windows/fluentd_windows.dockerfile
+++ b/charts/fluentd/docker_windows/fluentd_windows.dockerfile
@@ -1,4 +1,4 @@
-FROM fluent/fluentd:v1.16.5-windows-ltsc2019-1.0
+FROM fluent/fluentd:v1.17.1-windows-ltsc2019-1.0
 RUN gem install fluent-plugin-detect-exceptions \
 && gem install fluent-plugin-logzio \
 && gem install fluent-plugin-concat \
diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
index feeda4b3..e2f5efc4 100644
--- a/charts/fluentd/values.yaml
+++ b/charts/fluentd/values.yaml
@@ -2,12 +2,12 @@ enabled: true
 # Fluentd image in daemonset
 image: logzio/logzio-fluentd
 # Fluentd image tag
-imageTag: 1.5.3
+imageTag: 1.5.4
 
 # Fluentd image in daemonset for windows nodes
 windowsImage: logzio/fluentd-windows
 # Fluentd image tag for windows nodes
-windowsImageTag: 0.0.3
+windowsImageTag: 0.0.4
 
 # Overrides the Chart name for resources
 nameOverride: ""