diff --git a/post-install.sh b/post-install.sh
index e7cfe8d..d3fa1ec 100755
--- a/post-install.sh
+++ b/post-install.sh
@@ -83,15 +83,13 @@ chown -R ${ALMA_USER}:${ALMA_USER} /home/${ALMA_USER}/.ssh
 # Install oh-my-zsh and powerlevel10k
 echo "[+] Installing oh-my-zsh and powerlevel10k..."
 # Download and run oh-my-zsh installer as the user with proper environment
-export RUNZSH=no
-export CHSH=no
-su - ${ALMA_USER} -c 'export RUNZSH=no; export CHSH=no; sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"' || echo "WARNING: oh-my-zsh installation failed"
+su - ${ALMA_USER} -c 'RUNZSH=no CHSH=no bash -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"' || echo "WARNING: oh-my-zsh installation failed"
 # Clone powerlevel10k theme
 su - ${ALMA_USER} -c 'git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.oh-my-zsh/custom/themes/powerlevel10k' || echo "WARNING: powerlevel10k installation failed"
 
 # Install dotfiles from git repo
 echo "[+] Installing dotfiles..."
-su - ${ALMA_USER} -c 'cd ~ && git clone https://git.dominik-roth.eu/dodox/nullpoint.git /tmp/nullpoint-dotfiles && cp /tmp/nullpoint-dotfiles/dotfiles/.* . 2>/dev/null || true && rm -rf /tmp/nullpoint-dotfiles' || echo "WARNING: dotfiles installation failed"
+su - ${ALMA_USER} -c 'cd && git clone https://git.dominik-roth.eu/dodox/nullpoint.git /tmp/nullpoint-dotfiles && cp /tmp/nullpoint-dotfiles/dotfiles/.* . 2>/dev/null || true && rm -rf /tmp/nullpoint-dotfiles' || echo "WARNING: dotfiles installation failed"
 
 # Set up MOTD
 if [ "$ENABLE_MOTD" = true ]; then
@@ -106,17 +104,17 @@ echo "[+] Installing additional packages..."
 dnf install -y \
   clevis clevis-luks tpm2-tools tpm2-tss \
   tmux neovim python3-pip \
-  tree gcc make zlib-devel autoconf automake || exit 1
+  tree gcc make zlib-devel autoconf automake tar bzip2 || exit 1
 
 # Build and install dropbear from source since AlmaLinux doesn't package it
 echo "[+] Installing dropbear from source..."
-cd /tmp
-wget -q https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.83.tar.bz2
-tar xf dropbear-2022.83.tar.bz2
-cd dropbear-2022.83
-./configure --prefix=/usr/local --enable-static
-make PROGRAMS="dropbear dropbearkey" MULTI=1
-make install
+cd /tmp || exit 1
+wget -q https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.83.tar.bz2 || exit 1
+tar xf dropbear-2022.83.tar.bz2 || exit 1
+cd dropbear-2022.83 || exit 1
+./configure --prefix=/usr/local --enable-static || exit 1
+make PROGRAMS="dropbear dropbearkey" MULTI=1 || exit 1
+make install || exit 1
 ln -sf /usr/local/bin/dropbear /usr/bin/dropbear
 ln -sf /usr/local/bin/dropbearkey /usr/bin/dropbearkey