diff --git a/roles/mail_server/tasks/main.yml b/roles/mail_server/tasks/main.yml
index 2a4b460ee6b05815c74dec270175adb131d0b58c..3ead0aace852d402d436900ecd8a87ddd638f825 100644
--- a/roles/mail_server/tasks/main.yml
+++ b/roles/mail_server/tasks/main.yml
@@ -6,6 +6,26 @@
 - name: Add backports repository
   apt_repository: repo="deb http://http.debian.net/debian wheezy-backports main" state=present
 
+- name: Deploy SMTP TLS private key
+  copy: dest="/etc/ssl/private/{{ smtp_tls_key | basename }}" src="{{ smtp_tls_key }}"
+        mode=640 owner=root group=root
+
+- name: Deploy SMTP TLS certificate
+  copy: dest="/etc/ssl/certs/{{ smtp_tls_certificate | basename }}" src="{{ smtp_tls_certificate }}"
+        mode=644 owner=root group=root
+
+- name: Deploy IMAP TLS private key
+  copy: dest="/etc/ssl/private/{{ imap_tls_key | basename }}" src="{{ imap_tls_key }}"
+        mode=640 owner=root group=root
+  notify:
+    - Restart Postfix
+
+- name: Deploy IMAP TLS certificate
+  copy: dest="/etc/ssl/certs/{{ imap_tls_certificate | basename }}" src="{{ imap_tls_certificate }}"
+        mode=644 owner=root group=root
+  notify:
+    - Restart Dovecot
+
 - name: Install Dovecot packages
   apt: name="{{ item }}" state=installed default_release="wheezy-backports"
   with_items: