diff --git a/.dockerfile b/.dockerfile
index 04a1336..b3ab84d 100644
--- a/.dockerfile
+++ b/.dockerfile
@@ -3,12 +3,6 @@ FROM python:3.6
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
-COPY package.json /usr/src/app/
-RUN npm install
-RUN npm install -g bower
-COPY bower.json /usr/src/app/
-RUN bower install
-
 COPY requirements.txt /usr/src/app/
 RUN pip install --no-cache-dir -r requirements.txt
 
diff --git a/.dockerfile-frontend b/.dockerfile-frontend
new file mode 100644
index 0000000..9f3584b
--- /dev/null
+++ b/.dockerfile-frontend
@@ -0,0 +1,13 @@
+FROM node:6 
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+RUN echo '{ "allow_root": true }' > /root/.bowerrc
+
+COPY package.json /usr/src/app/
+RUN npm install
+RUN npm install -g bower
+COPY bower.json /usr/src/app/
+RUN bower install
+
diff --git a/docker-compose.yml b/docker-compose.yml
index bcbac8a..bb2e881 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ web:
   volumes:
     - ./:/usr/src/app
   links:
+   - frontend
    - postgres
    - elasticsearch
   ports:
@@ -15,6 +16,12 @@ web:
     - DATABASE_URL=postgres://postgres:@postgres:5432/postgres
     - ELASTICSEARCH_URL=http://elasticsearch:9200
     - SECRET_KEY=notasecretreplaceme
+frontend:
+  build: .
+  dockerfile: .dockerfile-frontend
+  volumes:
+    - ./:/usr/src/app
+  working_dir: /usr/src/app
 postgres:
   image: postgres
   ports: