diff --git a/common.yaml b/common.yaml
index 7a4f469..dd35c4b 100644
--- a/common.yaml
+++ b/common.yaml
@@ -1,21 +1,22 @@
 ---
 
-- hosts: all
-  roles:
-    - common
+#- hosts: all
+#  roles:
+#    - common
 
 
-- hosts: mail.0rpheus.net
-  gather_facts: false
-  tasks:
-    - name: install docker related packages
-      apt:
-        name:
-          - python3-docker
+#- hosts: mail.0rpheus.net
+#  gather_facts: false
+#  tasks:
+#    - name: install docker related packages
+#      apt:
+#        name:
+#          - python3-docker
 
 
 - hosts: mail.0rpheus.net
   gather_facts: false
   roles:
-    - haproxy
-    - bitwarden
+ #   - haproxy
+ #   - bitwarden
+    - roundcube
diff --git a/hosts.yaml b/hosts.yaml
index 115d48a..0681c91 100644
--- a/hosts.yaml
+++ b/hosts.yaml
@@ -28,6 +28,9 @@ all:
     # https://hub.docker.com/r/vaultwarden/server/tags
     bitwarden_version: 1.26.0-alpine
 
+    # https://hub.docker.com/r/roundcube/roundcubemail/tags
+    roudcube_version: 1.6.0-apache
+
     certbot_domains:
       - "jabber.0rpheus.net"
 
@@ -39,7 +42,7 @@ all:
       seafile.0rpheus.net: seafile
       jabber.0rpheus.net: prosody
       tt-rss.0rpheus.net: ttrss
-      mail.0rpheus.net: apache
+      mail.0rpheus.net: roundcube
       blog.0rpheus.net: apache
       git.0rpheus.net: gogs
 
@@ -53,6 +56,10 @@ all:
         server_defs:
           - "apache 127.0.0.1:8080 check"
 
+      roundcube:
+        server_defs:
+          - "roundcube 127.0.0.1:2090 check"
+
       nextcloud:
         server_defs:
           - "portainer 10.10.10.2:8181 check"
diff --git a/roles/roundcube/defaults/main.yaml b/roles/roundcube/defaults/main.yaml
new file mode 100644
index 0000000..12d0d40
--- /dev/null
+++ b/roles/roundcube/defaults/main.yaml
@@ -0,0 +1,4 @@
+---
+
+roudcube_data: /srv/mail.0rpheus.net
+roudcube_version: 'latest'
diff --git a/roles/roundcube/tasks/main.yaml b/roles/roundcube/tasks/main.yaml
new file mode 100644
index 0000000..b4396ce
--- /dev/null
+++ b/roles/roundcube/tasks/main.yaml
@@ -0,0 +1,28 @@
+---
+
+- name: roudcube data
+  file:
+    path: "{{ roudcube_data }}"
+    state: directory
+    mode: 0755
+
+
+- name: roudcube container
+  docker_container:
+    name: mail.0rpheus.net
+    hostname: roundcube
+    image: "roundcube/roundcubemail:{{ roudcube_version }}"
+    pull: yes
+    restart_policy: always
+    env:
+      ROUNDCUBEMAIL_DB_TYPE: sqlite
+      ROUNDCUBEMAIL_SKIN: elastic
+      ROUNDCUBEMAIL_DEFAULT_HOST: tls://imap.0rpheus.net
+      ROUNDCUBEMAIL_SMTP_SERVER: tls://smtp.0rpheus.net
+      ROUNDCUBEMAIL_PLUGINS: archive,zipdownload,managesieve
+      ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE: 50M
+    ports:
+      - 127.0.0.1:2090:80
+    volumes:
+      - "{{ roudcube_data }}/www:/var/www/html:rw"
+      - "{{ roudcube_data }}/sqlite:/var/roundcube/db:rw"