diff --git a/deployment/digital-ocean/https/templates/ingress.template.yaml b/deployment/digital-ocean/https/templates/ingress.template.yaml
index ba4681bc8..9d0068e08 100644
--- a/deployment/digital-ocean/https/templates/ingress.template.yaml
+++ b/deployment/digital-ocean/https/templates/ingress.template.yaml
@@ -10,6 +10,7 @@ metadata:
 spec:
   tls:
   - hosts:
+    # - nitro-mailserver.human-connection.org
     - nitro-staging.human-connection.org
     secretName: tls
   rules:
@@ -20,3 +21,10 @@ spec:
         backend:
           serviceName: nitro-web
           servicePort: 3000
+  # - host: nitro-mailserver.human-connection.org
+  #   http:
+  #     paths:
+  #     - path: /
+  #       backend:
+  #         serviceName: mailserver
+  #         servicePort: 80
diff --git a/deployment/human-connection/mailserver/deployment-mailserver.yaml b/deployment/human-connection/mailserver/deployment-mailserver.yaml
new file mode 100644
index 000000000..d97a66bc9
--- /dev/null
+++ b/deployment/human-connection/mailserver/deployment-mailserver.yaml
@@ -0,0 +1,34 @@
+---
+  apiVersion: extensions/v1beta1
+  kind: Deployment
+  metadata:
+    name: mailserver
+    namespace: human-connection
+  spec:
+    replicas: 1
+    minReadySeconds: 15
+    progressDeadlineSeconds: 60
+    selector:
+      matchLabels:
+        human-connection.org/selector: deployment-human-connection-mailserver
+    template:
+      metadata:
+        labels:
+          human-connection.org/selector: deployment-human-connection-mailserver
+        name: "mailserver"
+      spec:
+        containers:
+        - name: mailserver
+          image: djfarrelly/maildev
+          imagePullPolicy: Always
+          ports:
+          - containerPort: 80
+          - containerPort: 25
+          envFrom:
+          - configMapRef:
+              name: configmap
+          - secretRef:
+              name: human-connection
+        restartPolicy: Always
+        terminationGracePeriodSeconds: 30
+  status: {}
diff --git a/deployment/human-connection/mailserver/service-mailserver.yaml b/deployment/human-connection/mailserver/service-mailserver.yaml
new file mode 100644
index 000000000..655488b89
--- /dev/null
+++ b/deployment/human-connection/mailserver/service-mailserver.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mailserver
+  namespace: human-connection
+  labels:
+    human-connection.org/selector: deployment-human-connection-mailserver
+spec:
+  ports:
+  - name: web
+    port: 80
+    targetPort: 80
+  - name: smtp
+    port: 25
+    targetPort: 25
+  selector:
+    human-connection.org/selector: deployment-human-connection-mailserver
diff --git a/deployment/human-connection/templates/configmap.template.yaml b/deployment/human-connection/templates/configmap.template.yaml
index 87b51a7d3..b2d2bc1d6 100644
--- a/deployment/human-connection/templates/configmap.template.yaml
+++ b/deployment/human-connection/templates/configmap.template.yaml
@@ -2,6 +2,10 @@
   apiVersion: v1
   kind: ConfigMap
   data:
+    SMTP_HOST: "http://mailserver.human-connection"
+    SMTP_PORT: "25"
+    SMTP_USERNAME: ""
+    SMTP_PASSWORD: ""
     GRAPHQL_PORT: "4000"
     GRAPHQL_URI: "http://nitro-backend.human-connection:4000"
     MOCKS: "false"