diff --git a/helm-charts/infisical/templates/_helpers.tpl b/helm-charts/infisical/templates/_helpers.tpl
index bf3f8e301..d1a0b7922 100644
--- a/helm-charts/infisical/templates/_helpers.tpl
+++ b/helm-charts/infisical/templates/_helpers.tpl
@@ -127,3 +127,46 @@ Create the mongodb connection string.
 {{- end -}}
 {{- printf "%s" $connectionString -}}
 {{- end -}}
+
+
+{{- define "infisical.ingress-rules" -}}
+{{- $ingress := .Values.ingress }}
+{{- if $ingress.hostName }}
+rules:
+  - host: {{ $ingress.hostName }}
+    http:
+      paths:
+      - path: {{ $ingress.frontend.path }}
+        pathType: {{ $ingress.frontend.pathType }}
+        backend:
+          service:
+            name: {{ include "infisical.frontend.fullname" . }}
+            port:
+              number: 3000
+      - path: {{ $ingress.backend.path }}
+        pathType: {{ $ingress.backend.pathType }}
+        backend:
+          service:
+            name: {{ include "infisical.backend.fullname" . }}
+            port:
+              number: 4000
+{{- else }}
+rules:
+  - http:
+      paths:
+      - path: {{ $ingress.frontend.path }}
+        pathType: {{ $ingress.frontend.pathType }}
+        backend:
+          service:
+            name: {{ include "infisical.frontend.fullname" . }}
+            port:
+              number: 3000
+      - path: {{ $ingress.backend.path }}
+        pathType: {{ $ingress.backend.pathType }}
+        backend:
+          service:
+            name: {{ include "infisical.backend.fullname" . }}
+            port:
+              number: 4000
+{{- end }}
+{{- end }}
diff --git a/helm-charts/infisical/templates/backend-deployment.yaml b/helm-charts/infisical/templates/backend-deployment.yaml
index b6d63372f..f0b134d5b 100644
--- a/helm-charts/infisical/templates/backend-deployment.yaml
+++ b/helm-charts/infisical/templates/backend-deployment.yaml
@@ -89,5 +89,4 @@ stringData:
     {{- $v := $value | default ($current | default $default) -}}
     {{ $key }}: {{ $v | quote }}
   {{ end -}}
-  MONGO_URL: {{ include "infisical.mongodb.connectionString" . | quote }}
 {{- end }}
diff --git a/helm-charts/infisical/templates/ingress.yaml b/helm-charts/infisical/templates/ingress.yaml
index 9b181fe64..57d1e4434 100644
--- a/helm-charts/infisical/templates/ingress.yaml
+++ b/helm-charts/infisical/templates/ingress.yaml
@@ -27,22 +27,5 @@ spec:
       secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
-  rules:
-  - host: {{ $ingress.hostName}}
-    http: 
-      paths:
-      - path: {{ $ingress.frontend.path }}
-        pathType: {{ $ingress.frontend.pathType }}
-        backend:
-          service:
-            name: {{ include "infisical.frontend.fullname" . }}
-            port:
-              number: 3000
-      - path: {{ $ingress.backend.path }}
-        pathType: {{ $ingress.backend.pathType }}
-        backend:
-          service:
-            name: {{ include "infisical.backend.fullname" . }}
-            port:
-              number: 4000
+{{- include "infisical.ingress-rules" . | nindent 2 }}
 {{ end }}
\ No newline at end of file
diff --git a/helm-charts/infisical/values.yaml b/helm-charts/infisical/values.yaml
index 4f540ff6d..8d6b78325 100644
--- a/helm-charts/infisical/values.yaml
+++ b/helm-charts/infisical/values.yaml
@@ -303,13 +303,14 @@ ingress:
   ingressClassName: nginx
   ## @param ingress.annotations Ingress annotations
   ##
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: "nginx"
     # cert-manager.io/issuer: letsencrypt-nginx
   ## @param ingress.hostName Ingress hostname (your custom domain name)
   ## Replace with your own domain
   ##
-  hostName: infisical.local
+  hostName: ""
   ## @skip ingress.frontend
   ##
   frontend:
@@ -396,7 +397,8 @@ mailhog:
     ingressClassName: nginx
     ## @param mailhog.ingress.annotations Ingress annotations
     ##
-    annotations: {}
+    annotations:
+      {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
     ## @param mailhog.ingress.labels Ingress labels