diff --git a/helm/rustfs/templates/ingress.yaml b/helm/rustfs/templates/ingress.yaml
index c1b3a9d62..164d9c5e3 100644
--- a/helm/rustfs/templates/ingress.yaml
+++ b/helm/rustfs/templates/ingress.yaml
@@ -2,6 +2,8 @@
 {{- $ingressAnnotations := dict }}
 {{- if eq .Values.ingress.className "nginx" }}
 {{- $ingressAnnotations = .Values.ingress.nginxAnnotations }}
+{{- else if eq .Values.ingress.className "traefik" }}
+{{- $ingressAnnotations = .Values.ingress.traefikAnnotations }}
 {{- else if eq .Values.ingress.className "" }}
 {{- $ingressAnnotations = .Values.ingress.customAnnotations }}
 {{- end }}
diff --git a/helm/rustfs/templates/secret-tls.yaml b/helm/rustfs/templates/secret-tls.yaml
index 562724855..d8261904e 100644
--- a/helm/rustfs/templates/secret-tls.yaml
+++ b/helm/rustfs/templates/secret-tls.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingress.tls.enabled -}}
+{{- if and .Values.ingress.tls.enabled (not .Values.ingress.tls.certManager.enabled) -}}
 apiVersion: v1
 kind: Secret
 metadata: