diff --git a/dishes/desktop-hypervisor-amdcpu_rawhide.cfg b/dishes/desktop-hypervisor-amdcpu_rawhide.cfg
index d767702..ca36c91 100644
--- a/dishes/desktop-hypervisor-amdcpu_rawhide.cfg
+++ b/dishes/desktop-hypervisor-amdcpu_rawhide.cfg
@@ -5,7 +5,7 @@ text
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
@@ -236,6 +236,7 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
 libusb
 libvirt
diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg
index ca434d7..0f330b0 100644
--- a/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg
+++ b/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg
@@ -5,7 +5,7 @@ text
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
diff --git a/dishes/desktop-hypervisor-intelcpu_rawhide.cfg b/dishes/desktop-hypervisor-intelcpu_rawhide.cfg
index a252db8..fc1c7bd 100644
--- a/dishes/desktop-hypervisor-intelcpu_rawhide.cfg
+++ b/dishes/desktop-hypervisor-intelcpu_rawhide.cfg
@@ -5,7 +5,7 @@ text
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
@@ -236,6 +236,7 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
 libusb
 libvirt
diff --git a/dishes/desktop-hypervisor_rawhide.cfg b/dishes/desktop-hypervisor_rawhide.cfg
index 9e9f143..8b6bd16 100644
--- a/dishes/desktop-hypervisor_rawhide.cfg
+++ b/dishes/desktop-hypervisor_rawhide.cfg
@@ -5,7 +5,7 @@ text
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
@@ -228,6 +228,7 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
 libusb
 libvirt
diff --git a/dishes/desktop_rawhide.cfg b/dishes/desktop_rawhide.cfg
index 9d4ca61..3e4cd14 100644
--- a/dishes/desktop_rawhide.cfg
+++ b/dishes/desktop_rawhide.cfg
@@ -5,7 +5,7 @@ text
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
@@ -135,6 +135,7 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
 libusb
 mozilla-ublock-origin.noarch
diff --git a/dishes/live-desktop-hypervisor_rawhide.cfg b/dishes/live-desktop-hypervisor_rawhide.cfg
index dd0243a..c393082 100644
--- a/dishes/live-desktop-hypervisor_rawhide.cfg
+++ b/dishes/live-desktop-hypervisor_rawhide.cfg
@@ -3,7 +3,7 @@
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
@@ -284,6 +284,7 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
 libusb
 libvirt
diff --git a/dishes/live-desktop_rawhide.cfg b/dishes/live-desktop_rawhide.cfg
index bdbaaf8..57efb8b 100644
--- a/dishes/live-desktop_rawhide.cfg
+++ b/dishes/live-desktop_rawhide.cfg
@@ -3,7 +3,7 @@
 # Firewall configuration
 firewall --enabled
 # Run the Setup Agent on first boot
-firstboot --reconfig
+firstboot --enable
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # System language
@@ -195,6 +195,7 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
 kernel
 kernel-modules
diff --git a/dishes/virtual-desktop_43.cfg b/dishes/virtual-desktop_43.cfg
index a8f84c6..b2f34bf 100644
--- a/dishes/virtual-desktop_43.cfg
+++ b/dishes/virtual-desktop_43.cfg
@@ -132,10 +132,11 @@ generic-release-common
 generic-release-notes
 gnome-backgrounds.noarch
 gnome-control-center
-gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
+initial-setup
 libusb
 mozilla-ublock-origin.noarch
 nano
diff --git a/dishes/virtual-desktop_43_devel.cfg b/dishes/virtual-desktop_43_devel.cfg
index 32e2d78..b0299fe 100644
--- a/dishes/virtual-desktop_43_devel.cfg
+++ b/dishes/virtual-desktop_43_devel.cfg
@@ -124,10 +124,11 @@ generic-release-common
 generic-release-notes
 gnome-backgrounds.noarch
 gnome-control-center
-gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
+initial-setup
 libusb
 mozilla-ublock-origin.noarch
 nano
diff --git a/dishes/virtual-desktop_devel_rawhide.cfg b/dishes/virtual-desktop_devel_rawhide.cfg
index 79b6046..a55d7bf 100644
--- a/dishes/virtual-desktop_devel_rawhide.cfg
+++ b/dishes/virtual-desktop_devel_rawhide.cfg
@@ -123,10 +123,11 @@ generic-release-common
 generic-release-notes
 gnome-backgrounds.noarch
 gnome-control-center
-gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
+initial-setup
 libusb
 mozilla-ublock-origin.noarch
 nano
diff --git a/dishes/virtual-desktop_labwc_43.cfg b/dishes/virtual-desktop_labwc_43.cfg
index cfb1e4c..9dbbb17 100644
--- a/dishes/virtual-desktop_labwc_43.cfg
+++ b/dishes/virtual-desktop_labwc_43.cfg
@@ -57,8 +57,7 @@ generic-logos
 generic-release
 generic-release-common
 generic-release-notes
-initial-setup-gui
-initial-setup-gui-wayland-generic
+initial-setup
 labwc
 libusb
 mozilla-ublock-origin.noarch
diff --git a/dishes/virtual-desktop_rawhide.cfg b/dishes/virtual-desktop_rawhide.cfg
index 12af5cf..92f1f62 100644
--- a/dishes/virtual-desktop_rawhide.cfg
+++ b/dishes/virtual-desktop_rawhide.cfg
@@ -134,7 +134,9 @@ gnome-control-center
 gnome-initial-setup
 gnome-session-wayland-session
 gnome-shell
+gnome-terminal
 gvfs-fuse
+initial-setup
 libusb
 mozilla-ublock-origin.noarch
 nano