diff --git a/fluent-operator.yaml b/fluent-operator.yaml
index c88ac12950c..057a4be5437 100644
--- a/fluent-operator.yaml
+++ b/fluent-operator.yaml
@@ -1,7 +1,7 @@
 package:
   name: fluent-operator
-  version: "3.4.0"
-  epoch: 4 # CVE-2025-47907
+  version: "3.5.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: a72cb8b12a7db31c0a11c8c062439036cf74595b
+      expected-commit: cf5582c23d9e8d96ba1d77d3c7ac48a0456ff7c2
       tag: v${{package.version}}
 
   - uses: go/build
@@ -114,8 +114,14 @@ test:
     - runs: |
         manager --help
     - name: "Test operator"
-      runs: |
-        kubectl create ns fluent
-        kubectl apply --server-side=true -f https://github.com/fluent/fluent-operator/releases/download/v${{package.version}}/setup.yaml
-        manager -metrics-bind-address 0.0.0.0:8082 > manager.log 2>&1 &
-        sleep 5; curl localhost:8082/metrics |grep workqueue_retries_total
+      uses: test/daemon-check-output
+      with:
+        timeout: 30
+        expected_output: |
+          Starting workers
+          Starting Controller
+          Starting EventSource
+        setup: |
+          kubectl create ns fluent
+          kubectl apply --server-side=true -f https://github.com/fluent/fluent-operator/releases/download/v${{package.version}}/setup.yaml
+        start: manager -metrics-bind-address 0.0.0.0:8082