diff --git a/circle.yml b/circle.yml
index 617fbc2f0..47087f937 100644
--- a/circle.yml
+++ b/circle.yml
@@ -16,53 +16,57 @@ machine:
     SCOPE_UI_BUILD: $HOME/docker/scope_ui_build.tar
 
 dependencies:
+  pre:
+      - pip install --upgrade requests
   cache_directories:
     - "~/docker"
   override:
     - |
-    #   sudo apt-get update &&
-    #   sudo apt-get install jq pv &&
-    #   (curl https://sdk.cloud.google.com | bash) &&
-    #   (test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD") &&
-    #   make deps &&
-    #   mkdir -p $(dirname $SRCDIR) &&
-    #   cp -r $(pwd)/ $SRCDIR
-    # - "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc .babelrc && touch $SRCDIR/.scope_ui_build.uptodate"
-    # - "cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh && touch $SRCDIR/.scope_backend_build.uptodate"
-    # - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh make_template):
-    #     parallel: false
+      sudo apt-get update &&
+      sudo apt-get install jq pv &&
+      sudo chmod a+wr --recursive /usr/local/go/pkg &&
+      sudo chown ubuntu:ubuntu "$HOME/.bashrc.backup"
+      (curl https://sdk.cloud.google.com | bash) &&
+      (test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD") &&
+      make deps &&
+      mkdir -p $(dirname $SRCDIR) &&
+      cp -r $(pwd)/ $SRCDIR
+    - "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc .babelrc && touch $SRCDIR/.scope_ui_build.uptodate"
+    - "cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh && touch $SRCDIR/.scope_backend_build.uptodate"
+    - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh make_template):
+        parallel: false
     - sudo apt-get update && sudo apt-get install python-pip && sudo pip install awscli
 
 test:
   override:
-    # - cd $SRCDIR; make RM= lint:
-    #     parallel: true
-    # - cd $SRCDIR; COVERDIR=./coverage make RM= tests:
-    #     parallel: true
+    - cd $SRCDIR; make RM= lint:
+        parallel: true
+    - cd $SRCDIR; COVERDIR=./coverage make RM= tests:
+        parallel: true
     - cd $SRCDIR; make RM= client-test static:
         parallel: true
-    # - cd $SRCDIR; make RM= client-lint static:
-    #     parallel: true
-    # - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make GO_BUILD_INSTALL_DEPS= RM= prog/scope; else GOOS=darwin make GO_BUILD_INSTALL_DEPS= RM= prog/scope; fi:
-    #     parallel: true
-    # - cd $SRCDIR; rm -f prog/scope; make RM=:
-    #     parallel: true
-    # - cd $SRCDIR/extras; ./build_on_circle.sh:
-    #     parallel: true
-    # - "test -z \"$SECRET_PASSWORD\" || (cd $SRCDIR/integration; ./gce.sh setup && eval $(./gce.sh hosts); ./setup.sh)":
-    #     parallel: true
-    # - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; eval $(./gce.sh hosts); ./run_all.sh):
-    #     parallel: true
-    #     timeout: 300
-  # post:
-  #   - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
-  #       parallel: true
-  #   - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage):
-  #       parallel: true
-  #   - test "$CIRCLE_NODE_INDEX" != "0" || (goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true):
-  #       parallel: true
-  #   - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; cp coverage.* scope.tar $CIRCLE_ARTIFACTS):
-  #       parallel: true
+    - cd $SRCDIR; make RM= client-lint static:
+        parallel: true
+    - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make GO_BUILD_INSTALL_DEPS= RM= prog/scope; else GOOS=darwin make GO_BUILD_INSTALL_DEPS= RM= prog/scope; fi:
+        parallel: true
+    - cd $SRCDIR; rm -f prog/scope; make RM=:
+        parallel: true
+    - cd $SRCDIR/extras; ./build_on_circle.sh:
+        parallel: true
+    - "test -z \"$SECRET_PASSWORD\" || (cd $SRCDIR/integration; ./gce.sh setup && eval $(./gce.sh hosts); ./setup.sh)":
+        parallel: true
+    - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; eval $(./gce.sh hosts); ./run_all.sh):
+        parallel: true
+        timeout: 300
+  post:
+    - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
+        parallel: true
+    - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage):
+        parallel: true
+    - test "$CIRCLE_NODE_INDEX" != "0" || (goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true):
+        parallel: true
+    - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR; cp coverage.* scope.tar $CIRCLE_ARTIFACTS):
+        parallel: true
 
 deployment:
   hub:
@@ -77,7 +81,7 @@ deployment:
           )) &&
           docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope &&
           docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./tools/image-tag) &&
-          (test -z "${UI_BUCKET_KEY_ID}" || make ui-upload)
+          (test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload))
         )
       - |
         test -z "${QUAY_USER}" || (
@@ -89,7 +93,6 @@ deployment:
     branch: /^((?!master).)*$/  # not the master branch
     commands:
       - >
-        make ui-build-pkg &&
         test -z "${DEPLOY_BRANCH}" || test -z "${DOCKER_USER}" || (
           docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS &&
           docker tag weaveworks/scope:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:${CIRCLE_BRANCH//\//-} &&