diff --git a/after.sh b/after.sh
index ee7b5f9..6cde001 100644
--- a/after.sh
+++ b/after.sh
@@ -58,8 +58,8 @@ install -d -o "$USERNAME" -g "$USERNAME" "/home/$USERNAME/.config/yay"
 su - "$USERNAME" <<'EOF'
 
 git clone https://aur.archlinux.org/yay-bin.git
-cd yay-bin
-makepkg -si --noconfirm
+cd yay-bin && makepkg -si --noconfirm
+cd "$OLDPWD" && rm -rf yay-bin
 
 # Set up yay to not ask for password multiple times during installation / upgrading later
 yay --sudoloop --save
@@ -186,9 +186,8 @@ sed -i 's/^#\?GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=false/' /etc/defa
 su - "$USERNAME" <<'EOF'
 curl -O https://git.baltrust.eu.org/Baltrust/fixes/raw/branch/main/Graphite-grub2-theme.tar.xz
 tar -xf Graphite-grub2-theme.tar.xz && rm Graphite-grub2-theme.tar.xz
-cd grub2
-./install.sh
-cd "$OLDPWD"
+cd grub2 && ./install.sh
+cd "$OLDPWD" && rm -rf grub2
 EOF
 
 # Restore password requirement after successful installation