diff --git a/build/archos-build.uefi b/build/archos-build.uefi
index 2ee425e..719057a 100644
--- a/build/archos-build.uefi
+++ b/build/archos-build.uefi
@@ -34,7 +34,7 @@ SizeMaxBytes=3G
 Format=swap
 EOF
 
-cd ..
+cd .. || exit
 
 # Temporär
 #touch "${DEVICE}"
@@ -65,11 +65,13 @@ HOSTNAME_NEW="arch-build"
 
 KERNEL="linux"
 BASE=( base )
+BASE_DEVEL=( base-devel)
 INITRD=( mkinitcpio )
 MICROCODE="amd-ucode"
-WIFI_BACKEND=( wpa_supplicant )
-NETWORK=( iptables-nft firewalld inetutils avahi networkmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc "${WIFI_BACKEND[@]}" modemmanager )
-OTHER=( vim mkosi git lynx openssh htop bash-completion man-db man-pages reflector "${BASE[@]}" "${INITRD[@]}" plymouth linux-firmware xdg-utils )
+#WIFI_BACKEND=( wpa_supplicant )
+NETWORK=( iptables-nft firewalld inetutils avahi )
+MKOSI=( mkosi cpio gptfdisk )
+OTHER=( vim "${MKOSI[@]}" git lynx openssh htop bash-completion man-db man-pages reflector "${BASE[@]}" "${BASE_DEVEL[@]}" "${INITRD[@]}" plymouth linux-firmware xdg-utils opendoas )
 
 pacstrap /mnt "${KERNEL}" "${MICROCODE}" "${NETWORK[@]}" "${OTHER[@]}"
 arch-chroot /mnt hwclock --systohc
@@ -98,7 +100,12 @@ ff02::1   ip6-allnodes
 ff02::2   ip6-allrouters
 EOF
 
+cat /mnt/etc/doas.conf << EOF
+permit :wheel
+EOF
+
 arch-chroot /mnt chpasswd <<< "root:testen"
+arch-chroot /mnt useradd -mG wheel build
 arch-chroot /mnt chpasswd <<< "build:build"
 
 sed -i 's/#\(CHARACTER_SET:\).*/\1utf-8/' /mnt/etc/lynx.cfg
@@ -118,13 +125,14 @@ EOF
 
 arch-chroot /mnt systemctl enable systemd-resolved
 arch-chroot /mnt systemctl enable systemd-timesyncd
-arch-chroot /mnt systemctl enable NetworkManager
+#arch-chroot /mnt systemctl enable NetworkManager
+arch-chroot /mnt systemctl enable systemd-networkd
 arch-chroot /mnt systemctl enable reflector.timer
 arch-chroot /mnt systemctl enable firewalld
 arch-chroot /mnt systemctl enable fstrim.timer
-arch-chroot /mnt systemctl enable gdm
+#arch-chroot /mnt systemctl enable gdm
 arch-chroot /mnt systemctl enable avahi-daemon
-arch-chroot /mnt systemctl enable bluetooth
+#arch-chroot /mnt systemctl enable bluetooth
 
 sed -i 's/^HOOKS=(.*)/HOOKS=(base systemd keyboard plymouth autodetect sd-vconsole modconf kms block filesystems fsck)/' /mnt/etc/mkinitcpio.conf