Adjust flags to ensure tunnel producer is cleaned up (#7336)

(cherry picked from commit bb40940f394609ba359c9f2a132fae4af0e0e4cd)
1 file changed