diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 5dec1310..f9bfc1ba 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,15 +1,18 @@
-FROM nginx:latest
+FROM nginx:alpine
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 ADD nginx.conf /etc/nginx/
-ADD laravel.conf /etc/nginx/sites-available/
+ADD laravel.conf /etc/nginx/conf.d/laravel.conf
 
-ARG PHP_UPSTREAM
+ARG PHP_UPSTREAM=php-fpm
 
-RUN echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
-
-RUN usermod -u 1000 www-data
+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 3e8dadde..cc7fa68e 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,6 +1,7 @@
 user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
+daemon off;
 
 events {
   worker_connections  2048;
@@ -18,13 +19,10 @@ http {
   client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log on;
-  error_log on;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;
-  include /etc/nginx/sites-available/*;
   open_file_cache max=100;
 }
-
-daemon off;