diff --git a/Dockerfile b/Dockerfile
index 3dc9d78..adc1084 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,4 +19,7 @@ ADD . /code/
 RUN apt-get update && apt-get install -y sox lame vim ccze \
     libboost-program-options-dev libsox-fmt-mp3 postgresql-client rsync openssh-client
 
-RUN pip install -r requirements.txt
\ No newline at end of file
+RUN pip install -r requirements.txt
+
+RUN adduser --disabled-password --gecos '' djworker
+RUN chown djworker /files -R
\ No newline at end of file
diff --git a/run_celery.sh b/run_celery.sh
index 39d76db..fe41a9e 100755
--- a/run_celery.sh
+++ b/run_celery.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python manage.py celeryd
\ No newline at end of file
+su -m djworker -c "python manage.py celeryd"
\ No newline at end of file