diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-offline/modules/machineid.conf b/iso-profiles/antergos/live-overlay/etc/calamares-offline/modules/machineid.conf
index 932be3f..0199629 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares-offline/modules/machineid.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares-offline/modules/machineid.conf
@@ -1,5 +1,5 @@
 ---
 systemd: false
 dbus: true
-dbus-symlink: true
+dbus-symlink: false
 entropy-copy: false
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/machineid.conf b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/machineid.conf
index 932be3f..0199629 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/machineid.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/machineid.conf
@@ -1,5 +1,5 @@
 ---
 systemd: false
 dbus: true
-dbus-symlink: true
+dbus-symlink: false
 entropy-copy: false
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml
index bf7b1aa..12f5097 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml
+++ b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml
@@ -68,7 +68,7 @@
     - artix-grub-theme
 
 - name: "Desktop"
-  description: "Desktop Environment"
+  description: "DE"
   selected: true
   critical: false
   subgroups:
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser.conf b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser.conf
index 748302c..3334d07 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser.conf
@@ -13,7 +13,7 @@ items:
     - id: OpenRC
       name: openrc
       description: "OpenRC init system"
-      screenshot: ":/images/if.png"
+      screenshot: ""
       netinstall:
         name: "openrc"
         description: "OpenRC init system"
@@ -84,7 +84,7 @@ items:
     - id: Dinit
       name: dinit
       description: "Dinit init system"
-      screenshot: ":/images/if.png"
+      screenshot: ""
       netinstall:
         name: "dinit"
         description: "Dinit init system"
@@ -154,7 +154,7 @@ items:
     - id: S6
       name: s6
       description: "S6 init system"
-      screenshot: ":/images/if.png"
+      screenshot: ""
       netinstall:
         name: "s6"
         description: "S6 init system"
@@ -225,7 +225,7 @@ items:
     - id: Runit
       name: runit
       description: "Runit init system"
-      screenshot: ":/images/if.png"
+      screenshot: ""
       netinstall:
         name: "runit"
         description: "Runit init system"
diff --git a/iso-profiles/antergos/live-overlay/home/antergos/.config/autostart/antergos-wallpaper.desktop b/iso-profiles/antergos/live-overlay/home/antergos/.config/autostart/antergos-wallpaper.desktop
deleted file mode 100644
index 91309bc..0000000
--- a/iso-profiles/antergos/live-overlay/home/antergos/.config/autostart/antergos-wallpaper.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Set Antergos NeXT Wallpaper
-Comment=Apply Antergos NeXT default wallpaper on live session start
-Exec=/usr/local/bin/set-antergos-wallpaper.sh
-Terminal=false
-X-KDE-autostart-phase=2
-NoDisplay=true
diff --git a/iso-profiles/antergos/root-overlay/usr/bin/systemd-machine-id-setup b/iso-profiles/antergos/root-overlay/usr/bin/systemd-machine-id-setup
new file mode 100755
index 0000000..f31d304
--- /dev/null
+++ b/iso-profiles/antergos/root-overlay/usr/bin/systemd-machine-id-setup
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+ROOT=""
+
+for arg in "$@"; do
+    case "$arg" in
+        --root=*)
+            ROOT="${arg#*=}"
+            ;;
+    esac
+done
+
+MACHINE_ID_FILE="${ROOT}/etc/machine-id"
+
+if [ -f "$MACHINE_ID_FILE" ] && [ -s "$MACHINE_ID_FILE" ]; then
+    exit 0
+fi
+
+mkdir -p "$(dirname "$MACHINE_ID_FILE")"
+
+if command -v dbus-uuidgen &>/dev/null; then
+    dbus-uuidgen --ensure 2>/dev/null
+fi
+
+if [ ! -f "$MACHINE_ID_FILE" ] || [ ! -s "$MACHINE_ID_FILE" ]; then
+    od -An -N16 -tx1 /dev/urandom | tr -d ' \n' > "$MACHINE_ID_FILE"
+fi
+
+chmod 0644 "$MACHINE_ID_FILE"