diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index f05232d9..f9bfc1ba 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -5,9 +5,13 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ADD nginx.conf /etc/nginx/
 ADD laravel.conf /etc/nginx/conf.d/laravel.conf
 
-ARG PHP_UPSTREAM
+ARG PHP_UPSTREAM=php-fpm
 
-RUN rm /etc/nginx/conf.d/default.conf \
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache bash \
+    && adduser -D -H -u 1000 -s /bin/bash www-data \
+    && rm /etc/nginx/conf.d/default.conf \
     && echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 CMD ["nginx"]
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index a05c8385..1b566087 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,3 +1,4 @@
+user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
 daemon off;
@@ -18,8 +19,8 @@ http {
   client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log on;
-  error_log on;
+  access_log /dev/stdout;
+  error_log /dev/stderr;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;