diff --git a/charts/brokencrystals/Chart.yaml b/charts/brokencrystals/Chart.yaml
index 9fdfcb8..e310ed2 100644
--- a/charts/brokencrystals/Chart.yaml
+++ b/charts/brokencrystals/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   Benchmark application that uses modern technologies and implements a set of
   common security vulnerabilities
 type: application
-version: 0.0.95
+version: 0.0.96
 icon: https://raw.githubusercontent.com/NeuraLegion/brokencrystals/stable/public/public/assets/img/logo.png
 keywords:
   - brokencrystals
diff --git a/charts/brokencrystals/templates/deployment.yaml b/charts/brokencrystals/templates/deployment.yaml
index 2165b89..422343e 100644
--- a/charts/brokencrystals/templates/deployment.yaml
+++ b/charts/brokencrystals/templates/deployment.yaml
@@ -189,9 +189,11 @@ spec:
             failureThreshold: 12
             periodSeconds: 10
 
+        {{- if .Values.mailcatcher }}
         - name: mailcatcher
           image: sj26/mailcatcher
-
+        {{- end }}
+        
         {{- if and .Values.repeaterID .Values.token .Values.cluster }}
         - name: repeater
           image: brightsec/cli{{ if ne .Values.repeaterImageTag "" }}:{{ .Values.repeaterImageTag }}{{ else }}:latest{{ end }}
diff --git a/charts/brokencrystals/templates/ingress.yaml b/charts/brokencrystals/templates/ingress.yaml
index 743762b..cd05e5f 100644
--- a/charts/brokencrystals/templates/ingress.yaml
+++ b/charts/brokencrystals/templates/ingress.yaml
@@ -58,6 +58,7 @@ spec:
                 port:
                   number: 8080
 
+{{- if .Values.mailcatcher }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -87,3 +88,4 @@ spec:
                 name: {{ .Release.Name }}-mailcatcher
                 port:
                   number: 1080
+{{- end }}
diff --git a/charts/brokencrystals/values.yaml b/charts/brokencrystals/values.yaml
index f695332..ac93158 100644
--- a/charts/brokencrystals/values.yaml
+++ b/charts/brokencrystals/values.yaml
@@ -15,3 +15,4 @@ snifferApiKey: ""
 snifferProjectID: ""
 snifferNetworkInterface: ""
 clusterConfigMap: "brokencrystals-config"
+mailcatcher: false