diff --git a/platforms/livecd/settings.inc b/platforms/livecd/settings.inc
index 71439e7..6ce8b53 100644
--- a/platforms/livecd/settings.inc
+++ b/platforms/livecd/settings.inc
@@ -1,5 +1,4 @@
 MEDIA=iso
-MULTITHREAD=1
 DISTROMATIC=off
 if [ "$ARCH" = "i586" ]; then
    KERNEL_EXTRAVER=mamba
diff --git a/platforms/testcd-root/settings.inc b/platforms/testcd-root/settings.inc
index 3624186..951d728 100644
--- a/platforms/testcd-root/settings.inc
+++ b/platforms/testcd-root/settings.inc
@@ -1,10 +1,16 @@
 PRODUCT_NAME=testcd
 MEDIA=squash_xz
-MULTITHREAD=1
 
-KERNEL_EXTRAVER=mamba
-KERNEL_PLATFORM=""
-#KERNEL_ADDITIONAL="extramodules sound"
+if [ "$ARCH" = "i586" ]; then
+   KERNEL_EXTRAVER=mamba
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="wireless sound"
+   KERNEL_MORE_EXTRAVER=mamba-64GB
+elif [ "$ARCH" = "x86_64" ]; then
+   KERNEL_EXTRAVER=mamba-x86_64
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="wireless sound"
+fi
 
 ROOTDEV=
 ROOTFS=
diff --git a/platforms/testcd/settings.inc b/platforms/testcd/settings.inc
index 5ab0fe9..50fe98d 100644
--- a/platforms/testcd/settings.inc
+++ b/platforms/testcd/settings.inc
@@ -1,11 +1,19 @@
 MEDIA=iso
 #MEDIA=iso-grub
 MULTITHREAD=1
-DISTROMATIC=off
-#KERNEL_IGNORE=1
-KERNEL_EXTRAVER=mamba
-KERNEL_PLATFORM=""
-#KERNEL_ADDITIONAL="extramodules wireless sound"
+#DISTROMATIC=off
+
+if [ "$ARCH" = "i586" ]; then
+   KERNEL_EXTRAVER=mamba
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="wireless sound"
+   KERNEL_MORE_EXTRAVER=mamba-64GB
+elif [ "$ARCH" = "x86_64" ]; then
+   KERNEL_EXTRAVER=mamba-x86_64
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="wireless sound"
+fi
+
 [ "$SUBPLATFORM" ] || SUBPLATFORM="testcd-root"
 
 TARGET_HOSTNAME=openmamba-testcd