diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5567caf978..3bb11c678d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,13 +114,20 @@ jobs:
 
   build-and-deploy:
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.6
+    environment:
+      DOCKER_CLI_EXPERIMENTAL: enabled
+      DOCKER_CONTEXT: default
     steps:
       - setup_remote_docker
       - checkout
       - install-go
-      - run: docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap
-      - run: sudo pip install awscli
+      - run:
+          name: Configure Docker Buildx
+          command: |
+            docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem"
+            docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap
+      - run: pip install awscli
       - run: make ci-build-cli
       - return-if-not-deployed-branch
       - run: make ci-build-and-upload-cli
@@ -135,7 +142,7 @@ jobs:
 
   e2e-tests:
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.6
     environment:
       CORTEX_TEST_BATCH_S3_PATH: s3://cortex-nightly-artifacts/test/jobs
     steps:
diff --git a/build/build-image.sh b/build/build-image.sh
index 352582e251..26d1edaddc 100755
--- a/build/build-image.sh
+++ b/build/build-image.sh
@@ -27,4 +27,4 @@ platforms=$2
 if [ "$image" == "inferentia" ]; then
   aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com
 fi
-docker buildx build $ROOT -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms
+docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms
diff --git a/build/push-image.sh b/build/push-image.sh
index 35c6bbc422..1590e29236 100755
--- a/build/push-image.sh
+++ b/build/push-image.sh
@@ -26,4 +26,4 @@ image=$2
 platforms=$3
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker buildx build $ROOT -f $ROOT/images/$image/Dockerfile $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push
+docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push
diff --git a/test/e2e/setup.py b/test/e2e/setup.py
index 34eca3f822..029d1eb438 100644
--- a/test/e2e/setup.py
+++ b/test/e2e/setup.py
@@ -30,8 +30,6 @@
     license="Apache License 2.0",
     python_requires=">=3.6",
     install_requires=[
-        "grpcio==1.36.0",
-        "grpcio-tools==1.36.0",
         "requests==2.24.0",
         "jsonschema==3.2.0",
         "pytest==6.1.*",