diff --git a/services/stability-agent/Dockerfile b/services/stability-agent/Dockerfile
index 403964d..9bc2859 100644
--- a/services/stability-agent/Dockerfile
+++ b/services/stability-agent/Dockerfile
@@ -5,6 +5,8 @@ WORKDIR /app
 # No extra dependencies needed beyond standard library for the current script
 # But we might need them if we decide to use libraries later.
 
+RUN useradd -m -u 1000 homelab
+
 COPY src/stability_agent.py .
 COPY healthcheck.sh .
 RUN chmod +x healthcheck.sh
@@ -12,5 +14,5 @@ RUN chmod +x healthcheck.sh
 # Create the expected directories
 RUN mkdir -p /opt/homelab/state /opt/homelab/events
 
-# Run the agent
+USER homelab
 CMD ["python", "stability_agent.py"]
diff --git a/services/stability-agent/docker-compose.yml b/services/stability-agent/docker-compose.yml
index 4a09e98..086307c 100644
--- a/services/stability-agent/docker-compose.yml
+++ b/services/stability-agent/docker-compose.yml
@@ -2,6 +2,9 @@ services:
   stability-agent:
     build: .
     container_name: stability-agent
+    user: "1000:1000"
+    group_add:
+      - "999"
     restart: unless-stopped
     volumes:
       - /opt/homelab:/opt/homelab