diff --git a/.install/install_requirements.sh b/.install/install_requirements.sh
index 88ae1cb..6950539 100755
--- a/.install/install_requirements.sh
+++ b/.install/install_requirements.sh
@@ -2,32 +2,38 @@
 
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+isARM=$(uname -a | grep arm)
 
 # Basics
-sudo apt install curl jq
+sudo apt update
+sudo apt install curl jq -y
 
 # Silkaj + Duniterpy
-sudo apt install python3-pip
-sudo apt install libsodium23
+sudo apt install python3-pip libsodium18 -y
 pip3 install silkaj
 
-
 # Install IPFS
 [[ ! -z $(which /usr/local/bin/ipfs) ]] && sudo service ipfs stop
 [[ -d ~/.ipfs/ ]] && mv ~/.ipfs/ ~/.ipfs-old
-wget -P $MY_PATH https://dist.ipfs.io/ipfs-update/v1.5.2/ipfs-update_v1.5.2_linux-arm.tar.gz
+if [[ -z $isARM ]]; then
+	wget -P $MY_PATH https://dist.ipfs.io/ipfs-update/v1.5.2/ipfs-update_v1.5.2_linux-amd64.tar.gz -O ipfs-update.tar.gz
+else
+	wget -P $MY_PATH https://dist.ipfs.io/ipfs-update/v1.5.2/ipfs-update_v1.5.2_linux-arm.tar.gz -O ipfs-update.tar.gz
+fi
 
 echo "INSTALL ipfs-update"
-sudo tar -xvzf $MY_PATH/ipfs-update_v1.5.2_linux-arm.tar.gz -C /usr/src/
-rm $MY_PATH/ipfs-update_v1.5.2_linux-arm.tar.gz
-sudo bash /usr/src/ipfs-update/install.sh
+sudo tar -xvzf $MY_PATH/ipfs-update.tar.gz -C /usr/src/
+rm $MY_PATH/ipfs-update.tar.gz
+cd /usr/src/ipfs-update/
+sudo ./install.sh
+cd $MY_PATH
 
 echo "INSTALL latest ipfs"
 sudo ipfs-update install latest
 
 echo "CREATE SYSTEMD ipfs SERVICE"
 [[ ! -z $(which /etc/systemd/system/ipfs.service) ]] && sudo rm /etc/systemd/system/ipfs.service
-sudo cp -f $templates/ipfs.service /etc/systemd/system/
+sudo cp -f $MY_PATH/templates/ipfs.service /etc/systemd/system/
 sudo sed -i "s/_USER/$USER/g" /etc/systemd/system/ipfs.service
 
 sudo systemctl daemon-reload
@@ -35,7 +41,10 @@ sudo systemctl enable ipfs
 
 
 # Install gammu
-apt install ppp screen git minicom gammu gammu-smsd
-usermod -aG gammu pi
+sudo apt install ppp screen git minicom gammu -y
+sleep 1
+sudo apt install gammu-smsd -y
+
+sudo usermod -aG gammu $USER
 
 exit 0