diff --git a/files/homedirs/chris/_bashrc b/files/homedirs/chris/_bashrc
index e6124f0..e4ca439 100644
--- a/files/homedirs/chris/_bashrc
+++ b/files/homedirs/chris/_bashrc
@@ -36,7 +36,7 @@ esac
 # uncomment for a colored prompt, if the terminal has the capability; turned
 # off by default to not distract the user: the focus in a terminal window
 # should be on the output of commands, not on the prompt
-#force_color_prompt=yes
+force_color_prompt=yes
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@@ -53,7 +53,9 @@ __hostname="${__hostname%.*}"
 __hostname="${__hostname%.*}"
 if [ "$color_prompt" = yes ]; then
     #PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}:\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+    #PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+    #PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@${__hostname}\[\033[00m\]:\[\033[01;32m\]\w\[\033[00m\]\$ '
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[32m\]\u@${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\]\$ '
 else
     #PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
     PS1='${debian_chroot:+($debian_chroot)}\u@${__hostname}:\w\$ '
diff --git a/files/homedirs/root/_bashrc b/files/homedirs/root/_bashrc
index 8f08932..3bb4709 100644
--- a/files/homedirs/root/_bashrc
+++ b/files/homedirs/root/_bashrc
@@ -23,7 +23,8 @@ shopt -s checkwinsize
 __hostname="$(hostname -f)"
 __hostname="${__hostname%.*}"
 __hostname="${__hostname%.*}"
-export PS1='${__hostname}:\w \$ '
+#export PS1='${__hostname}:\w \$ '
+export PS1='\[\033[01;32m\]${__hostname}\[\033[00m\]:\[\033[37m\]\w\[\033[00m\] \$ '
 umask 022
 
 
diff --git a/host_vars/mail-neu.cadus.org.yml b/host_vars/mail-neu.cadus.org.yml
new file mode 100644
index 0000000..2ee07cc
--- /dev/null
+++ b/host_vars/mail-neu.cadus.org.yml
@@ -0,0 +1,245 @@
+---
+
+# ---
+# vars used by roles/ansible_dependencies
+# ---
+
+
+# ---
+# vars used by roles/ansible_user
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/basic.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/sshd.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/apt.yml
+# ---
+
+apt_install_compiler_pkgs: true
+
+apt_install_postgresql_pkgs: false
+
+
+# ---
+# vars used by roles/common/tasks/users.yml
+# ---
+
+insert_root_ssh_keypair: true
+
+root_ssh_keypair:
+  - name: id-rsa-dehydrated
+    priv_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-dehydrated
+    priv_key_dest: /root/.ssh/id_rsa-dehydrated
+    pub_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-dehydrated.pub
+    pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
+  - name: id-rsa-opendkim
+    priv_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-opendkim
+    priv_key_dest: /root/.ssh/id_rsa-opendkim
+    pub_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-opendkim.pub
+    pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
+
+
+# ---
+# vars used by roles/common/tasks/users-systemfiles.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/webadmin-user.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/sudoers.yml
+# ---
+#
+# see: roles/common/tasks/vars
+
+
+# ---
+# vars used by roles/common/tasks/caching-nameserver.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/git.yml
+# ---
+#
+# see: roles/common/tasks/vars
+
+
+# ---
+# vars used by roles/common/tasks/copy_files.yml
+# ---
+
+copy_plain_files:
+
+  # /root/bin/monitoring
+  #
+  - name: monitoring_check_cert_for_dovecot.conf
+    src_path: mail.cadus/root/bin/monitoring/conf/check_cert_for_dovecot.conf
+    dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
+
+  - name: monitoring_check_webservice_load.conf
+    src_path: mail.cadus/root/bin/monitoring/conf/check_webservice_load.conf
+    dest_path: /root/bin/monitoring/conf/check_webservice_load.conf
+
+  # /root/bin/postfix
+  #
+  - name: postfix_create_opendkim_key.conf
+    src_path: mail.cadus/root/bin/postfix/conf/create_opendkim_key.conf
+    dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
+
+  - name: postfix_postfix_add_mailboxes.conf
+    src_path: mail.cadus/root/bin/postfix/conf/postfix_add_mailboxes.conf
+    dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf
+
+  - name: postfix_sent_userinfo_postfix.conf
+    src_path: mail.cadus/root/bin/postfix/conf/sent_userinfo_postfix.conf
+    dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf
+
+  - name: postfix_whitelist_mb_sigs.conf
+    src_path: mail.cadus/root/bin/postfix/conf/whitelist_mb_sigs.conf
+    dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
+
+
+copy_plain_files_postfwd_host_specific:
+
+  - name: postfwd.wl-hosts
+    src_path: mail.cadus/etc/postfix/postfwd.wl-hosts
+    dest_path: /etc/postfix/postfwd.wl-hosts
+
+  - name: postfwd.wl-nets
+    src_path: mail.cadus/etc/postfix/postfwd.wl-nets
+    dest_path: /etc/postfix/postfwd.wl-nets
+
+  - name: postfwd.wl-sender
+    src_path: mail.cadus/etc/postfix/postfwd.wl-sender
+    dest_path: /etc/postfix/postfwd.wl-sender
+
+  - name: postfwd.wl-user
+    src_path: mail.cadus/etc/postfix/postfwd.wl-user
+    dest_path: /etc/postfix/postfwd.wl-user
+
+  # Postfix Firewall postfwd
+  #
+  #- name: postfwd.wl-user
+  #  src_path: mail.cadus/etc/postfix/postfwd.wl-user
+  #  dest_path: /etc/postfix/postfwd.wl-user
+
+
+#copy_template_files: []
+#
+#  - name: mailsystem_install_amavis.conf
+#    src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
+#    dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
+
+
+
+# ---
+# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
+# ---
+
+hostname: mail.cadus.org
+ipv4_address: 46.4.25.245
+ipv6_address: 2a01:4f8:221:3b4e::245
+
+admin_email: admin@cadus.org
+is_relay_host: !!str "false"
+
+db_in_use: !!str "true"
+# postfix_db_type
+#
+# possible values are 'PostgreSQL' and 'MySQL'
+postfix_db_type: MySQL
+postfix_db_name: postfix
+postfix_db_user: postfix
+#postfix_db_host:
+postfix_db_pass: T3CJnFMJNX9wmhNs
+
+# install_amavis.conf
+#
+mp_receipt_number: 106015125438
+si_authorisation_signature: b0b7e94d3fcc8f3b1f128edd5830392361868cf0174723a9924ac25bf8b1b588cb974b50234e1bc1d9839dfe0ca6e1627733d90daf1399347b1046d20c2e3a89
+
+# install_postfixadmin.conf
+# 
+website_name_postfixadmin: adm.cadus.org
+
+email_welcome_message: "\n
+Hallo,\n
+
+Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n
+
+Cadus e.V. - Redefine Global Solidarity\n
+
+--\n
+Cadus e.V.\n
+Am Sudhaus 2\n
+D-12053 Berlin\n
+admin@cadus.org\n
+"
+
+# install_update_dovecot.conf
+#
+dovecot_from_address: "Administrator E-Mail <admin@cadus.org>"
+dovecot_reply_to: "admin@cadus.org"
+webmailer_address: "https://webmail.cadus.org"
+salutation: "Cadus e.V. - Redefine Global Solidarity\n
+
+--\n
+Cadus e.V.\n
+Am Sudhaus 2\n
+D-12053 Berlin\n
+admin@cadus.org\n
+"
+
+# install_upgrade_roundcube-webmail.conf
+#
+# Webmailer
+webmail_site_name: webmail.cadus.org
+autoreply_hostname: autoreply.cadus.org
+# possible values: 'pgsql' or 'mysql'
+roundcube_db_type: mysql
+roundcube_db_name: roundcubemail
+roundcube_db_user: roundcube
+#roundcube_db_host:
+roundcube_db_pass: 'j3vqsK7Ldm7MxNjH'
+
+roundcube_acl_plugin: false
+
+roundcube_product_name: O.OPEN - Webmailer
+roundcube_support_url: https://www.cadus.org
+roundcube_skin_logo: "images/cadu_logo_webmail.png"
+
+
+template_files_mailsystem_script:
+
+  - name: mailsystem_install_amavis.conf
+    src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
+    dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
+
+  - name: mailsystem_install_postfixadmin.conf
+    src_path: usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2
+    dest_path: /usr/local/src/mailsystem/conf/install_postfix_advanced.conf
+
+  - name: mailsystem_install_postfixadmin.conf
+    src_path: usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2
+    dest_path: /usr/local/src/mailsystem/conf/install_postfixadmin.conf
+
+  - name: mailsystem_install_update_dovecot.conf
+    src_path: usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2
+    dest_path: /usr/local/src/mailsystem/conf/install_update_dovecot.conf
+
+  - name: mailsystem_install_upgrade_roundcube-webmail.conf
+    src_path: usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2
+    dest_path: /usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf
diff --git a/host_vars/mail.cadus.org.yml b/host_vars/mail.cadus.org.yml
index c6c2076..2ee07cc 100644
--- a/host_vars/mail.cadus.org.yml
+++ b/host_vars/mail.cadus.org.yml
@@ -26,7 +26,7 @@
 
 apt_install_compiler_pkgs: true
 
-apt_install_postgresql_pkgs: true
+apt_install_postgresql_pkgs: false
 
 
 # ---
diff --git a/host_vars/o31.oopen.de.yml b/host_vars/o31.oopen.de.yml
new file mode 100644
index 0000000..bda4fb2
--- /dev/null
+++ b/host_vars/o31.oopen.de.yml
@@ -0,0 +1,245 @@
+---
+
+# ---
+# vars used by roles/network_interfaces
+# ---
+
+
+# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
+network_manage_devices: True
+
+# Should the interfaces be reloaded after config change?
+network_interface_reload: False
+
+network_interface_path: /etc/network/interfaces.d
+network_interface_required_packages:
+  - vlan
+  - bridge-utils
+  - ifmetric
+  - ifupdown
+  - ifenslave
+  - resolvconf
+
+
+network_interfaces:
+
+  - device: br0
+    # use only once per device (for the first device entry)
+    headline: br0 - bridge over device enp41s0
+
+    # auto & allow are only used for the first device entry
+    allow: [] # array of allow-[stanzas] eg. allow-hotplug
+    auto: true
+
+    family: inet
+    method: static
+    hwaddress: d0:50:99:f9:1a:8e
+    description:
+    address: 135.181.22.166
+    netmask: 26
+    gateway: 135.181.22.129
+    metric:
+    pointopoint:
+    mtu:
+    scope:
+
+    # additional user by dhcp method
+    #
+    hostname:
+    leasehours:
+    leasetime:
+    vendor:
+    client:
+
+    # additional used by bootp method
+    #
+    bootfile:
+    server:
+    hwaddr:
+
+    # optional dns settings nameservers: []
+    #
+    #    nameservers:
+    #      - 194.150.168.168  # dns.as250.net
+    #      - 91.239.100.100   # anycast.censurfridns.dk
+    #    search: warenform.de
+    #
+    nameservers:
+      - 185.12.64.2
+      - 2a01:4ff:ff00::add:1
+    search:
+
+    # optional additional subnets/ips subnets: []
+    # subnets: 
+    #   - '192.168.123.0/24'
+    #   - '192.168.124.11/32'
+
+    # optional bridge parameters bridge: {}
+    # bridge:
+    #   ports:
+    #   stp:
+    #   fd:
+    #   maxwait:
+    #   waitport:
+    bridge:
+      ports: enp41s0 # for mor devices support a blank separated list
+      stp: !!str off
+      fd: 5
+      hello: 2
+      maxage: 12
+
+    #  optional bonding parameters bond: {}
+    #  bond:
+    #    master
+    #    primary
+    #    slave
+    #    method:
+    #    miimon:
+    #    lacp-rate:
+    #    ad-select-rate:
+    #    master:
+    #    slaves:
+    bond: {}
+
+    # optional vlan settings | vlan: {}
+    # vlan: {}
+    #   raw-device: 'eth0'
+    vlan: {}
+
+    # inline hook scripts
+    pre-up: [] # pre-up script lines
+    up: 
+      - !!str "route add -net 135.181.22.128 netmask 255.255.255.192 gw 135.181.22.129 dev br0" # up script lines
+    post-up: [] # post-up script lines (alias for up)
+    pre-down: [] # pre-down script lines (alias for down)
+    down: [] # down script lines
+    post-down: [] # post-down script lines
+
+
+
+  - device: br0
+    family: inet6
+    method: static
+    address: 2a01:4f9:4b:46d1::2
+    netmask: 64
+    gateway: fe80::1
+
+
+# ---
+# vars used by roles/ansible_dependencies
+# ---
+
+
+# ---
+# vars used by roles/ansible_user
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/basic.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/sshd.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/apt.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/users.yml
+# ---
+
+default_user:
+
+  - name: chris
+    password: $6$bSHlaLHC$URSMVq090e/cJ1v55Jh9ws0w5WekhO7X3Y0RqryAl5R76K9khWBegC76Smjastja.xMiD57/LzUUXW7y9NvAL.
+    shell: /bin/bash
+    ssh_keys:
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
+
+  - name: sysadm
+
+    user_id: 1050
+    group_id: 1050
+    group: sysadm
+    password: $6$EEVWxA5E$bNxU8EOp/tTcYVghFharUM10k3vRt2siEnIiiznfGmhMSM6zJTP0umdxql9VVEj856oKa.Sp.q3N2nthgNMeN1
+    shell: /bin/bash
+    ssh_keys:
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
+
+  - name: localadmin
+    user_id: 1051
+    group_id: 1051
+    password: $6$flo5afeu$1Dn/tqIOJIFQbymCzpJk9BgGflQdy2Eg0nTiMBF7VefN7uY/Md1pV2yU0S47kZuH5aDjSdPfKzhHp8Aul/xx90
+    shell: /bin/bash
+    ssh_keys:
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
+      - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFkl+5aVg4l40bxmf6k2dpopV8oAXyLhGGmKfzspW3GTfD29WjhuGS/mefrqr3tZRYrybPA5GDQ1QdwwRL16+6xfjAt/B62p3dMXnjsHalk74DTcQCZDlsj0UxTV1+gfOYzcB/CAqRd2wtB+vqGWRP+oGP3E7AIgoBlE44MaEDDuMP0Vvm8hNQ5N+/3zcrE626yDHAa4qmOd5d+J/HWrHLeJ4915g9VcCYCNGCgepb//4RdCpzEqUJiBGwihb/iJk3RoHcAv3L+tht8vmBF7Wz0iJ9BtLRTsJGFCkET0i50E18mU3bfaa7ov/PY/+UcE8FZSWZcoZ6AtmoBy0Zg2mp6/F9serfe67qtILNAbWD+qNRC7GjW3c5UvF5GJM6WvG8OZRvwarovZOU8uw1NLL3unY8O1bdihXmCXatXz+MvHCOvmZekUolKMBu7mziH5wificprUY9YeGX1FHVh4/hsL04zZdu/Q8Rr/BxM8+mJCCPsrkEoNnZNJfxCSwynd3jjqkhBpzZkEW9EGDBG5qnx4f6QPtcf/sv7eoNjzhEUs5k9GstbgW0ZD6381Ws/EpIdRbZUl52wFXalE8N/Z9hU6vfBC1xk0DIardUkZk+6lTsS8orBZkmPDNhX5hT8nmwNszQI0WgHPs+xDAdFskMcB/j20G5NupZm+2QgNXoww== jonas@meurer.it'
+      - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCzd5rFYvV5/V2NZE4jxL09qZ4TTsgmhbfSHpsj9wX89+j7ZrfTAkAkAFxyrWs8FR3CQ11DGkrXW059a0ppRQ7R8bUW9CniXS/RaRAvqX9AMM9Xo/lmL4pXNM0sV4nHJWphi5Bc+zTIM2I4PSbHYw+5dDnj8ZIQ8ucBff+k29Zd90JRuKx72tk0pQNf7sQbWVKNCT/B4g4MJV84NvnO+ExCWvGM95Cy5NCTnQfO94/OSkN72R//tIR7Nd/aK7hEj69MoVJZrFy4qzE9KskLhKeUYCqoz86XOQ6Dfag/B2adTeG3r9DEacG3ao/ACZKQChj0X12LEV/PZUHLORqYpWIwMuIx54vhbxarSwlKhoOCv1XQJwo9BTavMhFNsMtZpAJYdvAakRCbf18bDrHyqYYqjAyYOp+L+G+wlSh3tz0qQL8aAnaV3RPN0fDd7Zu1dpMGAM2gMnBEMJ+k82V7EtACp1jf37LW11Lbv2o+dRUJEgsrU9TNGxaGSTWqGc65TuP9PUfDXq1ZNOPQWSK/KseqB0WUx6ePfZzkgkr7kGXT/d9hUSCq2+iprhfwQpYLcXE9XtCdo1aivIKQ8zCuR44q11HePyNtEMaJfq33p4uDTVOy7UOtuACzSbk6vs7h6h8CUGPwU9aw+PRiWY4Jdm0caJ8trFfH1R8XaIe3SaUEw== t@NB-003258-RLS'
+
+  - name: back
+    user_id: 1060
+    group_id: 1060
+    group: back
+    password: $6$GntX81EP$O1GEmQF.BbOQfTMMw/m/BDKSXmANVpqmz0nyzw4O4R2/iK9huGOAjT/2eq8FVdMghvNOvdwrWtwohO.Mg4V9n.
+    shell: /bin/bash
+    ssh_keys:
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
+
+sudo_users:
+  - chris
+  - sysadm
+  - localadmin
+
+
+# ---
+# vars used by roles/common/tasks/users-systemfiles.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/webadmin-user.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/sudoers.yml
+# ---
+#
+# see: roles/common/tasks/vars
+
+
+# ---
+# vars used by roles/common/tasks/caching-nameserver.yml
+# ---
+
+
+# ---
+# vars used by roles/common/tasks/git.yml
+# ---
+
+git_firewall_repository:
+  name: ipt-server
+  repo: https://git.oopen.de/firewall/ipt-server
+  dest: /usr/local/src/ipt-server
+
+# ==============================
+
+
+# ---
+# vars used by scripts/reset_root_passwd.yml
+# ---
+
+root_user:
+  name: root
+  password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq.
+
diff --git a/hosts b/hosts
index 7f95a49..23a6544 100644
--- a/hosts
+++ b/hosts
@@ -53,6 +53,7 @@ gw-replacement2.local.netz
 gw-replacement3.local.netz
 
 k1371.dyndns.org
+192.168.0.110
 
 ga-st-gw-ersatz.ga.netz
 ga-st-gw.ga.netz
@@ -123,8 +124,11 @@ o18.oopen.de
 o20.oopen.de
 
 o21.oopen.de
+o31.oopen.de
 mail.cadus.org
+mail-neu.cadus.org
 web.cadus.org
+135.181.22.159
 
 o22.oopen.de
 oolm-db.oopen.de
@@ -275,8 +279,11 @@ o18.oopen.de
 o20.oopen.de
 
 o21.oopen.de
+o31.oopen.de
 mail.cadus.org
+mail-neu.cadus.org
 web.cadus.org
+135.181.22.159
 
 # - o22.oopen.de
 o22.oopen.de
@@ -370,6 +377,7 @@ gw-123.oopen.de
 
 # AK
 k1371.dyndns.org
+192.168.0.110
 gw-ak.oopen.de
 
 # AKB
@@ -481,8 +489,11 @@ munin.oopen.de
 o20.oopen.de
 
 # o21.oopen.de
+# o31.oopen.de
 web.cadus.org
+135.181.22.159
 mail.cadus.org
+mail-neu.cadus.org
 
 # o22.oopen.de
 oolm-shop-dev.oopen.de
@@ -672,7 +683,9 @@ o13-web.oopen.de
 
 
 # o21.oopen.de
+# o31.oopen.de
 web.cadus.org
+135.181.22.159
 
 # o20.oopen.de (srv-cityslang.cityslang.com)
 o20.oopen.de
@@ -721,7 +734,9 @@ o13-schleuder.oopen.de
 test.mx.oopen.de
 
 # o21.oopen.de
+# o31.oopen.de
 mail.cadus.org
+mail-neu.cadus.org
 
 # o27.oopen.de
 mail.faire-mobilitaet.de
@@ -826,7 +841,9 @@ o20.oopen.de
 
 # o21.oopen.de
 web.cadus.org
+135.181.22.159
 mail.cadus.org
+mail-neu.cadus.org
 
 # o22.oopen.de
 oolm-db-dev.oopen.de
@@ -982,7 +999,9 @@ test.mx.oopen.de
 nscache.oopen.de
 
 # o21.oopen.de
+# o31.oopen.de
 mail.cadus.org
+mail-neu.cadus.org
 
 o22.oopen.de
 
@@ -1027,6 +1046,7 @@ mx.warenform.de
 lists.mx.warenform.de
 
 k1371.dyndns.org
+192.168.0.110
 
 
 [caching_nameserver:children]
@@ -1074,6 +1094,7 @@ file-blkr.blkr.netz
 zapata.opp.netz
 
 
+
 [nfs_server]
 
 file-ebs.ebs.netz
@@ -1141,6 +1162,7 @@ o24.oopen.de
 o27.oopen.de
 o29.oopen.de
 o30.oopen.de
+o31.oopen.de
 o32.oopen.de
 o35.oopen.de
 o36.oopen.de
@@ -1206,8 +1228,11 @@ test.mariadb.oopen.de
 meet2.oopen.de
 
 # - o21.oopen.de
+# - o31.oopen.de
 mail.cadus.org
+mail-neu.cadus.org
 web.cadus.org
+135.181.22.159
 
 # - o22.oopen.de
 oolm-db.oopen.de
@@ -1369,9 +1394,13 @@ meet2.oopen.de
 o20.oopen.de
 
 # - o21.oopen.de
+# - o31.oopen.de
 o21.oopen.de
+o31.oopen.de
 mail.cadus.org
+mail-neu.cadus.org
 web.cadus.org
+135.181.22.159
 
 # - o22.oopen.de
 o22.oopen.de
@@ -1486,6 +1515,7 @@ gw-spr.oopen.de
 gw-kb.oopen.de
 
 k1371.dyndns.org
+192.168.0.110
 
 ga-st-gw-ersatz.ga.netz
 ga-st-gw.ga.netz
diff --git a/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-sender b/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-sender
index d5c5acd..5346a3e 100644
--- a/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-sender
+++ b/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-sender
@@ -19,4 +19,5 @@
 # ---
 
 # give trusted sender addresses here
+spenden\@cadus.org$
 
diff --git a/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-user b/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-user
index 6a17d92..6c579d1 100644
--- a/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-user
+++ b/roles/common/files/mail.cadus/etc/postfix/postfwd.wl-user
@@ -12,4 +12,4 @@
 # ---
 
 # give trusted sasl usernames here
-#spenden@cadus\.org
+spenden@cadus\.org
diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets b/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets
index e99d703..ebd919b 100644
--- a/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets
+++ b/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets
@@ -131,3 +131,5 @@
 # US (u.a direktversender.net)
 103.83.37.0/24
 103.114.162.0/24
+# US (u.a.versender50.com)
+204.152.197.0/24
diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender b/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender
index 979122b..098bfae 100644
--- a/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender
+++ b/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender
@@ -91,4 +91,5 @@ firmen-infos\.com$
 ^sqek@eike\.se$
 ^info@webmeinung\.de$
 ^info@handel-versand\.com$
-^order@direktversender\.net§
+^order@direktversender\.net$
+versender.*.com$
diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.wl-nets b/roles/common/files/mailserver/etc/postfix/postfwd.wl-nets
index d194340..02ef1ed 100644
--- a/roles/common/files/mailserver/etc/postfix/postfwd.wl-nets
+++ b/roles/common/files/mailserver/etc/postfix/postfwd.wl-nets
@@ -13,3 +13,6 @@
 # ---
 
 # give truested networrk adresses here
+# d.mx.oopen.de (listen server)
+95.217.204.227
+2a01:4f9:4a:47e5::227