diff --git a/Dockerfile b/Dockerfile
index 01d6b5e..72883b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,4 +9,12 @@ COPY . /app
 RUN pip install /app
 WORKDIR /app
 
+# Create a default user and home directory
+ENV HOME=/home/calrissian
+RUN useradd -u 1001 -r -g 0 -m -d ${HOME} -s /sbin/nologin \
+      -c "Default Calrissian User" calrissian && \
+  chown -R 1001:0 /app && \
+  chmod g+rwx ${HOME}
+
+USER calrissian
 CMD ["calrissian"]