diff --git a/fluent-operator.yaml b/fluent-operator.yaml
index b26d2902c34..cd722d4ca46 100644
--- a/fluent-operator.yaml
+++ b/fluent-operator.yaml
@@ -1,7 +1,7 @@
 package:
   name: fluent-operator
-  version: "3.5.0"
-  epoch: 2 # CVE-2025-47907
+  version: "3.6.0"
+  epoch: 0 # CVE-2025-47907
   description: Operate Fluent Bit and Fluentd in the Kubernetes way - Previously known as FluentBit Operator
   copyright:
     - license: Apache-2.0
@@ -15,7 +15,7 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/fluent/fluent-operator
-      expected-commit: cf5582c23d9e8d96ba1d77d3c7ac48a0456ff7c2
+      expected-commit: f7b17bbff96a3c414c5ba239789edc5a3fbcba02
       tag: v${{package.version}}
 
   - uses: go/build