diff --git a/config/release/README b/config/image/README
similarity index 100%
rename from config/release/README
rename to config/image/README
diff --git a/config/release/sample.conf/extlinux.conf b/config/release/sample.conf/extlinux.conf
index 851f2592d7..2a52c077cb 100644
--- a/config/release/sample.conf/extlinux.conf
+++ b/config/release/sample.conf/extlinux.conf
@@ -3,10 +3,4 @@ PROMPT 0
 
 LABEL linux
   KERNEL /KERNEL
-  APPEND boot=/dev/sda1 disk=/dev/sdb2 quiet
-LABEL text
-  KERNEL /KERNEL
-  APPEND boot=/dev/sda1 disk=/dev/sdb2 quiet textmode
-LABEL debug
-  KERNEL /KERNEL
-  APPEND boot=/dev/sda1 disk=/dev/sdb2 quiet textmode debugging
+  APPEND boot=LABEL=BOOT disk=LABEL=STORAGE quiet
diff --git a/config/release/sample.conf/grub.conf b/config/release/sample.conf/grub.conf
index 6e5711f0bc..3cf75126be 100644
--- a/config/release/sample.conf/grub.conf
+++ b/config/release/sample.conf/grub.conf
@@ -4,12 +4,4 @@ hiddenmenu
 
 title OpenELEC.tv
   root (hd0,0)
-  kernel /KERNEL boot=/dev/sda1 disk=/dev/sda2 quiet
-
-title OpenELEC.tv (Textmode)
-  root (hd0,0)
-  kernel /KERNEL boot=/dev/sda1 disk=/dev/sda2 textmode quiet
-
-title OpenELEC.tv (Debugmode)
-  root (hd0,0)
-  kernel /KERNEL boot=/dev/sda1 disk=/dev/sda2 debugging textmode quiet
+  kernel /KERNEL boot=LABEL=BOOT disk=LABEL=STORAGE quiet
diff --git a/config/release/sample.conf/syslinux.cfg b/config/release/sample.conf/syslinux.cfg
index 804ae866c2..7fbc8700c2 100644
--- a/config/release/sample.conf/syslinux.cfg
+++ b/config/release/sample.conf/syslinux.cfg
@@ -3,10 +3,4 @@ PROMPT 0
 
 LABEL linux
   KERNEL /KERNEL
-  APPEND boot=/dev/sda1 disk=/dev/sdb2 quiet
-LABEL text
-  KERNEL /KERNEL
-  APPEND boot=/dev/sda1 disk=/dev/sdb2 quiet textmode
-LABEL debug
-  KERNEL /KERNEL
-  APPEND boot=/dev/sda1 disk=/dev/sdb2 quiet textmode debugging
+  APPEND boot=LABEL=BOOT disk=LABEL=STORAGE quiet