diff --git a/ansible/roles/ispmail-packages/tasks/main.yml b/ansible/roles/ispmail-packages/tasks/main.yml
index e597603..920b405 100644
--- a/ansible/roles/ispmail-packages/tasks/main.yml
+++ b/ansible/roles/ispmail-packages/tasks/main.yml
@@ -1,29 +1,34 @@
 ---
 - name: install required binary packages
-  apt: name={{item}} state=installed update_cache=yes
-  with_items:
-  - mysql-server
-  - postfix
-  - postfix-mysql
-  - swaks
-  - dovecot-mysql
-  - dovecot-pop3d
-  - dovecot-imapd
-  - dovecot-lmtpd
-  - dovecot-managesieved
-  - phpmyadmin
-  - spamass-milter
-  - spamassassin
-  - pwgen
-  - patch
-- name: purge Exim installation
-  apt: name={{item}} state=absent purge=yes
-  with_items:
-  - exim4
-  - exim4-base
-  - exim4-config
-  - exim4-daemon-light
+  apt:
+    name: "{{ packages }}"
+    update_cache: yes
+  vars:
+    packages:
+    - mariadb-server
+    - postfix
+    - postfix-mysql
+    - roundcube
+    - roundcube-mysql
+    - roundcube-plugins
+    - roundcube-plugins-extra
+    - swaks
+    - dovecot-mysql
+    - dovecot-pop3d
+    - dovecot-imapd
+    - dovecot-lmtpd
+    - dovecot-managesieved
+    - adminer
+    - rspamd
+# TODO: shorewall
 
-- name: make sure mysql-server is started
-  service: name=mysql enabled=yes state=started
+# - name: purge Exim installation
+#   apt: name={{item}} state=absent purge=yes
+#   with_items:
+#   - exim4
+#   - exim4-base
+#   - exim4-config
+#   - exim4-daemon-light
 
+# - name: make sure mysql-server is started
+#   service: name=mysql enabled=yes state=started