diff --git a/.circleci/build.sh b/.circleci/build.sh
index 3cb0e02c658..e6286c77ad6 100755
--- a/.circleci/build.sh
+++ b/.circleci/build.sh
@@ -5,12 +5,8 @@ set -e
 DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
 
 # if we're not on a deployment branch or a Docker related PR branch, skip the Docker build/test
-if [[ "$CIRCLE_BRANCH" != "master" && \
-      "$CIRCLE_BRANCH" != "development" && \
-      "$CIRCLE_BRANCH" != *"docker"* && \
-      "$CIRCLE_BRANCH" != "marketplace" ]]; # TODO: remove this once marketplace is merged
-then
-  echo "Not running a deployment branch. Skipping the Docker build test."
+if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != *"docker"* ]]; then
+  echo "Not running a build branch. Skipping the Docker build test."
   exit 0
 fi
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
index be9007647e2..a3ea350f1f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,6 +11,7 @@ jobs:
       - DOCKER_VERSION: 17.05.0-ce
       - DOCKER_COMPOSE_VERSION: 1.15.0
       - METEOR_ALLOW_SUPERUSER: true
+      - TOOL_NODE_FLAGS: "--max-old-space-size=4096"
 
     steps:
       - setup_remote_docker
diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
index e6d55ffbfd0..82de7e15834 100755
--- a/.circleci/deploy.sh
+++ b/.circleci/deploy.sh
@@ -5,39 +5,17 @@
 #
 # $DOCKER_USER  - Docker Hub username
 # $DOCKER_PASS  - Docker Hub password
-# $DOCKER_EMAIL - Docker Hub email
-
 
 ## Optional Environment Variables
 # (used to customize the destination on Docker Hub without having to edit the CircleCI config)
 #
 # $DOCKER_NAMESPACE     - the image name for production deployments [Default]: reactioncommerce/reaction
-# $DOCKER_NAMESPACE_DEV - the image name for development deployments [Default]: reactioncommerce/prequel
-
 
-if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != "development" ]]; then
+if [[ "$CIRCLE_BRANCH" != "master" ]]; then
   echo "Not running a deployment branch."
   exit 0
 fi
 
-
-## Development
-if [[ "$CIRCLE_BRANCH" == "development" ]]; then
-  set -e
-
-  DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
-  DOCKER_NAMESPACE_DEV=${DOCKER_NAMESPACE_DEV:-"reactioncommerce/prequel"}
-
-  docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE_DEV:latest
-  docker tag $DOCKER_NAMESPACE_DEV:latest $DOCKER_NAMESPACE_DEV:$CIRCLE_BUILD_NUM
-
-  docker login -u $DOCKER_USER -p $DOCKER_PASS
-
-  docker push $DOCKER_NAMESPACE_DEV:$CIRCLE_BUILD_NUM
-  docker push $DOCKER_NAMESPACE_DEV:latest
-fi
-
-
 # Master branch deployment (only runs when a version git tag exists - syntax: "v1.2.3")
 if [[ "$CIRCLE_BRANCH" == "master" ]]; then
   VERSION=$(git describe --tags | grep "^v[0-9]\+\.[0-9]\+\.[0-9]\+$")
@@ -49,7 +27,7 @@ if [[ "$CIRCLE_BRANCH" == "master" ]]; then
 
     docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE:$VERSION
 
-    docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+    docker login -u $DOCKER_USER -p $DOCKER_PASS
 
     docker push $DOCKER_NAMESPACE:$VERSION
     docker push $DOCKER_NAMESPACE:latest
diff --git a/Dockerfile b/Dockerfile
index 8e4fcd82eec..7d94e843e19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v2.1.3
+FROM reactioncommerce/base:v2.2.0
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"