diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d03bb13a8..fd6e7c79eb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -728,7 +728,8 @@ workflows:
                 - '/.*e2e.*/'
 
       - release-s3:
-          name: upload latest
+          name: upload preview
+          deployment: preview
           context: team-hammerhead-common-deploy-tokens
           requires:
             - Validate NPM artifacts (docker-amd64)
@@ -754,6 +755,16 @@ workflows:
             branches:
               only: master
 
+      - release-s3:
+          name: upload latest
+          deployment: latest
+          context: team-hammerhead-common-deploy-tokens
+          requires:
+            - upload preview
+          filters:
+            branches:
+              only: master
+
       - release-github:
           name: upload github
           context: team-hammerhead-common-deploy-tokens
@@ -1149,14 +1160,18 @@ jobs:
             SNYK_TOKEN=${TEST_SNYK_TOKEN} ./snyk woof
 
   release-s3:
+    parameters:
+      deployment:
+        type: string
+        default: latest
     executor: docker-amd64
     steps:
       - prepare-workspace
       - aws-cli/install:
           version: << pipeline.parameters.aws_version >>
       - run:
-          name: Publish to S3
-          command: ./release-scripts/upload-artifacts.sh latest
+          name: Publish to S3 ( << parameters.deployment >> )
+          command: ./release-scripts/upload-artifacts.sh << parameters.deployment >>
       - failed-release-notification
 
   release-github:
diff --git a/Makefile b/Makefile
index 5f998e893d..e188f5d359 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,7 @@ release-pre:
 	@echo "-- Validating artifacts"
 	@./release-scripts/validate-checksums.sh
 	@echo "-- Validating upload permissions"
-	@./release-scripts/upload-artifacts.sh --dry-run latest github npm
+	@./release-scripts/upload-artifacts.sh --dry-run preview latest github npm
 	@echo "-- Publishing to S3 /version"
 	@./release-scripts/upload-artifacts.sh version