diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5cf8273697..ae9333c8fb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,7 @@ jobs:
           export WEBAPP_GIT_COMMIT=$(git rev-parse HEAD)
           echo "$WEBAPP_GIT_COMMIT"
           export CURL_FAILED=0
-          curl -f -o ./dist.tar.gz https://releases.mattermost.com/mattermost-webapp/commit/${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || export CURL_FAILED=1
+          curl -f -o ./dist.tar.gz https://pr-builds.mattermost.com/mattermost-webapp/commit/${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || export CURL_FAILED=1
 
           if [ $CURL_FAILED -eq 1 ]
           then
@@ -265,7 +265,7 @@ jobs:
             rm -rf mattermost
       - aws-s3/copy:
           from: ~/go/src/github.com/mattermost/mattermost-server/dist/
-          to: "s3://releases.mattermost.com/mattermost-platform-pr/commit/${CIRCLE_SHA1}/"
+          to: "s3://pr-builds.mattermost.com/mattermost-server/commit/${CIRCLE_SHA1}/"
           arguments: --acl public-read --cache-control "no-cache" --recursive
 
   upload-s3:
@@ -281,7 +281,7 @@ jobs:
             rm -rf mattermost
       - aws-s3/copy:
           from: ~/go/src/github.com/mattermost/mattermost-server/dist/
-          to: s3://releases.mattermost.com/mattermost-platform-pr/$(echo "${CIRCLE_BRANCH}" | sed 's/pull\//PR-/g')/
+          to: s3://pr-builds.mattermost.com/mattermost-server/$(echo "${CIRCLE_BRANCH}" | sed 's/pull\//PR-/g')/
           arguments: --acl public-read --cache-control "no-cache" --recursive
 
   build-docker:
@@ -296,7 +296,7 @@ jobs:
           command: |
             export TAG="${CIRCLE_SHA1:0:7}"
             cd mattermost-server
-            export MM_PACKAGE=https://releases.mattermost.com/mattermost-platform-pr/commit/${CIRCLE_SHA1}/mattermost-team-linux-amd64.tar.gz
+            export MM_PACKAGE=https://pr-builds.mattermost.com/mattermost-server/commit/${CIRCLE_SHA1}/mattermost-team-linux-amd64.tar.gz
             docker build --build-arg MM_PACKAGE=$MM_PACKAGE -t mattermost/mattermost-team-edition:${TAG} build
             echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
             docker push mattermost/mattermost-team-edition:${TAG}
@@ -314,11 +314,11 @@ workflows:
           requires:
             - setup
       - upload-s3-sha:
-          context: mattermost-ci-s3
+          context: mattermost-ci-pr-builds-s3
           requires:
             - build
       - upload-s3:
-          context: mattermost-ci-s3
+          context: mattermost-ci-pr-builds-s3
           requires:
             - build
       - build-docker:
diff --git a/build/Jenkinsfile.pr b/build/Jenkinsfile.pr
index 137466434c..cf35ccf6e6 100644
--- a/build/Jenkinsfile.pr
+++ b/build/Jenkinsfile.pr
@@ -63,7 +63,7 @@ pipeline {
 
 								echo Webapp Commit: \${WEBAPP_GIT_COMMIT}
 
-								curl -f -o ./dist.tar.gz https://releases.mattermost.com/mattermost-webapp/commit/\${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || make node_modules test build
+								curl -f -o ./dist.tar.gz https://pr-builds.mattermost.com/mattermost-webapp/commit/\${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || make node_modules test build
 							"""
 						}
 					}
@@ -124,7 +124,7 @@ pipeline {
 					steps {
 						dir('src/github.com/mattermost/mattermost-server/dist') {
 							step([$class: 'S3BucketPublisher', dontWaitForConcurrentBuildCompletion: false, entries: [[
-								bucket: "releases.mattermost.com/mattermost-platform-pr/${CHANGE_ID}",
+								bucket: "pr-builds.mattermost.com/mattermost-server/${CHANGE_ID}",
 								excludedFile: '',
 								flatten: true,
 								gzipFiles: false,
@@ -139,7 +139,7 @@ pipeline {
 								useServerSideEncryption: false,
 								userMetadata: [[key: 'Cache-Control', value: 'no-cache']]
 							], [
-								bucket: "releases.mattermost.com/mattermost-platform-pr/${CHANGE_BRANCH}",
+								bucket: "pr-builds.mattermost.com/mattermost-server/${CHANGE_BRANCH}",
 								excludedFile: '',
 								flatten: true,
 								gzipFiles: false,
@@ -164,7 +164,7 @@ pipeline {
 					steps {
 						dir('src/github.com/mattermost/mattermost-server/dist') {
 							step([$class: 'S3BucketPublisher', dontWaitForConcurrentBuildCompletion: false, entries: [[
-								bucket: "releases.mattermost.com/mattermost-platform-pr/${BRANCH_NAME}",
+								bucket: "pr-builds.mattermost.com/mattermost-server/${BRANCH_NAME}",
 								excludedFile: '',
 								flatten: true,
 								gzipFiles: false,
@@ -223,7 +223,7 @@ pipeline {
 					withCredentials([usernamePassword(credentialsId: 'matterbuild-docker-hub', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) {
 						sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}'
 						sh """
-							docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform-pr/${CHANGE_ID}/mattermost-enterprise-linux-amd64.tar.gz -t mattermost/mattermost-enterprise-edition:${GIT_COMMIT_SHORT} build
+							docker build --no-cache --build-arg MM_PACKAGE=https://pr-builds.mattermost.com/mattermost-server/${CHANGE_ID}/mattermost-enterprise-linux-amd64.tar.gz -t mattermost/mattermost-enterprise-edition:${GIT_COMMIT_SHORT} build
 							docker push mattermost/mattermost-enterprise-edition:${GIT_COMMIT_SHORT}
 							docker logout
 						"""