diff --git a/chaperone.d/kres-cache-gc.conf b/chaperone.d/kres-cache-gc.conf
index 5a2a4635b4f8761d87848065a6e043bb767d8167..6a4411f186aabe6b3099778318392daccb42c1d9 100644
--- a/chaperone.d/kres-cache-gc.conf
+++ b/chaperone.d/kres-cache-gc.conf
@@ -1,6 +1,6 @@
 kres-cache-gc.service: {
      command: "/usr/sbin/kres-cache-gc -c /var/cache/knot-resolver -d 1000",
-     after: "openvpn-server.service",
+     after: "knot-server.service",
      exit_kills: false
 }
 
diff --git a/chaperone.d/kres.conf b/chaperone.d/kres.conf
index 5d1ba20ba72dd08b20c98686e9b6ff4e9554767c..737836e68ba42131aff8046cfb5ff21ef3c373f0 100644
--- a/chaperone.d/kres.conf
+++ b/chaperone.d/kres.conf
@@ -1,5 +1,5 @@
 knot-server.service: {
      command: "/usr/sbin/kresd -c /etc/knot-resolver/kresd.conf -n /var/cache/knot-resolver",
-     after: "openvpn-server.service",
+     after: "openvpn-tcp-server.service",
      exit_kills: true
 }
diff --git a/chaperone.d/openvpn_exporter.conf b/chaperone.d/openvpn_exporter.conf
index 72c7771ddd373cf17f927a3df88f6177638cda69..3b03a199b926d5ca26239419d7ba83c3e2b215c9 100644
--- a/chaperone.d/openvpn_exporter.conf
+++ b/chaperone.d/openvpn_exporter.conf
@@ -1,4 +1,5 @@
 openvpn-exporter.service: {
-     command: "/usr/local/bin/openvpn_exporter -openvpn.status_paths /tmp/openvpn-status-tcp",
+     command: "/usr/local/bin/openvpn_exporter -openvpn.status_paths /tmp/openvpn-status-tcp,/tmp/openvpn-status-udp",
+     after: "openvpn-tcp-server.service,openvpn-udp-server.service",
      exit_kills: false
 }