diff --git a/.circleci/config.yml b/.circleci/config.yml
index be8d5db1cfc49eca54c4e23dce13454f5072784c..2f9a403827bb4ff7fa6a50617ef1b587393de7fb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,15 +29,11 @@ jobs:
       - run: *install-dependencies
       - run:
           name: Release Dev Image
-          environment:
-            IS_STAGING: true
-            API_HOST: https://api-dev.motionbank.org
           command: |
             set +o pipefail
-            AUTH0_CLIENT_ID=${DEV_AUTH0_CLIENT_ID} SENTRY_DSN=${DEV_SENTRY_DSN} npm run build
             docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
-            docker build --no-cache -t motionbank/systems-frontend:dev .
-            docker push motionbank/systems-frontend:dev
+            npm run lint
+            npm run docker-release-dev
 
   release_production:
     working_directory: /app
@@ -52,12 +48,11 @@ jobs:
           name: Release Production Image
           command: |
             set +o pipefail
-            AUTH0_CLIENT_ID=${PROD_AUTH0_CLIENT_ID} SENTRY_DSN=${PROD_SENTRY_DSN} npm run build
             docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
             docker build --no-cache -t motionbank/systems-frontend:${CIRCLE_BRANCH} .
             docker push motionbank/systems-frontend:${CIRCLE_BRANCH}
 
-  release_staging:
+  release_legacy:
     working_directory: /app
     docker:
       - image: docker:stable-git
@@ -67,16 +62,12 @@ jobs:
       - setup_remote_docker
       - run: *install-dependencies
       - run:
-          name: Release Staging Image
-          environment:
-            IS_STAGING: true
-            API_HOST: https://api-staging.motionbank.org
+          name: Release Production Image
           command: |
             set +o pipefail
-            AUTH0_CLIENT_ID=${STAGING_AUTH0_CLIENT_ID} SENTRY_DSN=${STAGING_SENTRY_DSN} npm run build
             docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
-            docker build --no-cache -t motionbank/systems-frontend:staging .
-            docker push motionbank/systems-frontend:staging
+            docker build --no-cache -t motionbank/systems-frontend:${CIRCLE_BRANCH} .
+            docker push motionbank/systems-frontend:${CIRCLE_BRANCH}
 
 workflows:
   version: 2
@@ -86,22 +77,11 @@ workflows:
           filters:
             branches:
               only: master
-      - release_staging:
-          filters:
-            branches:
-              only: staging
       - release_production:
           filters:
             branches:
-              only: /^release_.+$/
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 1 * * 1"
+              only: /^release_2_.+$/
+      - release_legacy:
           filters:
             branches:
-              only:
-                - master
-    jobs:
-      - release_dev
-      - release_staging
+              only: /^release_1_.+$/