diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a33b716..2c078dbf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -452,6 +452,25 @@ jobs:
             docker build --build-arg FALCO_IMAGE_TAG=master -t falcosecurity/falco-driver-loader:master docker/driver-loader
             echo ${DOCKERHUB_SECRET} | docker login -u ${DOCKERHUB_USER} --password-stdin
             docker push falcosecurity/falco-driver-loader:master
+  # Publish container images to AWS ECR Public
+  "publish/container-images-aws-dev":
+    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
+            FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//')
+            docker build --build-arg VERSION_BUCKET=deb --build-arg FALCO_VERSION=${FALCO_VERSION} -t "public.ecr.aws/b4t6c0y6/falco:master" docker/falco
+            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:master"
   # Publish the packages
   "publish/packages":
     docker:
@@ -597,6 +616,15 @@ workflows:
           requires:
             - "publish/packages-dev"
             - "tests/driver-loader/integration"
+      - "publish/container-images-aws-dev":
+          context: test-infra # contains Falco AWS credentials
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              only: jonah-ci-aws-ecr-registry # todo > revert to master before to merge
+          requires:
+            - build/centos7 # Switch with "publish/docker-dev" once passes
       - "quality/static-analysis"
   release:
     jobs:
@@ -641,12 +669,11 @@ workflows:
             branches:
               ignore: /.*/
       - "publish/container-images-aws":
-          context: test-infra
+          context: test-infra # contains Falco AWS credentials
+          requires:
+            - "publish/docker"
           filters:
             tags:
               ignore: /.*/
             branches:
-              only: jonah-ci-aws-ecr-registry # todo > revert before to merge
-          # Add this once tests pass
-          # requires:
-          #   - "publish/docker"
+              ignore: /.*/
\ No newline at end of file