diff --git a/Dockerfile b/Dockerfile
index 9880dc4ef..dd10fd94b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,53 +1,26 @@
-FROM ubuntu:15.04
+FROM alpine:3.5
 
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \
+python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev nodejs py3-lxml \
+py3-magic
 
-RUN mkdir /sapl
+RUN apk add --no-cache python3 && \
+    python3 -m ensurepip && \
+    rm -r /usr/lib/python*/ensurepip && \
+    pip3 install --upgrade pip setuptools && \
+    rm -r /root/.cache
 
-RUN echo "deb http://archive.ubuntu.com/ubuntu/ vivid universe" | tee -a "/etc/apt/sources.list"
-
-RUN \
-	apt-get update && \
-	apt-get install -y -f \
-	software-properties-common \
-	libpq-dev \
-	graphviz-dev \
-	graphviz \
-	build-essential \
-	git \
-	pkg-config \
-	python3-dev \
-	libxml2-dev \
-	libjpeg-dev \
-	libssl-dev \
-	libffi-dev \
-	libxslt1-dev \
-	python3-setuptools \
-	curl
-
-# use python3 in pip
-RUN easy_install3 pip lxml
-
-# install nodejs
-RUN DEBIAN_FRONTEND=noninteractive curl -sL https://deb.nodesource.com/setup_5.x | bash -
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
-
-# install bower
-RUN npm install -g bower
+RUN mkdir /sapl && apk add --update --no-cache $BUILD_PACKAGES && npm install -g bower
 
 # Bower aceitar root
-RUN touch /root/.bowerrc
-RUN chmod 751 /root/.bowerrc
-RUN echo "{ \"allow_root\": true }" >> /root/.bowerrc
+RUN touch /root/.bowerrc \
+&& chmod 751 /root/.bowerrc \
+&& echo "{ \"allow_root\": true }" >> /root/.bowerrc \
+&& npm cache clean
 
 WORKDIR /sapl
 
 ADD . /sapl
 
-RUN pip install -r requirements/dev-requirements.txt
-RUN pip install --upgrade setuptools
-
-# RUN python3 manage.py bower install
+RUN pip install -r requirements/dev-requirements.txt --upgrade setuptools --no-cache-dir \
+&& python3 manage.py bower install
diff --git a/config/nginx/sapl.conf b/config/nginx/sapl.conf
new file mode 100644
index 000000000..513188ed9
--- /dev/null
+++ b/config/nginx/sapl.conf
@@ -0,0 +1,39 @@
+upstream sapl_server {
+
+  server unix:/sapl/run/gunicorn.sock fail_timeout=0;
+
+}
+
+server {
+
+    listen   80;
+    server_name sapl.test;
+
+    client_max_body_size 4G;
+
+    location /static/ {
+        alias  /sapl/collected_static/;
+    }
+
+    location /media/ {
+        alias  /sapl/media/;
+    }
+
+    location / {
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_set_header Host $http_host;
+
+        proxy_redirect off;
+
+
+        if (!-f $request_filename) {
+            proxy_pass http://sapl_server;
+            break;
+        }
+    }
+    error_page 500 502 503 504 /500.html;
+    location = /500.html {
+        root /sapl/sapl/static/;
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 06c9d2cec..96f2f4408 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,13 @@
+server:
+  image: nginx:latest
+  ports:
+    - "80:80"
+  volumes:
+    - ./config/nginx:/etc/nginx/conf.d
+  volumes_from:
+    - web
+  links:
+    - web
 localhost:
   image: postgres
   environment:
@@ -8,10 +18,8 @@ localhost:
     - "5532:5432"
 web:
   build: .
-  command: bash -c "python3 manage.py bower install && python3 manage.py migrate && python3 manage.py runserver 0.0.0.0:8000"
+  command: /bin/sh -c "python3 manage.py bower install && python3 manage.py migrate && /bin/sh gunicorn_start.sh"
   volumes:
     - .:/sapl
-  ports:
-    - "8000:8000"
   links:
     - localhost
diff --git a/gunicorn_start.sh b/gunicorn_start.sh
index 904d76a3a..34ec58b7d 100755
--- a/gunicorn_start.sh
+++ b/gunicorn_start.sh
@@ -3,23 +3,17 @@
 # As seen in http://tutos.readthedocs.org/en/latest/source/ndg.html
 
 NAME="SAPL"                                     # Name of the application (*)
-DJANGODIR=/var/interlegis/sapl                     # Django project directory (*)
-SOCKFILE=/var/interlegis/sapl/run/gunicorn.sock    # we will communicate using this unix socket (*)
+DJANGODIR=/sapl/                    # Django project directory (*)
+SOCKFILE=/sapl/run/gunicorn.sock    # we will communicate using this unix socket (*)
 USER=`whoami`                                   # the user to run as (*)
 GROUP=`whoami`                                  # the group to run as (*)
-NUM_WORKERS=9                                   # how many worker processes should Gunicorn spawn (*)
+NUM_WORKERS=3                                   # how many worker processes should Gunicorn spawn (*)
                                                 # NUM_WORKERS = 2 * CPUS + 1
 DJANGO_SETTINGS_MODULE=sapl.settings            # which settings file should Django use (*)
 DJANGO_WSGI_MODULE=sapl.wsgi                    # WSGI module name (*)
 
 echo "Starting $NAME as `whoami`"
 
-# Activate the virtual environment
-cd $DJANGODIR
-source /var/interlegis/.virtualenvs/sapl/bin/activate
-export DJANGO_SETTINGS_MODULE=$DJANGO_SETTINGS_MODULE
-export PYTHONPATH=$DJANGODIR:$PYTHONPATH
-
 # Create the run directory if it doesn't exist
 RUNDIR=$(dirname $SOCKFILE)
 test -d $RUNDIR || mkdir -p $RUNDIR
@@ -31,3 +25,5 @@ exec gunicorn ${DJANGO_WSGI_MODULE}:application \
   --workers $NUM_WORKERS \
   --user $USER \
   --bind=unix:$SOCKFILE
+
+exec server nginx start
diff --git a/scripts_docker/shell_sapl.sh b/scripts_docker/shell_sapl.sh
index cfddefcdc..4c993a61d 100755
--- a/scripts_docker/shell_sapl.sh
+++ b/scripts_docker/shell_sapl.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-docker run -ti sapl_web /bin/bash
+
+docker run --rm -ti sapl_web /bin/sh