diff --git a/Dockerfiles/iredapd b/Dockerfiles/iredapd
index 4d79681..5977b39 100644
--- a/Dockerfiles/iredapd
+++ b/Dockerfiles/iredapd
@@ -11,14 +11,14 @@ RUN /bin/sh ${SCRIPTS_DIR}/add_user_iredapd.sh && \
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends python3-sqlalchemy python3-dnspython python3-pymysql python3-ldap python3-psycopg2 python3-more-itertools && \
     apt-get clean && apt-get autoclean && rm -rf /var/lib/apt/lists/* && \
-    wget -c https://github.com/iredmail/iRedAPD/archive/5.1.2.tar.gz && \
-    tar xzf 5.1.2.tar.gz -C /opt && \
-    rm -f 5.1.2.tar.gz && \
-    ln -sf /opt/iRedAPD-5.1.2 /opt/iredapd && \
+    wget -c https://github.com/iredmail/iRedAPD/archive/5.2.tar.gz && \
+    tar xzf 5.2.tar.gz -C /opt && \
+    rm -f 5.2.tar.gz && \
+    ln -sf /opt/iRedAPD-5.2 /opt/iredapd && \
     /usr/bin/pip3 install --no-cache-dir --no-deps web.py==0.62 && \
     rm -rf /root/.cache
 
-COPY ./config/opt/iRedAPD-5.1.2/. /opt/iRedAPD-5.1.2/
+COPY ./config/opt/iRedAPD-5.2/. /opt/iRedAPD-5.2/
 COPY ./entrypoints/iredapd.sh /entrypoint.sh
 
 CMD /bin/sh /entrypoint.sh
diff --git a/config/etc/nginx/conf-available/headers.conf b/config/etc/nginx/conf-available/headers.conf
index 6f3daf8..35501c8 100644
--- a/config/etc/nginx/conf-available/headers.conf
+++ b/config/etc/nginx/conf-available/headers.conf
@@ -8,5 +8,5 @@ add_header X-Content-Type-Options nosniff always;
 add_header X-XSS-Protection '1; mode=block' always;
 add_header X-Download-Options noopen always;
 add_header X-Permitted-Cross-Domain-Policies none always;
-add_header Content-Security-Policy "default-src https: data: 'unsafe-inline' 'unsafe-eval'" always;
+add_header Content-Security-Policy "default-src https: ws: wss: data: 'unsafe-inline' 'unsafe-eval'" always;
 add_header Referrer-Policy strict-origin always;
diff --git a/config/etc/postfix/main.cf b/config/etc/postfix/main.cf
index b2e0502..4976aef 100644
--- a/config/etc/postfix/main.cf
+++ b/config/etc/postfix/main.cf
@@ -65,8 +65,7 @@ debug_peer_level = 2
 #
 
 
-# Disable backwards compatibility. Used by Postfix-3.x.
-compatibility_level = 2
+compatibility_level = 3.6
 
 
 # SMTP server response code when recipient or domain not found.
diff --git a/config/opt/iRedAPD-5.1.2/settings.py b/config/opt/iRedAPD-5.2/settings.py
similarity index 100%
rename from config/opt/iRedAPD-5.1.2/settings.py
rename to config/opt/iRedAPD-5.2/settings.py
diff --git a/config/opt/www/roundcubemail-1.5.3/config/config.inc.php b/config/opt/www/roundcubemail-1.6.1/config/config.inc.php
similarity index 100%
rename from config/opt/www/roundcubemail-1.5.3/config/config.inc.php
rename to config/opt/www/roundcubemail-1.6.1/config/config.inc.php
diff --git a/config/opt/www/roundcubemail-1.5.3/plugins/managesieve/config.inc.php b/config/opt/www/roundcubemail-1.6.1/plugins/managesieve/config.inc.php
similarity index 100%
rename from config/opt/www/roundcubemail-1.5.3/plugins/managesieve/config.inc.php
rename to config/opt/www/roundcubemail-1.6.1/plugins/managesieve/config.inc.php
diff --git a/config/opt/www/roundcubemail-1.5.3/plugins/markasjunk/config.inc.php b/config/opt/www/roundcubemail-1.6.1/plugins/markasjunk/config.inc.php
similarity index 100%
rename from config/opt/www/roundcubemail-1.5.3/plugins/markasjunk/config.inc.php
rename to config/opt/www/roundcubemail-1.6.1/plugins/markasjunk/config.inc.php
diff --git a/config/opt/www/roundcubemail-1.5.3/plugins/password/config.inc.php b/config/opt/www/roundcubemail-1.6.1/plugins/password/config.inc.php
similarity index 100%
rename from config/opt/www/roundcubemail-1.5.3/plugins/password/config.inc.php
rename to config/opt/www/roundcubemail-1.6.1/plugins/password/config.inc.php
diff --git a/config/root/iRedMail/iRedMail.tips b/config/root/iRedMail/iRedMail.tips
index d2d4850..db660ab 100755
--- a/config/root/iRedMail/iRedMail.tips
+++ b/config/root/iRedMail/iRedMail.tips
@@ -166,7 +166,7 @@ full email address.
 
 ## iRedAPD - Postfix Policy Server:
 
-* Version: 5.1.2
+* Version: 5.2
 * Listen address: 0.0.0.0, port: 7777
 * SQL database account:
     - Database name: iredapd
diff --git a/entrypoints/iredapd.sh b/entrypoints/iredapd.sh
index 027de27..aeb3824 100644
--- a/entrypoints/iredapd.sh
+++ b/entrypoints/iredapd.sh
@@ -22,7 +22,7 @@ require_non_empty_var IREDAPD_DB_PASSWORD ${IREDAPD_DB_PASSWORD}
 create_log_dir ${IREDAPD_LOG_DIR}
 create_log_file ${IREDAPD_LOG_FILE}
 
-ln -sf ${IREDAPD_CUSTOM_CONF} /opt/iRedAPD-5.1.2/custom_settings.py
+ln -sf ${IREDAPD_CUSTOM_CONF} /opt/iRedAPD-5.2/custom_settings.py
 
 # Update placeholders in config file.
 ${CMD_SED} "s#PH_HOSTNAME#${HOSTNAME}#g" ${IREDAPD_CONF}
diff --git a/entrypoints/roundcube.sh b/entrypoints/roundcube.sh
index 68d35d3..fc722e5 100644
--- a/entrypoints/roundcube.sh
+++ b/entrypoints/roundcube.sh
@@ -8,7 +8,7 @@
 
 . /docker/entrypoints/functions.sh
 
-ROUNDCUBE_DOCUMENT_ROOT="/opt/www/roundcubemail-1.5.3"
+ROUNDCUBE_DOCUMENT_ROOT="/opt/www/roundcubemail-1.6.1"
 ROUNDCUBE_DOCUMENT_ROOT_SYMLINK="/opt/www/roundcubemail"
 ROUNDCUBE_CONF="/opt/www/roundcubemail/config/config.inc.php"
 
diff --git a/scripts/install_all_pkgs.sh b/scripts/install_all_pkgs.sh
index a9c0849..4ef2716 100644
--- a/scripts/install_all_pkgs.sh
+++ b/scripts/install_all_pkgs.sh
@@ -69,12 +69,12 @@ apt-get clean && apt-get autoclean && rm -rf /var/lib/apt/lists/*
 mkdir -p ${WEB_APP_ROOTDIR}
 
 # Install iRedAPD.
-wget -c -q https://github.com/iredmail/iRedAPD/archive/5.1.2.tar.gz && \
-tar xzf 5.1.2.tar.gz -C /opt && \
-rm -f 5.1.2.tar.gz && \
-ln -s /opt/iRedAPD-5.1.2 /opt/iredapd && \
-chown -R iredapd:iredapd /opt/iRedAPD-5.1.2 && \
-chmod -R 0500 /opt/iRedAPD-5.1.2 && \
+wget -c -q https://github.com/iredmail/iRedAPD/archive/5.2.tar.gz && \
+tar xzf 5.2.tar.gz -C /opt && \
+rm -f 5.2.tar.gz && \
+ln -s /opt/iRedAPD-5.2 /opt/iredapd && \
+chown -R iredapd:iredapd /opt/iRedAPD-5.2 && \
+chmod -R 0500 /opt/iRedAPD-5.2 && \
 
 # Install mlmmjadmin.
 wget -c -q https://github.com/iredmail/mlmmjadmin/archive/3.1.5.tar.gz && \
@@ -86,13 +86,13 @@ chown -R mlmmj:mlmmj /opt/mlmmjadmin-3.1.5 && \
 chmod -R 0500 /opt/mlmmjadmin-3.1.5
 
 # Install Roundcube.
-wget -c -q https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3-complete.tar.gz && \
-tar zxf roundcubemail-1.5.3-complete.tar.gz -C /opt/www && \
-rm -f roundcubemail-1.5.3-complete.tar.gz && \
-ln -s /opt/www/roundcubemail-1.5.3 /opt/www/roundcubemail && \
-chown -R root:root /opt/www/roundcubemail-1.5.3 && \
-chmod -R 0755 /opt/www/roundcubemail-1.5.3 && \
-cd /opt/www/roundcubemail-1.5.3 && \
+wget -c -q https://github.com/roundcube/roundcubemail/releases/download/1.6.1/roundcubemail-1.6.1-complete.tar.gz && \
+tar zxf roundcubemail-1.6.1-complete.tar.gz -C /opt/www && \
+rm -f roundcubemail-1.6.1-complete.tar.gz && \
+ln -s /opt/www/roundcubemail-1.6.1 /opt/www/roundcubemail && \
+chown -R root:root /opt/www/roundcubemail-1.6.1 && \
+chmod -R 0755 /opt/www/roundcubemail-1.6.1 && \
+cd /opt/www/roundcubemail-1.6.1 && \
 chown -R www-data:www-data temp logs && \
 chmod 0000 CHANGELOG INSTALL LICENSE README* UPGRADING installer SQL
 
diff --git a/scripts/mariadb/pre_start/roundcube.sh b/scripts/mariadb/pre_start/roundcube.sh
index 890b5a5..db0fd0c 100644
--- a/scripts/mariadb/pre_start/roundcube.sh
+++ b/scripts/mariadb/pre_start/roundcube.sh
@@ -47,7 +47,7 @@ if [[ X"${USE_ROUNDCUBE}" == X"YES" ]]; then
     create_rc_custom_conf config_password.inc.php
 
     # Always update SQL db.
-    cd /opt/www/roundcubemail-1.5.3 && \
+    cd /opt/www/roundcubemail-1.6.1 && \
         ./bin/updatedb.sh --dir=./SQL --package roundcube
 
     # Allow user to update password.