diff --git a/.gitignore b/.gitignore
index 3633aee..86cd900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+/static/
+!/static/.gitkeep
+
 ### OSX ###
 .DS_Store
 .AppleDouble
diff --git a/Dockerfile b/Dockerfile
index 6ea5f86..a5cc7e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ FROM alpine:3.8
 
 MAINTAINER Claudio Maggioni (praticamentetilde)
 
-RUN addgroup -S app && adduser -S -G app app 
+RUN addgroup -S app && adduser -S -G app app
 
 # Install required packages and remove the apt packages cache when done
 RUN apk update && apk add \
@@ -26,7 +26,7 @@ RUN apk update && apk add \
         uwsgi-python3 \
 	git \
 	python3 \
-	python3-dev 
+	python3-dev
 
 # COPY requirements.txt and RUN pip install BEFORE adding the rest of your
 # code, this will cause Docker's caching mechanism to prevent re-installing
@@ -40,6 +40,8 @@ COPY . /home/app/code/
 
 RUN chown -R app: /home/app
 
+RUN /home/app/code/manage.py collectstatic
+
 EXPOSE 8000
 CMD ["/usr/sbin/uwsgi", "--ini", "/home/app/code/uwsgi.ini", "--plugin", "python3"]
 USER app
diff --git a/arrowcounter/settings.py b/arrowcounter/settings.py
index e0dff80..c134c24 100644
--- a/arrowcounter/settings.py
+++ b/arrowcounter/settings.py
@@ -37,6 +37,8 @@ LOGOUT_REDIRECT_URL = "/"
 
 ITEMS_PER_PAGE = 30
 
+STATIC_ROOT = "static/"
+
 # Application definition
 
 INSTALLED_APPS = [