diff --git a/.dockerignore b/.dockerignore
index dd1653a9b..33b0bee30 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,7 @@
 src/node_modules
+src/.npm
+src/_tmp
+src/.cache
+src/.config
 **/.next
 _data
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 2409eec62..8aefbcda3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+#FROM node:lts-alpine3.17
 FROM node:16.14.2-alpine3.15
 
 ARG APP_VERSION
@@ -7,19 +8,21 @@ ARG APP_REVISION
 ENV NEXT_PUBLIC_APP_REVISION=${APP_REVISION}
 
 RUN apk add curl jq
-RUN npm install -g npm@7.11.2
 
+USER node
 WORKDIR /app
 
-COPY src/*.json ./
-RUN npm install
+COPY --chown=node src/*.json ./
+RUN npm install --legacy-peer-deps
 
-COPY src ./
+COPY --chown=node src ./
 
 ARG GITHUB_API_TOKEN
 ENV COOKIE_SECRET=change_me
 
 RUN npm run build
 
+ENV HOME=/home/node
+
 ENTRYPOINT [ "npm", "run" ]
 CMD [ "start"]
diff --git a/e2e/Dockerfile b/e2e/Dockerfile
index b253160d1..70df0662a 100644
--- a/e2e/Dockerfile
+++ b/e2e/Dockerfile
@@ -1,4 +1,4 @@
-FROM cypress/included:12.4.0
+FROM cypress/included:12.17.4
 
 WORKDIR /e2e
 
diff --git a/feeds/Dockerfile b/feeds/Dockerfile
index d1a9ae5f8..20cf0b6f7 100644
--- a/feeds/Dockerfile
+++ b/feeds/Dockerfile
@@ -1,4 +1,6 @@
-FROM node:16.14.2-alpine3.15
+FROM node:lts-alpine3.17
+
+RUN apk add curl jq
 
 ARG APP_VERSION
 ENV APP_VERSION=${APP_VERSION}
@@ -6,12 +8,15 @@ ENV APP_VERSION=${APP_VERSION}
 ARG APP_REVISION
 ENV APP_REVISION=${APP_REVISION}
 
+USER node
 WORKDIR /app
 
-COPY package*.json ./
+COPY --chown=node package*.json ./
 RUN npm install
 
-COPY . ./
+COPY --chown=node . ./
+
+ENV HOME=/home/node
 
 ENTRYPOINT [ "npm", "run" ]
 CMD [ "start"]
diff --git a/local/portal/Dockerfile.E2E b/local/portal/Dockerfile.E2E
index f62702582..ea1fdde22 100644
--- a/local/portal/Dockerfile.E2E
+++ b/local/portal/Dockerfile.E2E
@@ -1,3 +1,4 @@
+#FROM node:lts-alpine3.18
 FROM node:16.14.2-alpine3.15
 
 ARG APP_VERSION
@@ -7,17 +8,17 @@ ARG APP_REVISION
 ENV APP_REVISION=${APP_REVISION}
 
 RUN apk add curl jq
-RUN npm install -g npm@7.11.2
 
+USER node
 WORKDIR /app
 
-COPY src/*.json ./
+COPY --chown=node src/*.json ./
 
-COPY src/nyc-config.js ./
+COPY --chown=node src/nyc-config.js ./
 
-RUN npm install
+RUN npm install --legacy-peer-deps
 
-COPY src ./
+COPY --chown=node src ./
 
 RUN npx nyc instrument --compact=false nextapp --in-place
 
@@ -26,5 +27,7 @@ ENV COOKIE_SECRET=change_me
 
 RUN npm run build
 
+ENV HOME=/home/node
+
 ENTRYPOINT [ "npm", "run" ]
 CMD [ "start"]