3 files changed, 15 insertions, 0 deletions
diff --git a/data/templates/dhcp-server/kea-dhcp-ddns.conf.j2 b/data/templates/dhcp-server/kea-dhcp-ddns.conf.j2
index 7b0394a88..e734a37f3 100644
--- a/data/templates/dhcp-server/kea-dhcp-ddns.conf.j2
+++ b/data/templates/dhcp-server/kea-dhcp-ddns.conf.j2
@@ -3,8 +3,13 @@
         "ip-address": "127.0.0.1",
         "port": 53001,
         "control-socket": {
+{% if vrf_context is vyos_defined %}
+            "socket-type": "unix",
+            "socket-name": "/run/kea/kea-ddns-{{ vrf_context }}-ctrl-socket"
+{% else %}
             "socket-type": "unix",
             "socket-name": "/run/kea/kea-ddns-ctrl-socket"
+{% endif %}
         },
         "tsig-keys": {{ dynamic_dns_update | kea_dynamic_dns_update_tsig_key_json }},
         "forward-ddns" : {
diff --git a/data/templates/dhcp-server/kea-dhcp4.conf.j2 b/data/templates/dhcp-server/kea-dhcp4.conf.j2
index d08ca0eaa..60c9cf9b2 100644
--- a/data/templates/dhcp-server/kea-dhcp4.conf.j2
+++ b/data/templates/dhcp-server/kea-dhcp4.conf.j2
@@ -15,8 +15,13 @@
             "service-sockets-retry-wait-time": 5000
         },
         "control-socket": {
+{% if vrf_context is vyos_defined %}
+            "socket-type": "unix",
+            "socket-name": "/run/kea/dhcp4-{{ vrf_context }}-ctrl-socket"
+{% else %}
             "socket-type": "unix",
             "socket-name": "/run/kea/dhcp4-ctrl-socket"
+{% endif %}
         },
         "lease-database": {
             "type": "memfile",
diff --git a/data/templates/dhcp-server/kea-dhcp6.conf.j2 b/data/templates/dhcp-server/kea-dhcp6.conf.j2
index 4745d693c..4352bbae7 100644
--- a/data/templates/dhcp-server/kea-dhcp6.conf.j2
+++ b/data/templates/dhcp-server/kea-dhcp6.conf.j2
@@ -10,8 +10,13 @@
             "service-sockets-retry-wait-time": 5000
         },
         "control-socket": {
+{% if vrf_context is vyos_defined %}
+            "socket-type": "unix",
+            "socket-name": "/run/kea/dhcp6-{{ vrf_context }}-ctrl-socket"
+{% else %}
             "socket-type": "unix",
             "socket-name": "/run/kea/dhcp6-ctrl-socket"
+{% endif %}
         },
         "lease-database": {
             "type": "memfile",