diff --git a/src/freedombone-app-peertube b/src/freedombone-app-peertube
index e31d5268..f892e08a 100755
--- a/src/freedombone-app-peertube
+++ b/src/freedombone-app-peertube
@@ -616,6 +616,8 @@ function mesh_install_peertube {
     fi
 
     chroot "$rootdir" apt-get -yq install ffmpeg
+    chroot "$rootdir" apt-get -yq install -y gcc-multilib
+    chroot "$rootdir" apt-get -yq install -y g++-multilib
 
     function_check install_postgresql
     install_postgresql
@@ -642,28 +644,18 @@ if [ ! "$?" = "0" ]; then
     echo $'PeerTube Failed to install yarn'
     exit 79353234
 fi
-npm install --arch=$NPM_ARCH bcrypt@1.0.3 --build-from-source
-if [ ! "$?" = "0" ]; then
-    echo $'PeerTube failed to build bcrypt'
-    exit 73563543
-fi
-npm install --arch=$NPM_ARCH fsevents@1.1.3 --build-from-source
-if [ ! "$?" = "0" ]; then
-    echo $'PeerTube failed to build fsevents'
-    exit 2846393
-fi
 yarn add -D webpack --network-concurrency 1
-yarn install
+yarn install --ignore-optional
 if [ ! "$?" = "0" ]; then
     echo $'PeerTube failed to run yarn install'
     exit 63754235
 fi
-npm install --arch=$NPM_ARCH
+npm install --arch=$NPM_ARCH --no-optional
 if [ ! "$?" = "0" ]; then
     echo $'PeerTube failed to install peertube'
     exit 7835243
 fi
-npm run build --arch=$NPM_ARCH
+npm run build --arch=$NPM_ARCH --no-optional
 if [ ! "$?" = "0" ]; then
     echo $'PeerTube failed to build peertube'
     exit 5293593