diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index 50ae685..ed8b1ea 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -129,6 +129,10 @@ alias ska="tmux kill-session -a"
 
 export PATH="$HOME/.local/bin:$PATH"
 
+# Enable bash completion compatibility in zsh
+autoload -U +X bashcompinit && bashcompinit
+autoload -U +X compinit && compinit
+
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
diff --git a/post-install.sh b/post-install.sh
index e8e9084..b8c0230 100755
--- a/post-install.sh
+++ b/post-install.sh
@@ -65,7 +65,11 @@ else
     TPM_ENABLED=true
 fi
 
-# Install basic packages first
+# Upgrade system packages first
+echo "[+] Upgrading system packages..."
+dnf upgrade -y || echo "WARNING: System upgrade failed"
+
+# Install basic packages
 echo "[+] Installing basic packages..."
 dnf install -y epel-release || exit 1
 dnf config-manager --set-enabled crb || exit 1
@@ -159,7 +163,8 @@ echo "[+] Installing additional packages..."
 dnf install -y \
   clevis clevis-luks tpm2-tools tpm2-tss \
   tmux neovim python3-pip python3.13 \
-  tree gcc make autoconf automake tar bzip2 || exit 1
+  tree gcc make autoconf automake tar bzip2 \
+  bash-completion || exit 1
 
 
 # Install dropbear for early boot SSH
@@ -176,6 +181,17 @@ dnf install -y fastfetch || echo "fastfetch not available in repos, skipping"
 echo "  - Installing Claude Code..."
 curl -fsSL https://claude.ai/install.sh | bash || echo "WARNING: Claude Code installation failed"
 
+# Install bpytop via Python 3.13
+echo "  - Installing bpytop..."
+python3.13 -m pip install bpytop || echo "WARNING: bpytop installation failed"
+
+# Install Docker from official repository
+echo "[+] Installing Docker..."
+dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo || echo "WARNING: Docker repo setup failed"
+dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin || echo "WARNING: Docker installation failed"
+systemctl enable docker || echo "WARNING: Docker enable failed"
+usermod -aG docker ${ALMA_USER} || echo "WARNING: Adding user to docker group failed"
+
 # Install using fixed versions that should work
 LSD_VERSION="1.0.0"
 BAT_VERSION="0.24.0"