diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/basestrap.conf b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/basestrap.conf
index 6f43bc8..94f019e 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/basestrap.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/basestrap.conf
@@ -24,9 +24,13 @@ pacman:
         mode: "0o755"
     keyrings:
       - artix
+      - antergos-next
 
 base_init: elogind
 
 operations:
   - install:
     - base
+    - antergos-next-keyring
+    - antergos-release
+    - antergos-grub-theme
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml b/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml
index 2c091a8..91ef00f 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml
+++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml
@@ -23,19 +23,7 @@
     - pipewire-alsa
     - pipewire-pulse
     - wireplumber
-    - networkmanager-dinit
-    - pipewire-dinit
-    - pipewire-pulse-dinit
-    - wireplumber-dinit
-    - dbus-dinit
-    - sddm-dinit
-    - syslog-ng-dinit
-    - acpid-dinit
-    - bluez-dinit
-    - cronie-dinit
-    - cups-dinit
-    - dhcpcd-dinit
-    - power-profiles-daemon-dinit
+
 
 - name: "Kernel"
   description: "Kernel and modules"
@@ -261,3 +249,32 @@
       packages:
         - hyprland
         - xdg-desktop-portal-hyprland
+
+- name: "SDDM"
+  description: "SDDM display manager"
+  selected: false
+  packages:
+    - sddm
+    - sddm-dinit
+    - antergos-sddm-theme
+
+- name: "LightDM"
+  description: "LightDM display manager"
+  selected: false
+  packages:
+    - lightdm
+    - lightdm-dinit
+
+- name: "LXDM"
+  description: "LXDM display manager"
+  selected: false
+  packages:
+    - lxdm
+    - lxdm-dinit
+
+- name: "LY"
+  description: "LY display manager"
+  selected: false
+  packages:
+    - ly
+    - ly-dinit
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser.conf b/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser.conf
index 28e51e8..aee0d95 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser.conf
@@ -78,6 +78,7 @@ items:
                 - lm_sensors-dinit
                 - openvpn-dinit
                 - pipewire-dinit
+                - pipewire-pulse-dinit
                 - power-profiles-daemon-dinit
                 - rsync-dinit
                 - wireplumber-dinit
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf b/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf
index d8445d3..a63a656 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf
@@ -1,7 +1,7 @@
 ---
 mode: required
 
-method: netinstall-add
+method: netinstall-select
 
 labels:
     step: "Display Manager"
@@ -14,83 +14,18 @@ items:
       name: sddm
       description: "QML-based display manager (KDE default)"
       screenshot: ""
-      netinstall:
-        name: "sddm"
-        description: "SDDM display manager"
-        selected: true
-        critical: true
-        immutable: false
-        expanded: true
-        hidden: false
-        subgroups:
-            - name: "SDDM"
-              description: "SDDM packages"
-              selected: true
-              hidden: true
-              packages:
-                - sddm
-                - sddm-dinit
-                - antergos-sddm-theme
 
     - id: LightDM
       name: lightdm
       description: "Cross-desktop display manager (GTK)"
       screenshot: ""
-      netinstall:
-        name: "lightdm"
-        description: "LightDM display manager"
-        selected: false
-        critical: true
-        immutable: false
-        expanded: true
-        hidden: false
-        subgroups:
-            - name: "LightDM"
-              description: "LightDM packages"
-              selected: true
-              hidden: true
-              packages:
-                - lightdm
-                - lightdm-dinit
 
     - id: LXDM
       name: lxdm
       description: "Lightweight display manager (LXDE)"
       screenshot: ""
-      netinstall:
-        name: "lxdm"
-        description: "LXDM display manager"
-        selected: false
-        critical: true
-        immutable: false
-        expanded: true
-        hidden: false
-        subgroups:
-            - name: "LXDM"
-              description: "LXDM packages"
-              selected: true
-              hidden: true
-              packages:
-                - lxdm
-                - lxdm-dinit
 
     - id: LY
       name: ly
       description: "Minimal TUI display manager"
       screenshot: ""
-      netinstall:
-        name: "ly"
-        description: "LY display manager"
-        selected: false
-        critical: true
-        immutable: false
-        expanded: true
-        hidden: false
-        subgroups:
-            - name: "LY"
-              description: "LY packages"
-              selected: true
-              hidden: true
-              packages:
-                - ly
-                - ly-dinit
diff --git a/iso-profiles/antergos/live-overlay/etc/calamares/modules/services-artix.conf b/iso-profiles/antergos/live-overlay/etc/calamares/modules/services-artix.conf
index e5114bb..2cac80c 100644
--- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/services-artix.conf
+++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/services-artix.conf
@@ -22,3 +22,5 @@ services:
     action: "enable"
   - name: "syslog-ng"
     action: "enable"
+  - name: "dinit-user-spawn"
+    action: "enable"
diff --git a/iso-profiles/antergos/profile.yaml b/iso-profiles/antergos/profile.yaml
index 19fa8ee..2257511 100644
--- a/iso-profiles/antergos/profile.yaml
+++ b/iso-profiles/antergos/profile.yaml
@@ -20,6 +20,7 @@ live-session:
     - wireplumber
 rootfs:
   packages:
+    - antergos-release
     - qt6-multimedia-ffmpeg
     - firefox
     - vlc
@@ -54,6 +55,7 @@ rootfs:
       - bluez-dinit
       - cronie-dinit
       - dbus-dinit
+      - dbus-dinit-user
       - dhcpcd-dinit
       - power-profiles-daemon-dinit
     openrc:
@@ -99,6 +101,12 @@ livefs:
     - okular
     - partitionmanager
     - tesseract-data-eng
+    - pipewire
+    - pipewire-pulse
+    - wireplumber
+    - sof-firmware
+    - alsa-firmware
+    - alsa-utils
   packages-init:
     dinit:
       - antergos-live-dinit