diff --git a/services/node-agent/Dockerfile b/services/node-agent/Dockerfile
index efce50d..1ad0b40 100644
--- a/services/node-agent/Dockerfile
+++ b/services/node-agent/Dockerfile
@@ -14,8 +14,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # pyyaml      : may be needed for reading host config snippets
 RUN pip install --no-cache-dir "docker>=6.0" psutil pyyaml
 
+RUN useradd -m -u 1000 homelab
+
 COPY src/ /app/src/
 
 ENV PYTHONUNBUFFERED=1
 
+USER homelab
 CMD ["python", "src/node_agent.py"]
diff --git a/services/node-agent/docker-compose.yml b/services/node-agent/docker-compose.yml
index 0303987..083037e 100644
--- a/services/node-agent/docker-compose.yml
+++ b/services/node-agent/docker-compose.yml
@@ -2,6 +2,9 @@ services:
   node-agent:
     build: .
     container_name: node-agent
+    user: "1000:1000"
+    group_add:
+      - "999"
     restart: unless-stopped
 
     environment: