diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3945f94e..3423f57e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware
 * generate-ldif: Add services check for bkctld
 * minifirewall: upstream release 22.03.3 and use includes directory
+* openvpn: use a subnet topology instead of the net30 default topology
 
 ### Fixed
 
diff --git a/openvpn/templates/server.conf.j2 b/openvpn/templates/server.conf.j2
index a89701e8..23ce3e2b 100644
--- a/openvpn/templates/server.conf.j2
+++ b/openvpn/templates/server.conf.j2
@@ -6,6 +6,7 @@ port 1194
 proto udp
 dev tun
 mode server
+topology subnet
 keepalive 10 120
 tls-exit