diff --git a/Dockerfile b/Dockerfile
index a01aae254..11587cafb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,8 @@ ENV TALK_PORT 5000
 EXPOSE 5000
 
 # Install app dependencies
-COPY package.json /usr/src/app/
-RUN yarn install --production
+COPY package.json yarn.lock /usr/src/app/
+RUN yarn install
 
 # Bundle app source
 COPY . /usr/src/app
diff --git a/package.json b/package.json
index 09ce50aa9..70b0e17b1 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
   },
   "homepage": "https://github.com/coralproject/talk#readme",
   "dependencies": {
-    "apollo-client": "^0.8.3",
     "bcrypt": "^0.8.7",
     "body-parser": "^1.15.2",
     "cli-table": "^0.3.1",
@@ -66,7 +65,6 @@
     "graphql": "^0.8.2",
     "graphql-errors": "^2.1.0",
     "graphql-server-express": "^0.5.0",
-    "graphql-tag": "^1.2.3",
     "graphql-tools": "^0.9.0",
     "helmet": "^3.1.0",
     "inquirer": "^3.0.1",
@@ -88,6 +86,7 @@
     "uuid": "^2.0.3"
   },
   "devDependencies": {
+    "apollo-client": "^0.8.3",
     "autoprefixer": "^6.5.2",
     "babel-core": "^6.21.0",
     "babel-eslint": "^7.1.0",
@@ -122,6 +121,7 @@
     "exports-loader": "^0.6.3",
     "fetch-mock": "^5.5.0",
     "graphql-docs": "^0.2.0",
+    "graphql-tag": "^1.2.3",
     "hammerjs": "^2.0.8",
     "ignore-styles": "^5.0.1",
     "immutable": "^3.8.1",