diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11bc63a0..b9d73612 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,8 @@
-version: 2.0
+version: 2.1
+
+orbs:
+    aws-ecr: circleci/aws-ecr@4.0.1
+    azure-acr: circleci/azure-acr@0.1.1
 
 defaults:
   appEnvironment: &appEnvironment
@@ -21,10 +25,6 @@ jobs:
       - checkout
       - run: sudo apt-get update
       - run: sudo apt-get install postgresql-client-9.6
-      - run:
-          name: "Clone Submodules"
-          command: |
-            git submodule update --init --recursive
       - attach_workspace:
           at: .
       - run: ./script/setup
@@ -74,6 +74,7 @@ jobs:
           name: "Run Tests"
           command: ./script/cibuild
 
+
 workflows:
   version: 2
   run-tests:
@@ -82,3 +83,23 @@ workflows:
       - test:
           requires:
             - app_setup
+      - aws-ecr/build_and_push_image:
+          repo: atat
+          tag: "${CIRCLE_SHA1}"
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - master
+      - azure-acr/build_and_push_image:
+          login-server-name: "${AZURE_SERVER_NAME}"
+          registry-name: pwatat
+          repo: atat
+          tag: "${CIRCLE_SHA1}"
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - master