diff --git a/.circleci/config.yml b/.circleci/config.yml
index ba7f81fddc..819f2f87d2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,6 +2,7 @@ version: 2.1
 
 orbs:
   aws-cli: circleci/aws-cli@4.0.0
+  aws-ecr: circleci/aws-ecr@9.0.1
   browser-tools: circleci/browser-tools@1.4.3
   slack: circleci/slack@4.5.2
 
@@ -275,7 +276,9 @@ jobs:
           destination: coverage
 
   build_and_push:
-    executor: cloud-platform-executor
+    executor:
+      name: aws-ecr/default
+      docker_layer_caching: true
     steps:
     - checkout
     - setup_remote_docker: