diff --git a/.circleci/config.yml b/.circleci/config.yml
index b0ccd17fea..92ff17fa0c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,7 +115,7 @@ commands:
 jobs:
   test:
     docker:
-      - image: circleci/node:11.15.0
+      - image: circleci/node:8.10.0-stretch
     steps:
       - git_checkout_from_cache
       - npm_install
@@ -142,7 +142,7 @@ jobs:
 
   release_aws_production:
     docker:
-      - image: circleci/nide:11.15.0
+      - image: circleci/node:8.10.0-stretch
     steps:
       - git_checkout_from_cache
       - npm_install
@@ -167,12 +167,10 @@ workflows:
           filters:
             branches:
               ignore: /.*/
-            tags:
-              only: /^production.*/
       - release_aws_production:
           filters:
             branches:
               ignore: /.*/
             tags:
-              only: /^aws\-production.*/
+              only: /^production.*/
           context: binary-frontend-artifact-upload