diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index f6e31ba..9ba0edd 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -28,6 +28,7 @@ SDDEV=""
 DEV_NAME=""
 TIMEZONE=""
 LOCALE=""
+HOSTNAME=""
 
 # check if root
 if [ "$EUID" -ne 0 ]; then
@@ -158,7 +159,14 @@ create_install() {
 
     info "Applying overlay for $EDITION..."
     cp -ap $TMPDIR/arm-profiles/overlays/$EDITION/* $TMPDIR/root/
-    
+
+    info "Enabling user services..."
+    if [[ "$EDITION" = "minimal" ]] || [[ "$EDITION" = "server" ]]; then
+        echo "No user services for $EDITION edition"
+    else
+        $NSPAWN $TMPDIR/root --user $(cat $TMPDIR/user) systemctl --user enable pulseaudio.service 1> /dev/null 2>&1
+    fi
+
     info "Setting up users..."
     #setup users
     echo "$USER" > $TMPDIR/user
@@ -172,14 +180,7 @@ create_install() {
     $NSPAWN $TMPDIR/root useradd -m -g users -G wheel,sys,input,video,storage,lp,network,users,power -p $(mkpasswd --hash=SHA-512 $(cat $TMPDIR/password)) -s /bin/bash $(cat $TMPDIR/user) 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root usermod -aG $USERGROUPS $(cat $TMPDIR/user) 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root chfn -f "$FULLNAME" $(cat $TMPDIR/user) 1> /dev/null 2>&1
-
-    info "Enabling user services..."
-    if [[ "$EDITION" = "minimal" ]] || [[ "$EDITION" = "server" ]]; then
-        msg "No user services for $EDITION edition"
-    else
-        $NSPAWN $TMPDIR/root --user $(cat $TMPDIR/user) systemctl --user enable pulseaudio.service 1> /dev/null 2>&1
-    fi
-
+    
     info "Setting up system settings..."
     #system setup
     $NSPAWN $TMPDIR/root chmod u+s /usr/bin/ping 1> /dev/null 2>&1
@@ -187,15 +188,14 @@ create_install() {
     rm -f $TMPDIR/root/etc/ca-certificates/extracted/tls-ca-bundle.pem
     cp -a /etc/ssl/certs/ca-certificates.crt $TMPDIR/root/etc/ssl/certs/
     cp -a /etc/ca-certificates/extracted/tls-ca-bundle.pem $TMPDIR/root/etc/ca-certificates/extracted/
-    $NSPAWN $TMPDIR/root timedatectl set-timezone $TIMEZONE 1> /dev/null 2>&1
-    $NSPAWN $TMPDIR/root timedatectl set-ntp true 1> /dev/null 2>&1
+    $NSPAWN $TMPDIR/root ln -sf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime 1> /dev/null 2>&1
     $NSPAWN $TMPDIR/root sed -i s/"#$LOCALE"/"$LOCALE"/g /etc/locale.gen 1> /dev/null 2>&1
-    $NSPAWN $TMPDIR/root locale-gen 1> /dev/null 2>&1
-    $NSPAWN $TMPDIR/root localectl set-locale $LOCALE 1> /dev/null 2>&1
-    if [[ "$SYSTEM" != "Pinebook" ]]; then
-    $NSPAWN $TMPDIR/root localectl set-keymap $KEYMAP 1> /dev/null 2>&1
-    fi
-    $NSPAWN $TMPDIR/root hostnamectl set-hostname $HOSTNAME 1> /dev/null 2>&1
+    echo "LANG=$LOCALE" | tee --append $TMPDIR/root/etc/locale.conf 1> /dev/null 2>&1
+    $NSPAWN $TMPDIR/root locale-gen
+    echo "KEYMAP=$KEYMAP" | tee --append $TMPDIR/root/etc/vconsole.conf 1> /dev/null 2>&1
+    $NSPAWN $TMPDIR/root localectl set-x11-keymap $KEYMAP 1> /dev/null 2>&1
+    echo "$HOSTNAME" | tee --append $TMPDIR/root/etc/hostname 1> /dev/null 2>&1
+
     chown -R root:root $TMPDIR/root/etc 1> /dev/null 2>&1
     if [[ "$EDITION" != "minimal" && "$EDITION" != "server" ]]; then
     chown root:polkitd $TMPDIR/root/etc/polkit-1/rules.d 1> /dev/null 2>&1