diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73e8c11a0a..97816395ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -477,10 +477,11 @@ jobs:
       - provision
       - setup_remote_docker:
           docker_layer_caching: true
-          version: previous
       - run:
           name: Build docker images
-          command: ./.circleci/docker-build-fxa.sh  << pipeline.id >>
+          command: |
+                    ssh remote-docker \ sudo sysctl -w fs.inotify.max_user_watches=60668
+                    ./.circleci/docker-build-fxa.sh  << pipeline.id >>
           no_output_timeout: 1h
 
   deploy-fxa-image: