diff --git a/Dockerfile b/Dockerfile
index 4c85e24..f669e63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,9 @@ COPY ./src /srv/build
 
 WORKDIR /srv/build
 
+# Building node
+RUN ./build.npm.sh
+
 VOLUME ["/srv/build/repo/incoming"]
 
 ENTRYPOINT ["./main.sh"]
diff --git a/launch.sh b/launch.sh
index 4825919..0e0b554 100755
--- a/launch.sh
+++ b/launch.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-docker build -t vscodium .
-docker run --rm -v /srv/incoming:/srv/build/repo/incoming vscodium
-docker image rm vscodium
+#docker build -t vscodium .
+docker run -v /srv/incoming:/srv/build/repo/incoming vscodium
+#docker image rm vscodium
diff --git a/src/build.npm.sh b/src/build.npm.sh
index f766a20..48ecfe3 100755
--- a/src/build.npm.sh
+++ b/src/build.npm.sh
@@ -3,12 +3,12 @@
 set -e
 
 apt-get update
-apt-get -qq -y --no-install-recommends install curl jq ca-certificates git g++ gcc make clang wget xz-utils python sudo
+apt-get -qq -y --no-install-recommends install curl jq ca-certificates git g++ gcc make clang wget xz-utils python sudo python3-minimal python3-distutils
 mkdir build_node
 cd build_node/ || exit
-wget https://nodejs.org/dist/v12.14.1/node-v12.14.1.tar.xz
-tar xf node-v12.14.1.tar.xz
-mv node-v12.14.1 node
+wget https://nodejs.org/dist/v16.13.0/node-v16.13.0.tar.xz
+tar xf node-v16.13.0.tar.xz
+mv node-v16.13.0 node
 cd node || exit
 ./configure
 make -j4
diff --git a/src/build.sh b/src/build.sh
index d14e345..8cc0ff8 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -3,7 +3,7 @@
 set -e
 
 apt-get update
-apt-get -y --no-install-recommends install git jq imagemagick curl build-essential pkg-config libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm
+apt-get -y --no-install-recommends install git jq imagemagick curl build-essential pkg-config libx11-dev libxkbfile-dev libsecret-1-dev fakeroot file desktop-file-utils binutils
 
 npm install yarn --global
 
@@ -12,4 +12,8 @@ cd vscodium/ || exit
 
 sed '/create_appimage\.sh/d' -i build.sh
 
+export SHOULD_BUILD_DEB=yes
+export SHOULD_BUILD_RPM=no
+export SHOULD_BUILD_APPIMAGE=no
+
 ./build/build_linux.sh
diff --git a/src/install.npm.thirdparty.sh b/src/install.npm.thirdparty.sh
index 6135ade..82c4cf7 100755
--- a/src/install.npm.thirdparty.sh
+++ b/src/install.npm.thirdparty.sh
@@ -5,7 +5,7 @@ set -e
 apt-get update
 apt-get -qq -y --no-install-recommends install curl wget ca-certificates sudo
 
-curl -fsSL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
 
 apt-get -qq -y install nodejs
 
diff --git a/src/main.sh b/src/main.sh
index c9c028e..d2120f5 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -2,16 +2,22 @@
 
 set -e
 
-echo "Building node..."
-./build.npm.sh
-#./install.npm.thirdparty.sh
+#echo "Building node..."
+#./build.npm.sh
+#./install.npm.thirdparty.sh && sudo apt-get -qq -y --no-install-recommends install python
 
 echo "Building VSCodium..."
 ./build.sh
 
 echo "Package(s) deploy..."
-DIST_DIR="vscodium/.build/linux/deb/amd64/deb"
+DIST_DIR="vscode/.build/linux/deb/amd64/deb"
 INCOMING_DIR="repo/incoming"
 READY_SUFFIX=".ready"
 mkdir -p "${INCOMING_DIR}"
-./deploy.sh "${DIST_DIR}" "${INCOMING_DIR}" "${READY_SUFFIX}"
+tree > "${INCOMING_DIR}/tree.txt"
+if [ -d "${DIST_DIR}"" ]; then
+    ./deploy.sh "${DIST_DIR}" "${INCOMING_DIR}" "${READY_SUFFIX}"
+else
+    printf "%s" "No dist dir found! Aborting..."
+    exit 1
+fi