diff --git a/.travis.yml b/.travis.yml
index bf15e5f7..72c39650 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: python
+  
 python:
   - "2.7"
+
 env:
   - DOCKER_COMPOSE_VERSION: 1.8.0
 
diff --git a/Dockerfile b/Dockerfile
index 4bdf8885..a212e88e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ FROM ubuntu:16.04
 MAINTAINER frappé
 
 USER root
+RUN useradd -ms /bin/bash frappe
 RUN apt-get update
 RUN apt-get install -y iputils-ping
 RUN apt-get install -y git build-essential python-setuptools python-dev libffi-dev libssl-dev
@@ -13,7 +14,6 @@ RUN apt-get install -y libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev lib
 RUN apt-get install -y wget
 RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py
 RUN pip install --upgrade setuptools pip
-RUN useradd -ms /bin/bash frappe
 RUN apt-get install -y curl
 RUN apt-get install -y rlwrap
 RUN apt-get install redis-tools
@@ -28,17 +28,15 @@ RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1no
  && dpkg -i node.deb \
  && rm node.deb
 RUN apt-get install -y wkhtmltopdf
-
-USER frappe
-WORKDIR /home/frappe
-RUN git clone -b master https://github.com/frappe/bench.git bench-repo
-
-USER root
-RUN pip install -e bench-repo
 RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common
 RUN npm install -g yarn
 RUN chown -R frappe:frappe /home/frappe/*
 ENV PATH /home/frappe/.local/bin
 
+
 USER frappe
-WORKDIR /home/frappe/frappe-bench
+WORKDIR /home/frappe/
+RUN git clone https://github.com/frappe/bench.git bench-repo
+RUN pip install --user -e bench-repo
+ENV PATH /home/frappe/.local/bin:$PATH
+WORKDIR /home/frappe/
diff --git a/README.md b/README.md
index 6308622c..914b63ad 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # frappe_docker
-[![Build Status](https://travis-ci.org/frappe/frappe_docker.svg?branch=master)](https://travis-ci.org/frappe/frappe_docker)
+[![Build Status](https://travis-ci.org/chabad360/frappe_docker.svg?branch=master)](https://travis-ci.org/frappe/frappe_docker)
 
 - [Docker](https://docker.com/) is an open source project to pack, ship and run any Linux application in a lighter weight, faster container than a traditional virtual machine.
 
diff --git a/frappe-bench/Procfile_docker b/frappe-site/Procfile_docker
similarity index 100%
rename from frappe-bench/Procfile_docker
rename to frappe-site/Procfile_docker
diff --git a/frappe-bench/sites/common_site_config_docker.json b/frappe-site/sites/common_site_config_docker.json
similarity index 100%
rename from frappe-bench/sites/common_site_config_docker.json
rename to frappe-site/sites/common_site_config_docker.json