diff --git a/add-jibri-node.sh b/add-jibri-node.sh
index 5b53d5f..1190511 100644
--- a/add-jibri-node.sh
+++ b/add-jibri-node.sh
@@ -59,6 +59,7 @@ NJN_USER="jbnode${ADDUP}_${NJN_RAND_TAIL}"
 NJN_USER_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 32 | head -n1)"
 GIT_FORGE="https://forge.switnet.net"
 GIT_REPO="switnet/quick-jibri-installer"
+JIBRI_CONF_ONLINE="$GIT_FORGE/$GIT_REPO/raw/branch/master/files/jibri.conf"
 TEST_JIBRI_ENV="$GIT_FORGE/$GIT_REPO/raw/branch/master/tools/test-jibri-env.sh"
 SHORT_ID="$(awk '{print substr($0,0,7)}' /etc/machine-id)"
 JIBRI_XORG_CONF="/etc/jitsi/jibri/xorg-video-dummy.conf"
@@ -342,12 +343,12 @@ chmod +x "$REC_DIR"
 
 ## New Jibri Config (2020)
 mv "$JIBRI_CONF" "${JIBRI_CONF}"-dpkg-file
-cp files/jibri.conf "$JIBRI_CONF"
+curl -s "$JIBRI_CONF_ONLINE" >  "$JIBRI_CONF"
 sed -i "s|JIBRI_RES_CONF|$JIBRI_RES_CONF|g" "$JIBRI_CONF"
 sed -i "s|DIR_RECORD|$DIR_RECORD|g" "$JIBRI_CONF"
 sed -i "s|REC_DIR|$REC_DIR|g" "$JIBRI_CONF"
 sed -i "s|JB_NAME|$JB_NAME|g" "$JIBRI_CONF"
-sed -i "s|DOMAIN|$DOMAIN|g" "$JIBRI_CONF"
+sed -i "s|DOMAIN|$MAIN_SRV_DOMAIN|g" "$JIBRI_CONF"
 sed -i "s|JibriBrewery|$JibriBrewery|g" "$JIBRI_CONF"
 sed -i "s|JB_AUTH_PASS|$JB_AUTH_PASS|g" "$JIBRI_CONF"
 sed -i "s|JB_REC_PASS|$JB_REC_PASS|g" "$JIBRI_CONF"
@@ -363,7 +364,7 @@ echo -e "\n---- We'll connect to main server ----"
 read -n 1 -s -r -p "Press any key to continue..."$'\n'
 sudo su "$NJN_USER" -c "ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -o -a 200 -q -N ''"
 
-install -m 0600 -o jibri /home/"$NJN_USER"/.ssh/id_rsa /home/jibri/jbsync.pem
+install -m 0600 -o jibri /home/"$NJN_USER"/.ssh/id_ed25519 /home/jibri/jbsync.pem
 sudo su jibri -c "install -D /dev/null /home/jibri/.ssh/known_hosts"
 sudo su jibri -c "ssh-keyscan -t rsa $MAIN_SRV_DOMAIN >> /home/jibri/.ssh/known_hosts"
 sudo su jibri -c "ssh-keyscan -t ed25519 $MAIN_SRV_DOMAIN >> /home/jibri/.ssh/known_hosts"
@@ -371,7 +372,10 @@ sudo su jibri -c "ssh-keyscan -t ed25519 $MAIN_SRV_DOMAIN >> /home/jibri/.ssh/kn
 echo -e "\n\n##################\nRemote pass: $MJS_USER_PASS\n################## \n\n"
 ssh-keyscan -t rsa "$MAIN_SRV_DOMAIN" >> ~/.ssh/known_hosts
 ssh-keyscan -t ed25519 "$MAIN_SRV_DOMAIN" >> ~/.ssh/known_hosts
-ssh "$MJS_USER"@"$MAIN_SRV_DOMAIN" sh -c "'cat >> .ssh/authorized_keys'" < /home/"$NJN_USER"/.ssh/id_rsa.pub
+[ -f /home/"$NJN_USER"/.ssh/id_rsa.pub ] && \
+    ssh "$MJS_USER"@"$MAIN_SRV_DOMAIN" sh -c "'cat >> .ssh/authorized_keys'" < /home/"$NJN_USER"/.ssh/id_rsa.pub
+[ -f /home/"$NJN_USER"/.ssh/id_ed25519.pub ] && \
+    ssh "$MJS_USER"@"$MAIN_SRV_DOMAIN" sh -c "'cat >> .ssh/authorized_keys'" < /home/"$NJN_USER"/.ssh/id_ed25519.pub
 sudo su "$NJN_USER" -c "ssh-keyscan -t rsa $MAIN_SRV_DOMAIN >> /home/$NJN_USER/.ssh/known_hosts"
 
 echo -e "\n---- Setup Log system ----"