diff --git a/Makefile b/Makefile
index df6f090..51397ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,19 @@
 all: build run
 
+clean: kill remove
+
 build:
 	sudo docker build -t adg-fe container
 
-run:
-	sudo docker run -p 80:80 -p 8000:8000 -v ${PWD}:/opt/adagios-frontend -d -t adg-fe bash
+interactive:
+	sudo docker run -p 80:80 -p 8000:8000 -v ${PWD}:/opt/adagios-frontend -i -t --name adg-fe adg-fe bash
+
+daemon:
+	sudo docker run -p 80:80 -p 8000:8000 -v ${PWD}:/opt/adagios-frontend -d -t --name adg-fe adg-fe
+
+kill:
+	sudo docker kill adg-fe
+
+remove:
+	sudo docker rm adg-fe
+
diff --git a/container/Dockerfile b/container/Dockerfile
index 70a02e3..006fef1 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -2,8 +2,9 @@ FROM ubuntu:trusty
 MAINTAINER Philippe Pepos Petitclerc <philippe.pepos-petitclerc@savoirfairelinux.com>
 
 RUN apt-get update
-RUN apt-get install -yq apache2 npm nodejs-legacy supervisor
+RUN apt-get install -yq apache2 npm nodejs-legacy supervisor ruby
 RUN npm install -g grunt-cli
+RUN gem install sass
 RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor
 
 # Add supervisor config files
diff --git a/container/supervisord.conf b/container/supervisord.conf
index 26d6bd0..c7f806d 100644
--- a/container/supervisord.conf
+++ b/container/supervisord.conf
@@ -8,5 +8,5 @@ command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFO
 command=/bin/bash -c "cd /opt/adagios-frontend && npm start"
 
 [program:grunt]
-command=/bin/bash -c "cd /opt/adagios-frontend && grunt"
+command=/bin/bash -c "cd /opt/adagios-frontend && grunt sass && grunt"