diff --git a/.dockerignore b/.dockerignore
index 188e95609..3995ec071 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,13 +5,14 @@ debug.log
 
 *.db
 
-.vscode
 README.md
 LICENSE
 CONTRIBUTING.md
 CODE_OF_CONDUCT.md
-*/**/.vscode
-*/**/Dockerfile
-*/**/docker-compose.yml
-*/**/node_modules
-.env
+.git*
+.docker*
+**/.vscode
+**/Dockerfile*
+**/docker-compose.yml
+**/node_modules
+**/.env*
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 18dadad45..8779f3a56 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,20 +1,12 @@
-FROM node:16-alpine as BASE
-
-FROM BASE as BUILDER
-RUN apk add --no-cache python3 make g++ curl \
-    && curl -sf https://gobinaries.com/tj/node-prune | sh
-WORKDIR /app
-COPY ./package.json /app/package.json
-COPY ./package-lock.json /app/package-lock.json
-RUN npm ci --only=production && node-prune
-
-FROM BASE
+FROM node:16-alpine
 WORKDIR /app
 COPY . .
-COPY --from=BUILDER /app/node_modules /app/node_modules
-RUN mkdir -p Data-Storage Log-Files My-Workspaces \
-    && addgroup superalgos \
-    && adduser --disabled-password --no-create-home --home /app --ingroup superalgos superalgos \
+RUN apk add --no-cache --virtual .build-deps make g++ \
+    && apk add --no-cache python3 \
+    && if [ "$(uname -m)" = "x86_64" ]; then node setup noShortcuts tensorflow; else node setup noShortcuts; fi \
+    && mkdir -p Data-Storage Log-Files My-Workspaces \
+    && addgroup -S superalgos \
+    && adduser -S superalgos -G superalgos \
     && chown -R superalgos:superalgos /app
 USER superalgos
 EXPOSE 34248