diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 003289b..2d09494 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,6 +9,7 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in
   - [Developer contributions guide](#developer-contributions-guide)
     - [How TermSCP works](#how-termscp-works)
       - [Activities](#activities)
+    - [Tests fails due to receivers](#tests-fails-due-to-receivers)
     - [Implementing File Transfers](#implementing-file-transfers)
 
 ---
@@ -65,6 +66,12 @@ This trait provides only 3 methods:
 
 ---
 
+### Tests fails due to receivers
+
+Yes. This happens quite often and is related to the fact that I'm using public SSH/SFTP/FTP server to test file receivers and sometimes this server go down for even a day or more. If your tests don't pass due to this, don't worry, submit the pull request and I'll take care of testing them by myself.
+
+---
+
 ### Implementing File Transfers
 
 This chapter describes how to implement a file transfer in TermSCP. A file transfer is a module which implements the `FileTransfer` trait. The file transfer provides different modules to interact with a remote server, which in addition to the most obvious methods, used to download and upload files, provides also methods to list files, delete files, create directories etc.
diff --git a/dist/build/deploy.sh b/dist/build/deploy.sh
index 010268f..2732abe 100755
--- a/dist/build/deploy.sh
+++ b/dist/build/deploy.sh
@@ -7,6 +7,8 @@ fi
 
 VERSION=$1
 
+set -e # Don't fail
+
 # Create pkgs directory
 cd ..
 PKGS_DIR=$(pwd)/pkgs
@@ -27,16 +29,19 @@ mkdir -p ${PKGS_DIR}/rpm/
 CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 termscp-${VERSION}-x86_64_centos7)
 docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.x86_64.rpm ${PKGS_DIR}/rpm/
 # Build x86_64_archlinux
-cd x86_64_archlinux/
-docker build --tag termscp-${VERSION}-x86_64_archlinux .
-# Create container and get AUR pkg
-cd -
-mkdir -p ${PKGS_DIR}/arch/
-CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_archlinux termscp-${VERSION}-x86_64_archlinux)
-docker cp ${CONTAINER_NAME}:/usr/src/termscp/termscp-${VERSION}-x86_64.tar.gz ${PKGS_DIR}/arch/
-docker cp ${CONTAINER_NAME}:/usr/src/termscp/PKGBUILD ${PKGS_DIR}/arch/
-docker cp ${CONTAINER_NAME}:/usr/src/termscp/.SRCINFO ${PKGS_DIR}/arch/
-# Replace termscp-bin with termscp in PKGBUILD
-sed -i 's/termscp-bin/termscp/g' ${PKGS_DIR}/arch/PKGBUILD
+
+##################### TEMP REMOVED  ###################################
+# cd x86_64_archlinux/
+# docker build --tag termscp-${VERSION}-x86_64_archlinux .
+# # Create container and get AUR pkg
+# cd -
+# mkdir -p ${PKGS_DIR}/arch/
+# CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_archlinux termscp-${VERSION}-x86_64_archlinux)
+# docker cp ${CONTAINER_NAME}:/usr/src/termscp/termscp-${VERSION}-x86_64.tar.gz ${PKGS_DIR}/arch/
+# docker cp ${CONTAINER_NAME}:/usr/src/termscp/PKGBUILD ${PKGS_DIR}/arch/
+# docker cp ${CONTAINER_NAME}:/usr/src/termscp/.SRCINFO ${PKGS_DIR}/arch/
+# # Replace termscp-bin with termscp in PKGBUILD
+# sed -i 's/termscp-bin/termscp/g' ${PKGS_DIR}/arch/PKGBUILD
+##################### TEMP REMOVED  ###################################
 
 exit $?
diff --git a/dist/build/x86_64_archlinux/Dockerfile b/dist/build/x86_64_archlinux/Dockerfile
index ff2bf27..ded6c9b 100644
--- a/dist/build/x86_64_archlinux/Dockerfile
+++ b/dist/build/x86_64_archlinux/Dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux/archlinux:base-20210110.0.13332 as builder
+FROM archlinux:base-20210120.0.13969 as builder
 
 WORKDIR /usr/src/
 # Install dependencies
@@ -8,15 +8,15 @@ RUN pacman -Syu --noconfirm \
     openssl \
     pkg-config \
     sudo
+# Install rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \
+    chmod +x /tmp/rust.sh && \
+    /tmp/rust.sh -y
 # Create build user
 RUN useradd build -m && \
     passwd -d build && \
     mkdir -p termscp && \
     chown -R build.build termscp/
-# Install rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust.sh && \
-    chmod +x ./rust.sh && \
-    ./rust.sh -y
 # Clone repository
 RUN git clone https://github.com/veeso/termscp.git
 # Set workdir to termscp