diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9ee94af..4dd68277 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -518,6 +518,26 @@ jobs:
             echo ${DOCKERHUB_SECRET} | docker login -u ${DOCKERHUB_USER} --password-stdin
             docker push "falcosecurity/falco-driver-loader:${CIRCLE_TAG}"
             docker push "falcosecurity/falco-driver-loader:latest"
+  # Publish docker packages to AWS Public
+  "publish/packages-aws":
+    docker:
+      - image: docker:stable
+    steps:
+      - attach_workspace:
+          at: /
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build and publish falco to AWS
+          command: |
+            apk update
+            apk add --update groff less py-pip
+            pip install awscli
+            docker build --build-arg VERSION_BUCKET=deb --build-arg FALCO_VERSION=${CIRCLE_TAG} -t "public.ecr.aws/b4t6c0y6/falco:${CIRCLE_TAG}" docker/falco
+            docker tag "public.ecr.aws/b4t6c0y6/falco:${CIRCLE_TAG}" public.ecr.aws/b4t6c0y6/falco:latest
+            aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/b4t6c0y6
+            docker push "public.ecr.aws/b4t6c0y6/falco:${CIRCLE_TAG}"
+            docker push "public.ecr.aws/b4t6c0y6/falco:latest"
 workflows:
   version: 2
   build_and_test:
@@ -620,3 +640,13 @@ workflows:
               only: /.*/
             branches:
               ignore: /.*/
+      - "publish/packages-aws":
+          context: test-infra
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              only: new/ecr-public-push #Name of PR branch to test
+          # Add this once tests pass
+          # requires:
+          #   - "publish/docker"