diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2228f1acd8..4dd7eaa25e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -232,6 +232,7 @@ workflows:
               only:
                 - develop
                 - develop_automation
+                - ci-manual-approval
           post-steps: 
             - run:
                 name: Run automation
@@ -239,6 +240,10 @@ workflows:
                   source awsenvconf
                   source buildenvvar               
                   ./automated-smoke-test/smoketest.sh automation-config-dev.json dev
+      - "smoke-testing":
+          type: approval
+          requires:
+            - build-dev
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -263,10 +268,13 @@ workflows:
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
+          requires:
+            - smoke-testing
           filters:
             branches:
               only:
                 - develop
+                - ci-manual-approval
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/CODEOWNERS b/CODEOWNERS
index a5c44ddd43..0134537700 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @sushilshinde @ajefts
+* @sushilshinde @ajefts @luizrrodrigues