diff --git a/.cirrus.yml b/.cirrus.yml
index 956f672..dd4d601 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,8 +5,11 @@ task:
     labels:
       name: dev-mini
   env:
+    TART_REGISTRY_HOSTNAME: ghcr.io
     TART_REGISTRY_USERNAME: fkorotkov # GitHub supports only PATs
     TART_REGISTRY_PASSWORD: ENCRYPTED[!82ed873afdf627284305afef4958c85a8f73127b09978a9786ac521559630ea6c9a5ab6e7f8315abf9ead09b6eff6eae!]
+    AWS_ACCESS_KEY_ID: ENCRYPTED[c187b670a17eead88c1698849376273991d09678efe37ae2f0c9738c27a2422741a71c501ef4b6a4df7bff3eca5213a9]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[e456254a53b82e3167f2da23e24c389620cb3f7d47e4e5e7d993813bf9bb18c784d5cb8d88d19632073acc9e1f6096c9]
   update_script: brew update && brew upgrade
   info_script:
     - tart --version
@@ -21,8 +24,12 @@ task:
     - packer build -var-file="variables.pkrvars.hcl" templates/xcode.pkr.hcl
   push_base_script:
     - tart push sonoma-base ghcr.io/cirruslabs/macos-sonoma-base:latest
+  push_base_ecr_script:
+    - tart push sonoma-base public.ecr.aws/h0w9t6b1/macos:sonoma-base
   push_xcode_script:
     - tart push sonoma-xcode:$XCODE_VERSION ghcr.io/cirruslabs/macos-sonoma-xcode:$XCODE_VERSION ghcr.io/cirruslabs/macos-sonoma-xcode:latest
+  push_xcode_ecr_script:
+    - tart push sonoma-xcode:$XCODE_VERSION public.ecr.aws/h0w9t6b1/macos:sonoma-xcode-$XCODE_VERSION public.ecr.aws/h0w9t6b1/macos:sonoma-xcode
   always:
     cleanup_script:
       - tart delete sonoma-base || true
@@ -35,8 +42,11 @@ task:
     labels:
       name: dev-mini
   env:
+    TART_REGISTRY_HOSTNAME: ghcr.io
     TART_REGISTRY_USERNAME: fkorotkov # GitHub supports only PATs
     TART_REGISTRY_PASSWORD: ENCRYPTED[!82ed873afdf627284305afef4958c85a8f73127b09978a9786ac521559630ea6c9a5ab6e7f8315abf9ead09b6eff6eae!]
+    AWS_ACCESS_KEY_ID: ENCRYPTED[c187b670a17eead88c1698849376273991d09678efe37ae2f0c9738c27a2422741a71c501ef4b6a4df7bff3eca5213a9]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[e456254a53b82e3167f2da23e24c389620cb3f7d47e4e5e7d993813bf9bb18c784d5cb8d88d19632073acc9e1f6096c9]
   update_script: brew update && brew upgrade
   info_script:
     - tart --version
@@ -54,6 +64,13 @@ task:
     else
       tart push sonoma-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-sonoma-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-sonoma-xcode:latest
     fi
+  push_ecr_script: |
+    if [[ $CIRRUS_TAG == *"beta"* ]]
+    then
+      tart push sonoma-xcode:$CIRRUS_TAG public.ecr.aws/h0w9t6b1/macos:sonoma-xcode-$XCODE_VERSION
+    else
+      tart push sonoma-xcode:$CIRRUS_TAG public.ecr.aws/h0w9t6b1/macos:sonoma-xcode-$XCODE_VERSION public.ecr.aws/h0w9t6b1/macos:sonoma-xcode
+    fi
   always:
     cleanup_script:
       - tart delete sonoma-base || true