diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile
index a41f1f14..00d74601 100644
--- a/docker/heralding/Dockerfile
+++ b/docker/heralding/Dockerfile
@@ -1,11 +1,10 @@
-FROM alpine:3.12.1
+FROM alpine:3.13
 #  
 # Include dist
 ADD dist/ /root/dist/
 #
 # Install packages
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \ 
+RUN apk -U --no-cache add \ 
             		build-base \
             		git \
             		libcap \
@@ -13,7 +12,9 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
             		openssl-dev \
                         libzmq \
             		postgresql-dev \
+			py3-cryptography \
 			py3-pip \
+			py3-pyzmq \
             		python3 \
             		python3-dev \
             		py-virtualenv && \
@@ -23,7 +24,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
     cd /opt/ && \
     git clone https://github.com/johnnykv/heralding && \
     cd heralding && \
-    git checkout 9e9e9218f053c515ebb234667fb5575e6154ffa5 && \
+    git checkout 3f38976a2ab4d884d755b6324f2c71923ddadbdb && \
     pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir . && \
 #
diff --git a/docker/heralding/dist/heralding.yml b/docker/heralding/dist/heralding.yml
index 9f7f13b4..52c228eb 100644
--- a/docker/heralding/dist/heralding.yml
+++ b/docker/heralding/dist/heralding.yml
@@ -62,6 +62,7 @@ capabilities:
     timeout: 30
     protocol_specific_data:
       max_attempts: 3
+      banner: "+OK POP3 server ready"
 
   pop3s:
     enabled: true
@@ -69,6 +70,7 @@ capabilities:
     timeout: 30
     protocol_specific_data:
       max_attempts: 3
+      banner: "+OK POP3 server ready"
       # if a .pem file is not found in work dir, a new pem file will be created
       # using these values
       cert:
@@ -157,6 +159,25 @@ capabilities:
       # If the fqdn option is commented out or empty, then fqdn of the host will be used
       fqdn: ""
 
+  smtps:
+    enabled: true
+    port: 465
+    timeout: 30
+    protocol_specific_data:
+      banner: "Microsoft ESMTP MAIL service ready"
+      # If the fqdn option is commented out or empty, then fqdn of the host will be used
+      fqdn: ""
+      cert:
+        common_name: "*"
+        country: "US"
+        state: None
+        locality: None
+        organization: None
+        organizational_unit: None
+        # how many days should the certificate be valid for
+        valid_days: 365
+        serial_number: 0
+
   vnc:
     enabled: true
     port: 5900
diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml
index 945cb0c3..b3e610ff 100644
--- a/docker/heralding/docker-compose.yml
+++ b/docker/heralding/docker-compose.yml
@@ -23,6 +23,7 @@ services:
      - "110:110"
      - "143:143"
      - "443:443"
+     - "465:465"
      - "993:993"
      - "995:995"
      - "1080:1080"