diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 68256a8..a21e54b 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -406,7 +406,7 @@ configure_livecd_image(){
     
     ${auto_svc_conf} && configure_services_live "$1"
     
-#     configure_machine_id "$1"
+    configure_machine_id "$1"
     
     configure_hostname "$1"
     
@@ -467,6 +467,14 @@ download_to_cache(){
 
 # Build ISO
 make_iso() {
+    # cleanup machine-id
+    if [[ -e ${work_dir}/root-image/etc/machine-id ]]; then
+        rm ${work_dir}/root-image/etc/machine-id &> /dev/null
+    fi
+    if [[ -e ${work_dir}/root-image/var/lib/dbus/machine-id ]]; then
+        rm ${work_dir}/root-image/var/lib/dbus/machine-id &> /dev/null
+    fi
+
     msg "Start [Build ISO]"
     touch "${work_dir}/iso/.miso"
     
@@ -525,11 +533,13 @@ make_root_image() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
     
 	msg "Prepare [Base installation] (root-image)"
-	
-	mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" || die "Please check you Packages file! Exiting." 
-	
+
+	mkdir -p ${work_dir}/root-image/etc
+	mkdir -p ${work_dir}/root-image/var/lib/dbus
 	configure_machine_id "${work_dir}/root-image"
 	
+	mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" || die "Please check you Packages file! Exiting."
+	
 # 	mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
 # 	
 # 	setarch ${arch} \