diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 5adcc72..2db8ead 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -14,14 +14,14 @@ submenu "Specific sip:providerCE  releases ... ->" --class=submenu {
 
 menuentry "sip:providerCE (DHCP)      - trunk version" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk ngcpnw.dhcp 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk ngcpnw.dhcp 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "sip:providerCE (static NW) - trunk version" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
@@ -35,28 +35,28 @@ submenu "Specific sip:providerPRO releases ... ->" --class=submenu {
 
 menuentry "sip:providerPRO - sp1 / trunk release" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "sip:providerPRO - sp2 / trunk release" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "sip:providerPRO - sp1 DHCP/ trunk release" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnw.dhcp 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnw.dhcp 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "sip:providerPRO - sp2 DHCP/ trunk release" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk ngcpnw.dhcp 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk ngcpnw.dhcp 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
@@ -70,14 +70,14 @@ submenu "Specific sip:Carrier releases ... ->" --class=submenu {
 
 menuentry "sip:Carrier mgmt (web01a) DHCP / trunk" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpfillcache ngcpnw.dhcp ngcpvers=trunk ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpfillcache ngcpnw.dhcp ngcpvers=trunk ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "sip:Carrier mgmt (web01a) / trunk" {
   echo 'Loading kernel...'
-  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpfillcache ngcpnonwrecfg dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcpvers=trunk ngcpcrole=mgmt ngcphostname=web01a 
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpfillcache ngcpnonwrecfg dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcpvers=trunk ngcpcrole=mgmt ngcphostname=web01a 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index fe71c49..9df0146 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -69,7 +69,7 @@ menu separator
 label cetrunk
   menu label sip:providerCE (DHCP)      - trunk version
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk ngcpnw.dhcp 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk ngcpnw.dhcp 
 
   text help
                                      Install sip:provider community edition,
@@ -81,7 +81,7 @@ label cetrunk
 label cenwtrunk
   menu label sip:providerCE (static NW) - trunk version
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off 
 
   text help
                                      Install sip:provider community edition,
@@ -113,7 +113,7 @@ menu separator
 label prosp1nw-trunk
   menu label sip:providerPRO - sp1 / trunk release
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 
 
   text help
                                      Install sip:provider
@@ -126,7 +126,7 @@ label prosp1nw-trunk
 label prosp2nw-trunk
   menu label sip:providerPRO - sp2 / trunk release
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off 
 
   text help
                                      Install sip:provider
@@ -139,7 +139,7 @@ label prosp2nw-trunk
 label prosp1-trunk
   menu label sip:providerPRO - sp1 DHCP/ trunk release
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnw.dhcp 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnw.dhcp 
 
   text help
                                      Install sip:provider
@@ -151,7 +151,7 @@ label prosp1-trunk
 label prosp2-trunk
   menu label sip:providerPRO - sp2 DHCP/ trunk release
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk ngcpnw.dhcp 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpvers=trunk ngcpnw.dhcp 
 
   text help
                                      Install sip:provider
@@ -182,7 +182,7 @@ menu separator
 label carrierweb01atrunkdhcp
   menu label sip:Carrier mgmt/web01a DHCP / trunk
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnw.dhcp ngcpnonwrecfg ngcpfillcache ngcpcrole=mgmt ngcphostname=web01a 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnw.dhcp ngcpnonwrecfg ngcpfillcache ngcpcrole=mgmt ngcphostname=web01a 
 
   text help
                                      Install sip:Carrier edition (trunk).
@@ -196,7 +196,7 @@ label carrierweb01atrunkdhcp
 label carrierweb01atrunkstatic
   menu label sip:Carrier mgmt/web01a / trunk
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnonwrecfg dns=92.42.136.30,92.42.136.31 ngcpfillcache ngcpcrole=mgmt ngcphostname=web01a nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=stretch netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpvers=trunk ngcpnonwrecfg dns=92.42.136.30,92.42.136.31 ngcpfillcache ngcpcrole=mgmt ngcphostname=web01a nodhcp ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 
 
   text help
                                      Install sip:Carrier edition (trunk).