diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9777659..8ddfd01 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,6 +5,11 @@ on:
   push:
     tags:        
       - v*
+    branches:
+      - main
+      - develop
+  schedule:
+    - cron: "0 0  * * *"
 
 jobs:
   Deploy:
@@ -12,16 +17,32 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=semver,pattern={{raw}}
+            type=ref,event=branch
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: JM-Lemmi
-          password: ${{ secrets.GHCR_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v2
         with:
+          platforms: linux/amd64,linux/arm64,linux/arm
           push: true # Will only build if this is not here
-          tags: |
-            ghcr.io/${{ github.repository }}:${{ github.ref }}
-            ghcr.io/${{ github.repository }}:latest
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index b72be5a..50b2796 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,4 +62,9 @@ EXPOSE 587
 
 ADD ./files/start.sh /
 RUN chmod +x /start.sh
+
+ADD ./files/tls.sh /
+RUN chmod +x /tls.sh
+RUN mkdir /tls/
+
 CMD ["/start.sh"]
diff --git a/Readme.md b/Readme.md
index b0d343b..f2941ef 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,34 +1,102 @@
-# SMTP-Zimbraweb-Bridge in Docker
+# Zimbraweb-SMTP-Bridge in Docker
 
 This Container allows users to send E-Mails via SMTP to a Zimbra Web Interface. It utilizes Postfix as receiver and the python package [zimbraweb](https://github.com/cirosec-studis/python-zimbra-web).
 
 <span style="color: red;">This Container is still in development and should not be used in Production environments or for important E-Mails!</span>
 
-‼ Currently it only supports plain SMTP over Port 587, no TLS. **Your password is readable to anyone on the network** <br />
-‼ It also only supports Plaintext E-Mails, no Attachments, until this is implemented in zimbraweb.<br />
-‼ SMTP will also not return an error if the sending was unsuccessfull, you need to check the Postifx logs to see if it was successful.
+‼ It only supports Plaintext E-Mails, and Attachments, but not HTML or RTF-Mails. This is due to a restriction in the Zimbra Webinterface<br />
 
+## Public Bridge
 
-## Setup
+There is a public server available at dhbw-mannheim.email at port 2525. Connect to it via SMTP with STARTTLS. For increased security we recommend hosting the Bridge yourself if you have a server available, [more on that below](#self-hosting). The public bridge is configured to automatically purge all data every 60 minutes. No logging data is written to disk at all, auth tokens (which are needed to authenticated with the Web Client) are kept only in memory and for 60 minutes at most, but in almost all cases will be deleted immediately after successful email delivery.
+
+You can use the following settings:
+
+IMAP (SSL/TLS): `studgate.dhbw-mannheim.de` at port `993`
+
+SMTP (STARTTLS): `dhbw-mannheim.email` at port `2525`
+
+Authenticate with the same credentials that you use for the Web Interface (--> without the @student.dhbw.mannheim.de part!)
+
+You need to make sure your client sends emails in text/plain because Zimbra Web does not support HTML emails.
+
+### Outlook
+
+https://user-images.githubusercontent.com/18506129/141695204-2dd563d1-2a69-4a9c-97b9-0e1ee1667c24.mp4
+
+In Outlook, you should set your default mail format to "Plain Text" ("Nur Text") by going to File->Options->Mail ("Datei->Optionen->E-mail") and selecting "Plain Text" ("Nur Text") in the "Compose messages in this format" ("Nachrichten in diesem Format verfassen") dropdown.
+
+### Thunderbird
+
+https://user-images.githubusercontent.com/18506129/141694660-e9a54848-7474-45b1-9ffb-956a3e1ee264.mp4
+
+Please note that lowering the minimum TLS version is requried because the Zimbra IMAP server uses outdated IMAP. There is sadly nothing we can do on our side to fix this. The SMTP Bridge uses up-to-date TLS.
+
+In Thunderbird you should go to Acccount Settings, select "Composition & Addressing" in the Account and deselect "Compose messages in HTML format."
+
+## Self-Hosting
 
 To start the container use the following command
 
 ```
-docker run -p 587:587 ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:a.2
+docker run --name smtp_bridge -h <your_domain_name> -p 587:587 ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:nightly
+```
+
+If you do not have a domain name associated with the server, you can use whatever hostname you want, e.g. "smtp_bridge.local".
+
+### TLS Support
+
+TLS is enabled by default, using a self-signed certificate for the hostname you provided. This will be enough in most cases, you will just need to accept the self-signed certificate in your email client. Thunderbird and Outlook will tell you that the certificate could not be verified. You will need to add an exception.
+
+#### CA-signed certificates
+
+If you want to use a certificate signed by a Certificate Authority, e.g. Let's Encrypt, you can do that.
+
+You already need to have a certificate and a private key file. You can get them with [`certbot`](https://certbot.eff.org/lets-encrypt/). Usually running `sudo certbot certonly --standalone -d <your-server-domain>` will do the trick. The certificate and key should end up in `/etc/letsencrypt/live/<your-server-domain>/fullchain.pem` and `/etc/letsencrypt/live/<your-server-domain>/privkey.pem`.
+
+Make sure to run the docker container with the same hostname as the certificate you are using.
+
+Put the certificate and key into a folder on your host and name them `cert.pem` and `key.pem` respectively.
+
+Then you can use the following command to start the container with the certificate and key you just created:
+
+```
+docker run -v /host/path/to/tls/folder/:/tls/ --name smtp_bridge -h <your_domain_name> -p 587:587 ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:nightly
 ```
+
+That's it, the container will now use the signed TLS certificate.
+
+### Docker Tags
+
+The following tags are available:
+
+* `ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:nightly` - This builds from `main` every night so that changes in the zimbraweb package are pulled into the container. Use this one to stay up to date.
+* `ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:latest` - Latest tagged build
+* `ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:vX.Y.Z` - Version X.Y.Z (e.g. v1.0.0)
+* `ghcr.io/cirosec-studis/zimbraweb-smtp-bridge:develop` - development build
+
+
+
+If you're on a raspberry pi, note the section [Docker on Raspberry Pi](#docker-on-raspberry-pi).
+
 Optionally mount a logs directory by adding `-v /path/to/logs:/srv/zimbraweb/logs/`.
 
 You can now connect to the container with your SMTP client at localhost:587.
 To authenticate, use your Zimbra Webclient login credentials (without the @domain.tld part!).
 
-### Outlook
+### Docker on Raspberry Pi
 
-In Outlook, you should set your default mail format to "Plain Text" ("Nur Text") by going to File->Options->Mail ("Datei->Optionen->E-mail") and selecting "Plain Text" ("Nur Text") in the "Compose messages in this format" ("Nachrichten in diesem Format verfassen") dropdown.
+Note that currently the alpine image does not work on raspberry pi without the following tweak:
 
-### Thunderbird
+```bash
+# Get signing keys to verify the new packages, otherwise they will not install
+rpi ~$ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138
 
-In Thunderbird you should go to Acccount Settings, select "Composition & Addressing" in the Account and deselect "Compose messages in HTML format."
+# Add the Buster backport repository to apt sources.list
+rpi ~$ echo 'deb http://httpredir.debian.org/debian buster-backports main contrib non-free' | sudo tee -a /etc/apt/sources.list.d/debian-backports.list
 
-### Other clients
+rpi ~$ sudo apt update
+rpi ~$ sudo apt install libseccomp2 -t buster-backports
+```
 
-You need to make sure your client sends emails in text/plain because Zimbra Web does not support HTML emails.
+This fix is from https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/. Alpine requires libseccomp2>2.4.2 but on debian buster has 2.3.6, this fix installes a newer version from the backports repository.
diff --git a/files/start.sh b/files/start.sh
index 11f1d3a..48efe2d 100644
--- a/files/start.sh
+++ b/files/start.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 python3 /srv/zimbraweb/zimbra_config.py
+/tls.sh
 dovecot
 postfix start
 python3 /srv/zimbraweb/zimbra_milter.py
\ No newline at end of file
diff --git a/files/tls.sh b/files/tls.sh
new file mode 100644
index 0000000..df40e52
--- /dev/null
+++ b/files/tls.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+certfile=/tls/cert.pem
+keyfile=/tls/key.pem
+
+if [ ! -f "$certfile" ]; then
+    # generate a self signed certificate (valid for 10 years)
+    openssl req -x509 -newkey rsa:4096 -keyout $keyfile -out $certfile -sha256 -days 3650 -nodes -subj "/CN=$HOSTNAME"
+fi
+
+chmod 600 $certfile
+chmod 600 $keyfile
+
+postconf -e myhostname=$HOSTNAME
+postconf -e "smtpd_tls_cert_file = ${certfile}"
+postconf -e "smtpd_tls_key_file = ${keyfile}"
+postconf -e 'smtp_tls_security_level = may'
+postconf -e 'smtpd_tls_security_level = may'
+postconf -e 'smtp_tls_note_starttls_offer = yes'
+postconf -e 'smtpd_tls_loglevel = 1'
+postconf -e 'smtpd_tls_received_header = yes'
+
+postfix stop
+postfix start
\ No newline at end of file