diff --git a/Dockerfile b/Dockerfile
index a9ee948..57e06d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
 FROM node:22.17.0
 LABEL author="internxt"
 
-RUN groupadd -r nodeuser && useradd -r -g nodeuser nodeuser
-USER nodeuser
+ENV YARN_CACHE_FOLDER=/usr/app/.yarn-cache
+ENV YARN_GLOBAL_FOLDER=/usr/app/.yarn-global
+
+USER 1234:1234
 
 WORKDIR /usr/app
 
@@ -10,8 +12,8 @@ COPY package.json ./
 COPY yarn.lock ./
 
 RUN yarn
-COPY --chown=nodeuser:nodeuser . ./
+COPY --chown=1234:1234 . ./
 
 RUN yarn build
 
-CMD yarn start:prod
+CMD ["sh", "-c", "yarn start:prod"]
diff --git a/development.Dockerfile b/development.Dockerfile
index 7ffb535..7584ff3 100644
--- a/development.Dockerfile
+++ b/development.Dockerfile
@@ -1,17 +1,20 @@
 FROM node:22.17.0
 
-RUN groupadd -r nodeuser && useradd -r -g nodeuser nodeuser
-USER nodeuser
+ENV YARN_CACHE_FOLDER=/usr/app/.yarn-cache
+ENV YARN_GLOBAL_FOLDER=/usr/app/.yarn-global
+
+USER 1234:1234
+
 WORKDIR /usr/app
 
 COPY package.json ./
 COPY yarn.lock ./
 
 RUN yarn
-COPY --chown=nodeuser:nodeuser . ./
+COPY --chown=1234:1234 . ./
 
 RUN rm -rf dist && yarn build
 
-CMD yarn migrate && yarn start:dev
+CMD ["sh", "-c", "yarn migrate && yarn start:dev"]
 
 EXPOSE 3006