diff --git a/Dockerfile b/Dockerfile
index e7eb6e334..c2488dc4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM node:17.8-alpine3.15
+FROM node:22-alpine
 
 EXPOSE 8061
 
 WORKDIR /iframely
 
 # Create new non-root user
-RUN addgroup -S iframelygroup && adduser -S iframely -G iframelygroup
+RUN addgroup --system iframelygroup && adduser --system iframely -G iframelygroup
 RUN apk add g++ make python3
 
 # This will change the config to `config.<VALUE>.js` and the express server to change its behaviour.
diff --git a/Makefile b/Makefile
index a755791da..f1b991a40 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ PUBLISHPORT := ${EXPOSEPORT}
 
 build:
 	git checkout main 
-	git pull --rebase upstream main
 	git branch -f tag-${VERSION}
 	git checkout tag-${VERSION}
 	docker \