diff --git a/Dockerfile.dev b/Dockerfile.dev
new file mode 100644
index 00000000..6e4f9b70
--- /dev/null
+++ b/Dockerfile.dev
@@ -0,0 +1,10 @@
+FROM ruby:2.3.1
+
+# app dependencies
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
+
+ENV RAILS_ENV=development \
+    APP_HOME=/usr/src/app
+
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
diff --git a/Dockerfile.prod b/Dockerfile.prod
deleted file mode 100644
index e89a609a..00000000
--- a/Dockerfile.prod
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM ruby:2.3.1
-
-# app dependencies
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
-
-ENV RAILS_ENV=production \
-    APP_HOME=/usr/src/app \
-    BIGBLUEBUTTON_ENDPOINT=http://test-install.blindsidenetworks.com/bigbluebutton/ \
-    BIGBLUEBUTTON_SECRET=8cd8ef52e8e101574e400365b55e11a6
-
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
-
-ADD . $APP_HOME
-
-RUN bundle install --without development test doc --deployment --clean
-
-RUN bundle exec rake assets:precompile --trace
-
-CMD ["scripts/default_start.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 92621a65..1d97afdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
 version: '2'
 services:
   web:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile.dev
     ports:
       - '80:80'
     volumes:
@@ -10,7 +12,6 @@ services:
       - gem_cache
     expose:
       - '3001'
-    working_dir: '/usr/src/app'
     stdin_open: true
     tty: true
     command: bundle exec rails s -p 80 -b '0.0.0.0'