diff --git a/install/initial/initial_server.sh b/install/initial/initial_server.sh
index 07b42d3..39a5f68 100644
--- a/install/initial/initial_server.sh
+++ b/install/initial/initial_server.sh
@@ -30,7 +30,7 @@ function install_zsh () {
     echo 'eval "$(sheldon source)"' | tee -a "$HOME/.zshrc"
 
     sheldon add zsh-completions --github zsh-users/zsh-completions
-    sheldon add zsh-autocomplete --github marlonrichert/zsh-autocomplete
+    sheldon add zsh-autocomplete --github marlonrichert/zsh-autocomplete --tag 23.07.13
     sheldon add zsh-autosuggestions --github zsh-users/zsh-autosuggestions --use '{{ name }}.zsh'
     sheldon add zsh-syntax-highlighting --github zsh-users/zsh-syntax-highlighting
     sheldon add powerlevel10k --github romkatv/powerlevel10k
@@ -41,14 +41,14 @@ function setup_swapfile () {
     printf "Please enter swapfile capacity (example : ~ M)\n"
     read swapcap
     if [ "$1" == "btrfs" ]; then
-        sudo truncate -s 0 /swapfile
-        sudo chattr +C /swapfile
-        sudo fallocate -l "$swapcap"M /swapfile
-        sudo chmod 600 /swapfile
-        sudo mkswap /swapfile
-        sudo swapon /swapfile
+        sudo truncate -s 0 /swap/swapfile
+        sudo chattr +C /swap/swapfile
+        sudo fallocate -l "$swapcap"M /swap/swapfile
+        sudo chmod 600 /swap/swapfile
+        sudo mkswap /swap/swapfile
+        sudo swapon /swap/swapfile
         echo "#swapfile_autogenerated" | sudo tee -a /etc/fstab
-        echo "/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab
+        echo "/swap/swapfile none swap defaults 0 0" | sudo tee -a /etc/fstab
     else
         sudo dd if=/dev/zero of=/swapfile bs=1M count="$swapcap" status=progress
         sudo chmod 600 /swapfile
@@ -75,7 +75,7 @@ function install_yay () {
     sudo pacman -S --noconfirm git
     git clone https://aur.archlinux.org/yay.git
     cd yay
-    makepkg -si
+    makepkg -si --noconfirm
     cd "$HOME"
 }
 
@@ -85,7 +85,7 @@ function install_fonts () {
 }
 
 function install_podman () {
-    sudo pacman -S podman podman-compose podman-docker aardvark-dns
+    sudo pacman -S --noconfirm podman podman-compose podman-docker aardvark-dns
     echo 'export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/podman/podman.sock"' | sudo tee -a /etc/environment
     mkdir ~/.config/containers
     echo "unqualified-search-registries = [\"docker.io\"]" >> ~/.config/containers/registries.conf