diff --git a/imageroot/systemd/user/pecbridge.service b/imageroot/systemd/user/pecbridge.service
new file mode 100644
index 00000000..402fce5e
--- /dev/null
+++ b/imageroot/systemd/user/pecbridge.service
@@ -0,0 +1,16 @@
+#
+# This systemd unit starts a webtop instance using Podman.
+# Most parts of this file come from podman-generate-systemd.
+#
+[Unit]
+Description=WebTop webapp
+Requires=webapp.service
+After=webapp.service
+PartOf=webtop.service
+
+[Service]
+Type=simple
+Environment=PODMAN_SYSTEMD_UNIT=%n
+WorkingDirectory=%S/state
+Restart=always
+ExecStart=/usr/bin/podman exec webapp /usr/share/pecbridge/bin/run.sh
diff --git a/imageroot/systemd/user/webtop.service b/imageroot/systemd/user/webtop.service
index bc954cdb..eceaa69c 100644
--- a/imageroot/systemd/user/webtop.service
+++ b/imageroot/systemd/user/webtop.service
@@ -20,6 +20,7 @@ ExecStartPre=/usr/bin/podman pod create \
     --publish=${TCP_PORT}:8081 \
     --network=slirp4netns:allow_host_loopback=true \
     --add-host=accountprovider:10.0.2.2 \
+    --add-host=mailnode:${Z_PUSH_IMAP_SERVER} \
     --replace
 ExecStart=/usr/bin/podman pod start --pod-id-file %t/webtop.pod-id
 ExecStop=/usr/bin/podman pod stop --ignore --pod-id-file %t/webtop.pod-id -t 10
diff --git a/webapp/usr/share/pecbridge/etc/config.xml.template b/webapp/usr/share/pecbridge/etc/config.xml.template
index b33d2fc0..5b3b7c17 100644
--- a/webapp/usr/share/pecbridge/etc/config.xml.template
+++ b/webapp/usr/share/pecbridge/etc/config.xml.template
@@ -1,5 +1,6 @@
 <sonicle-pec-bridge port="10125">
-    <default host="localhost" port="25" debug="false" />
+    <!-- "mailnode" is resolved to the Mail module VPN IP address -->
+    <default host="mailnode" port="10587" debug="false" auth="false" />
     <webtop-api basePath="http://localhost:8080/webtop/api/com.sonicle.webtop.core/v1" bearer="WEBAPP_API_TOKEN" iddomain="NethServer" />
     <fetch delay="60" />
 </sonicle-pec-bridge>