diff --git a/deploy/helm/templates/mailhog/ingress.yaml b/deploy/helm/templates/mailhog/ingress.yaml
index ba1b9dc3..c51e41be 100644
--- a/deploy/helm/templates/mailhog/ingress.yaml
+++ b/deploy/helm/templates/mailhog/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.mailhog.webService.name }}
+  name: {{ .Values.mailhog.webService.name }}-ingress
   namespace: {{ .Values.mailhog.namespace }}
   labels:
     release: {{ .Release.Name }}
diff --git a/deploy/helm/templates/mailhog/webservice.yaml b/deploy/helm/templates/mailhog/webservice.yaml
new file mode 100644
index 00000000..6aebf72e
--- /dev/null
+++ b/deploy/helm/templates/mailhog/webservice.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.mailhog.webService.name }}
+  namespace: {{ .Values.mailhog.namespace }}
+  labels:
+    release: {{ .Release.Name }}
+    {{- with .Values.mailhog.webService.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  ports:
+  - name: smtp
+    port: {{ .Values.mailhog.webPort }}
+    protocol: TCP
+  selector:
+    {{- toYaml .Values.mailhog.serviceSelectorLabels | nindent 4 }}
+  sessionAffinity: None
+  type: ClusterIP
diff --git a/deploy/helm/templates/web/configmap.yaml b/deploy/helm/templates/web/configmap.yaml
index 2e06da9a..16ff724a 100644
--- a/deploy/helm/templates/web/configmap.yaml
+++ b/deploy/helm/templates/web/configmap.yaml
@@ -9,5 +9,5 @@ data:
   COMMUNITY_SERVICE: {{ .Values.community.service.name }}:{{ .Values.community.port }}
   IDENTITY_SERVICE: {{ .Values.identity.service.name }}:{{ .Values.identity.port }}
   WORKSHOP_SERVICE: {{ .Values.workshop.service.name }}:{{ .Values.workshop.port }}
-  MAILHOG_WEB_SERVICE: {{ .Values.mailhog.service.name }}:{{ .Values.mailhog.webPort }}
+  MAILHOG_WEB_SERVICE: {{ .Values.mailhog.webService.name }}:{{ .Values.mailhog.webPort }}
   TLS_ENABLED: {{ .Values.tlsEnabled | quote }}