diff --git a/.travis.yml b/.travis.yml
index 5c11dfe8..5a9af197 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ jobs:
           edge: true
           access_key_id: $AWS_ACCESS_KEY_ID
           secret_access_key: $AWS_SECRET_ACCESS_KEY
-          bucket: $BUCKET_LIVE
+          bucket: $BUCKET_STAGING
           local_dir: s3out-latest
           upload-dir: rc
           skip_cleanup: true
@@ -74,7 +74,7 @@ jobs:
           edge: true
           access_key_id: $AWS_ACCESS_KEY_ID
           secret_access_key: $AWS_SECRET_ACCESS_KEY
-          bucket: $BUCKET_LIVE
+          bucket: $BUCKET_STAGING
           local_dir: s3out
           upload-dir: $RELEASE_TAG
           skip_cleanup: true
@@ -102,7 +102,7 @@ jobs:
             branch: RC
       after_deploy:
         - aws configure set preview.cloudfront true
-        - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DIST_ID_BOOT --paths "rc/*" "rc/ipxe/*"
+        - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DIST_ID_STAGING --paths "rc/*" "rc/ipxe/*"
         - ./script/message rc-push
 
     - stage: release
@@ -125,7 +125,7 @@ jobs:
           edge: true
           access_key_id: $AWS_ACCESS_KEY_ID
           secret_access_key: $AWS_SECRET_ACCESS_KEY
-          bucket: $BUCKET_LIVE
+          bucket: $BUCKET_PROD
           local_dir: s3out-latest
           skip_cleanup: true
           on:
@@ -134,7 +134,7 @@ jobs:
           edge: true
           access_key_id: $AWS_ACCESS_KEY_ID
           secret_access_key: $AWS_SECRET_ACCESS_KEY
-          bucket: $BUCKET_LIVE
+          bucket: $BUCKET_PROD
           local_dir: s3out
           upload-dir: $RELEASE_TAG
           skip_cleanup: true
@@ -161,5 +161,5 @@ jobs:
             branch: master
       after_deploy:
         - aws configure set preview.cloudfront true
-        - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DIST_ID_BOOT --paths "/*" "/ipxe/*"
+        - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DIST_ID_PROD --paths "/*" "/ipxe/*"
         - ./script/message live-push
diff --git a/script/build_release b/script/build_release
index c4b3cfda..7720f9ec 100755
--- a/script/build_release
+++ b/script/build_release
@@ -4,12 +4,14 @@ set -e
 TYPE=$1
 HARD_RELEASE="2.x"
 HARD_RC="2.x-RC"
-LIVE_URL="staging.boot.netboot.xyz"
+DEV_URL="dev.boot.netboot.xyz"
+STAGING_URL="staging.boot.netboot.xyz"
+PROD_URL="boot.netboot.xyz"
 DOCKER_FILE="Dockerfile-build.production"
 
 # Set boot domain
 if [[ "${TYPE}" == "dev" ]]; then
-  BOOT_DOMAIN="s3.amazonaws.com/${BUCKET_DEV}/${TRAVIS_COMMIT}"
+  BOOT_DOMAIN="s3.amazonaws.com/${DEV_URL}/${TRAVIS_COMMIT}"
   BOOT_VERSION="Development"
 elif [[ "${TYPE}" == "pr" ]]; then
   BOOT_DOMAIN="test.com"
@@ -17,10 +19,10 @@ elif [[ "${TYPE}" == "pr" ]]; then
   DOCKER_FILE="Dockerfile-build"
 elif [[ "${TYPE}" == "rc" ]]; then
   BOOT_VERSION=$(cat version.txt)-RC
-  BOOT_DOMAIN="${LIVE_URL}/${BOOT_VERSION}"
+  BOOT_DOMAIN="${STAGING_URL}/${BOOT_VERSION}"
 elif [[ "${TYPE}" == "release" ]]; then
   BOOT_VERSION=$(cat version.txt)
-  BOOT_DOMAIN="${LIVE_URL}/${BOOT_VERSION}"
+  BOOT_DOMAIN="${PROD_URL}/${BOOT_VERSION}"
 fi
 sed -i \
   "/^#boot_version/c\boot_version: \"${BOOT_VERSION}\"" \
@@ -51,7 +53,7 @@ if [[ "${TYPE}" == "release" ]] || [[ "${TYPE}" == "rc" ]]; then
   if [[ "${TYPE}" == "release" ]]; then
     sed -i \
       -e "/^boot_version/c\boot_version: \"${HARD_RELEASE}\"" \
-      -e "/^boot_domain/c\boot_domain: ${LIVE_URL}" \
+      -e "/^boot_domain/c\boot_domain: ${PROD_URL}" \
       user_overrides.yml
     docker build -t localbuild -f ${DOCKER_FILE} .
     docker run --rm -it -v $(pwd):/buildout localbuild
@@ -59,7 +61,7 @@ if [[ "${TYPE}" == "release" ]] || [[ "${TYPE}" == "rc" ]]; then
   if [[ "${TYPE}" == "rc" ]]; then
     sed -i \
       -e "/^boot_version/c\boot_version: \"${HARD_RC}\"" \
-      -e "/^boot_domain/c\boot_domain: ${LIVE_URL}/rc" \
+      -e "/^boot_domain/c\boot_domain: ${STAGING_URL}/rc" \
       user_overrides.yml
     docker build -t localbuild -f ${DOCKER_FILE} .
     docker run --rm -it -v $(pwd):/buildout localbuild