diff --git a/Docker/.dockerignore b/Docker/.dockerignore
new file mode 100644
index 000000000..5171c5408
--- /dev/null
+++ b/Docker/.dockerignore
@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
\ No newline at end of file
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index ee38a11a6..9aa55cfaf 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,25 +1,14 @@
-FROM python:3-slim
-ENV NODE_VERSION=node_16.x
-ENV PYTHONUNBUFFERED 1
-RUN apt-get update \
-    && apt-get install -y curl gnupg lsb-release build-essential \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-    && DISTRO="$(lsb_release -s -c)" \
-    && echo "deb https://deb.nodesource.com/$NODE_VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list \
-    && echo "deb-src https://deb.nodesource.com/$NODE_VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list \
-    && apt-get update \
-    && apt-get install -y nodejs \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+FROM node:current-alpine
 WORKDIR /app
-COPY . .
-RUN mkdir -p Data-Storage Log-Files My-Workspaces \
-    && groupadd superalgos \
-    && useradd --no-log-init -m -g superalgos superalgos \
+COPY package*.json ./
+RUN npm install && mkdir -p Data-Storage Log-Files My-Workspaces \
+    && addgroup -S superalgos \
+    && adduser -S superalgos -G superalgos \
     && chown -R superalgos:superalgos /app
 USER superalgos
+COPY . .
 RUN node setup noShortcuts
 EXPOSE 34248
 EXPOSE 18041
 VOLUME ["/app/Data-Storage", "/app/Log-Files", "/app/My-Workspaces"]
-ENTRYPOINT ["node", "platform", "noBrowser"]
+ENTRYPOINT ["node", "platform", "noBrowser"]
\ No newline at end of file
diff --git a/Docker/Dockerfile_old b/Docker/Dockerfile_old
new file mode 100644
index 000000000..ee38a11a6
--- /dev/null
+++ b/Docker/Dockerfile_old
@@ -0,0 +1,25 @@
+FROM python:3-slim
+ENV NODE_VERSION=node_16.x
+ENV PYTHONUNBUFFERED 1
+RUN apt-get update \
+    && apt-get install -y curl gnupg lsb-release build-essential \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+    && DISTRO="$(lsb_release -s -c)" \
+    && echo "deb https://deb.nodesource.com/$NODE_VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb-src https://deb.nodesource.com/$NODE_VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install -y nodejs \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+WORKDIR /app
+COPY . .
+RUN mkdir -p Data-Storage Log-Files My-Workspaces \
+    && groupadd superalgos \
+    && useradd --no-log-init -m -g superalgos superalgos \
+    && chown -R superalgos:superalgos /app
+USER superalgos
+RUN node setup noShortcuts
+EXPOSE 34248
+EXPOSE 18041
+VOLUME ["/app/Data-Storage", "/app/Log-Files", "/app/My-Workspaces"]
+ENTRYPOINT ["node", "platform", "noBrowser"]