diff --git a/Dockerfile b/Dockerfile
index ea19bb8..54684bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ FROM node:22-slim
 # Update everything and install needed dependencies
 RUN apt-get update -y && \
     apt-get upgrade -y && \
-    apt-get install -y -q graphicsmagick tzdata build-dependencies python build-base ca-certificates && \
-    useradd -r -U -d /opt/captica/${NAME_APPLICATION} -c "captica Service User" -m captica
+    apt-get install -y -q graphicsmagick tzdata python3 ca-certificates build-essential && \
+    useradd -r -U -M -c "captica Service User" -m captica
 
 # # Set a custom user to not have n8n run as root
 USER captica
@@ -16,9 +16,7 @@ USER captica
 RUN N8N_VERSION=$(curl -s https://api.github.com/repos/n8n-io/n8n/releases/latest | jq -r '.tag_name' | sed 's/^v//') && \
     echo "Latest n8n version: ${N8N_VERSION}" && \
     npm_config_user=root npm install -g {N8N_VERSION} && \
-    apt-get remove build-dependencies build-base && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
+    apt-get clean all
 
 
 WORKDIR /data