diff --git a/templates-ce/boot/grub/grub.cfg b/templates-ce/boot/grub/grub.cfg
index 5a53240..bb9098b 100644
--- a/templates-ce/boot/grub/grub.cfg
+++ b/templates-ce/boot/grub/grub.cfg
@@ -9,20 +9,62 @@ menuentry "Rescue system boot (%VERSION%)" {
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
-menuentry "Install sip:providerCE  - DHCP" {
+menuentry "Install latest sip:providerCE  - DHCP" {
   echo 'Loading kernel...'
   linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy scripts ngcphostname=spce 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
-menuentry "Install sip:providerCE  - static NW config" {
+menuentry "Install latest sip:providerCE  - static NW config" {
   echo 'Loading kernel...'
   linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy scripts ngcphostname=spce ip=192.168.1.123::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 
   echo 'Loading initrd...'
   initrd /boot/%SHORT_NAME%/initrd.img
 }
 
+menuentry "Install 2.8 LTS sip:providerCE - DHCP" {
+  echo 'Loading kernel...'
+  linux /boot/%SHORT_NAME%/vmlinuz initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy ngcpvers=2.8 scripts ngcphostname=spce 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+menuentry "Install 2.8 LTS sip:providerCE - static NW" {
+  echo 'Loading kernel...'
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy ngcpvers=2.8 scripts ngcphostname=spce ip=192.168.1.100::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+menuentry "Install plain Debian/squeeze 64bit - DHCP" {
+  echo 'Loading kernel...'
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+menuentry "Install plain Debian/squeeze 64bit - static NW" {
+  echo 'Loading kernel...'
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+menuentry "Install plain Debian/wheezy  64bit - DHCP" {
+  echo 'Loading kernel...'
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+menuentry "Install plain Debian/wheezy  64bit - static NW" {
+  echo 'Loading kernel...'
+  linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
 source /boot/grub/addons.cfg
 source /boot/grub/footer.cfg
 
diff --git a/templates-ce/boot/isolinux/isolinux.cfg b/templates-ce/boot/isolinux/isolinux.cfg
index 34ffd06..1abbcf0 100644
--- a/templates-ce/boot/isolinux/isolinux.cfg
+++ b/templates-ce/boot/isolinux/isolinux.cfg
@@ -114,8 +114,7 @@ menu separator
 label squeeze
   menu label Install plain Debian/squeeze 64bit - DHCP
   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 vga=791 quiet nomce nongcp ssh=sipwise
-debianrelease=squeeze scripts 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts 
 
   text help
                                         Install Debian squeeze, 64bit.
@@ -130,8 +129,7 @@ debianrelease=squeeze scripts
 label squeezenw
   menu label Install plain Debian/squeeze 64bit - static NW
   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 vga=791 quiet nomce nongcp ssh=sipwise
-debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8 
 
   text help
                                         Install Debian squeeze, 64bit.
@@ -146,8 +144,7 @@ debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian
 label wheezy
   menu label Install plain Debian/wheezy  64bit - DHCP
   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 vga=791 quiet nomce nongcp ssh=sipwise
-debianrelease=wheezy scripts 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts 
 
   text help
                                         Install Debian wheezy, 64bit.
@@ -162,8 +159,7 @@ debianrelease=wheezy scripts
 label wheezynw
   menu label Install plain Debian/wheezy  64bit - static NW
   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 vga=791 quiet nomce nongcp ssh=sipwise
-debianrelease=wheezy scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8 
+  append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8 
 
   text help
                                         Install Debian wheezy, 64bit.
diff --git a/templates-ce/scripts/includes/deployment.sh b/templates-ce/scripts/includes/deployment.sh
index 01bcba7..e9fcc67 100755
--- a/templates-ce/scripts/includes/deployment.sh
+++ b/templates-ce/scripts/includes/deployment.sh
@@ -56,6 +56,7 @@ VAGRANT=false
 ADJUST_FOR_LOW_PERFORMANCE=false
 ENABLE_VM_SERVICES=false
 FILESYSTEM="ext4"
+SYSTEMD=false
 
 if [ -L /sys/block/vda ] ; then
   export DISK=vda # will be configured as /dev/vda
@@ -410,6 +411,11 @@ fi
 if checkBootParam enablevmservices ; then
   ENABLE_VM_SERVICES=true
 fi
+
+if checkBootParam ngcpsystemd ; then
+  logit "Enabling systemd support as requested via boot option ngcpsystemd"
+  SYSTEMD=true
+fi
 ## }}}
 
 ## interactive mode {{{
@@ -922,6 +928,19 @@ cp /etc/apt/trusted.gpg.d/sipwise.gpg "\${MNTPOINT}"/etc/apt/trusted.gpg.d/
 EOF
 chmod 775 /etc/debootstrap/pre-scripts/install-sipwise-key.sh
 
+if "$SYSTEMD" ; then
+  logit "Enabling systemd installation via grml-debootstrap"
+  mkdir -p /etc/debootstrap/scripts/
+  cat > /etc/debootstrap/scripts/systemd.sh << EOF
+#!/bin/bash
+# installed via deployment.sh
+mount "$ROOT_FS" "$TARGET"
+echo 'Yes, do as I say!' | chroot $TARGET apt-get install --force-yes -y systemd-sysv sysvinit-
+umount "$TARGET"
+EOF
+  chmod 775 /etc/debootstrap/scripts/systemd.sh
+fi
+
 # NOTE: we use the debian.sipwise.com CNAME by intention here
 # to avoid conflicts with apt-pinning, preferring deb.sipwise.com
 # over official Debian
diff --git a/templates-ce/scripts/main.sh b/templates-ce/scripts/main.sh
index f24ce2b..e90d499 100755
--- a/templates-ce/scripts/main.sh
+++ b/templates-ce/scripts/main.sh
@@ -65,8 +65,8 @@ report_ssh_password() {
 }
 
 deploy() {
-  # deploy only if we have the ngcpce boot option present
-  if ! grep -q ngcpce /proc/cmdline ; then
+  # deploy only if we have the ngcpce or debianrelease boot option present
+  if ! grep -q ngcpce /proc/cmdline && ! grep -q debianrelease /proc/cmdline ; then
     return 0
   fi