diff --git a/bundles/wide-dhcp6c/files/ip-down b/bundles/wide-dhcp6c/files/ip-down
index ec060ee..edc84de 100644
--- a/bundles/wide-dhcp6c/files/ip-down
+++ b/bundles/wide-dhcp6c/files/ip-down
@@ -3,8 +3,5 @@
 systemctl stop wide-dhcpv6-client
 
 % for interface, subnet_id in sorted(targets.items()):
-for IP in $(ip -6 addr show dev ${interface} | grep inet6 | awk '{print $2}' | grep -vF 'fe80::')
-do
-    ip -6 addr del $IP dev ${interface}
-done
+ip -6 addr flush dev ${interface} scope global
 % endfor
diff --git a/bundles/wide-dhcp6c/files/ip-up b/bundles/wide-dhcp6c/files/ip-up
index d6624a8..da0ac8d 100644
--- a/bundles/wide-dhcp6c/files/ip-up
+++ b/bundles/wide-dhcp6c/files/ip-up
@@ -12,7 +12,7 @@ if systemctl is-active wide-dhcpv6-client;
 then
     systemctl stop wide-dhcpv6-client
     sleep 1
-    systemctl sart wide-dhcpv6-client
+    systemctl start wide-dhcpv6-client
 else
     systemctl start wide-dhcpv6-client
 fi
diff --git a/bundles/wide-dhcp6c/items.py b/bundles/wide-dhcp6c/items.py
index fb04b49..53fc656 100644
--- a/bundles/wide-dhcp6c/items.py
+++ b/bundles/wide-dhcp6c/items.py
@@ -2,18 +2,21 @@ if node.has_bundle('pppd'):
     files['/etc/ppp/ip-up.d/wide-dhcp6c'] = {
         'source': 'ip-up',
         'content_type': 'mako',
-        'context': {
-            'source': node.metadata['wide-dhcp6c']['source'],
-        },
+        'context': node.metadata.get('wide-dhcp6c'),
         'mode': '0755',
+        'triggers': {
+            'svc_systemd:wide-dhcpv6-client:restart',
+        },
     }
+
     files['/etc/ppp/ip-down.d/wide-dhcp6c'] = {
         'source': 'ip-down',
         'content_type': 'mako',
-        'context': {
-            'targets': node.metadata['wide-dhcp6c']['targets'],
-        },
+        'context': node.metadata.get('wide-dhcp6c'),
         'mode': '0755',
+        'triggers': {
+            'svc_systemd:wide-dhcpv6-client:restart',
+        },
     }
 
     # Will be started and stopped by pppd.
@@ -25,11 +28,7 @@ else:
 
 files['/etc/wide-dhcpv6/dhcp6c.conf'] = {
     'content_type': 'mako',
-    'context': {
-        'source': node.metadata['wide-dhcp6c']['source'],
-        'targets': node.metadata['wide-dhcp6c']['targets'],
-        'subnet_len': node.metadata['wide-dhcp6c']['subnet_len'],
-    },
+    'context': node.metadata.get('wide-dhcp6c'),
     'triggers': {
         'svc_systemd:wide-dhcpv6-client:restart',
     },
@@ -37,9 +36,7 @@ files['/etc/wide-dhcpv6/dhcp6c.conf'] = {
 
 files['/etc/systemd/system/wide-dhcpv6-client.service'] = {
     'content_type': 'mako',
-    'context': {
-        'source': node.metadata['wide-dhcp6c']['source'],
-    },
+    'context': node.metadata.get('wide-dhcp6c'),
     'triggers': {
         'action:systemd-reload',
         'svc_systemd:wide-dhcpv6-client:restart',