diff --git a/roles/netbootxyz/templates/menu/nbxyz.ipxe.j2 b/roles/netbootxyz/templates/menu/nbxyz.ipxe.j2
index 8e37b884..f78c2eb3 100644
--- a/roles/netbootxyz/templates/menu/nbxyz.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/nbxyz.ipxe.j2
@@ -5,36 +5,34 @@
 goto ${menu} ||
 
 :nbxyz
-set os netboot.xyz internet endpoints
+set os netboot.xyz
 clear nbxyz_version
 menu ${os}
 item --gap Endpoints
-item nbxyz-rolling ${space} ${os} Production Rolling (boot.netboot.xyz)
-item nbxyz-prod ${space} ${os} Production Release (boot.netboot.xyz)
-item nbxyz-staging ${space} ${os} Staging (staging.boot.netboot.xyz)
-item nbxyz-dev ${space} ${os} Development (dev.boot.netboot.xyz)
-item --gap Options:
+item nbxyz-rolling ${space} Production Rolling (boot.netboot.xyz)
+item nbxyz-prod ${space} Production Release (boot.netboot.xyz)
+item nbxyz-staging ${space} Staging (staging.boot.netboot.xyz)
+item nbxyz-dev ${space} Development (dev.boot.netboot.xyz)
 choose nbxyz_version || goto nbxyz_exit
 goto ${nbxyz_version}
 
 :nbxyz-rolling
-chain --autofree https://boot.netboot.xyz ||
-chain --autofree http://boot.netboot.xyz ||
+chain --autofree https://boot.netboot.xyz/menu.ipxe ||
 goto nbxyz
 
 :nbxyz-prod
 chain https://boot.netboot.xyz/version.ipxe ||
-chain --autofree https://boot.netboot.xyz/${upstream_version} ||
+chain --autofree https://boot.netboot.xyz/${upstream_version}/menu.ipxe ||
 goto nbxyz
 
 :nbxyz-staging
 chain https://staging.boot.netboot.xyz/version.ipxe ||
-chain --autofree https://staging.boot.netboot.xyz/${upstream_version} ||
+chain --autofree https://staging.boot.netboot.xyz/${upstream_version}/menu.ipxe ||
 goto nbxyz
 
 :nbxyz-dev
 chain https://s3.amazonaws.com/dev.boot.netboot.xyz/version.ipxe ||
-chain --autofree https://s3.amazonaws.com/dev.boot.netboot.xyz/${upstream_version} ||
+chain --autofree https://s3.amazonaws.com/dev.boot.netboot.xyz/${upstream_version}/menu.ipxe ||
 goto nbxyz
 
 :nbxyz_exit
diff --git a/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2 b/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
index 0fabb29e..a4569359 100644
--- a/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
@@ -10,7 +10,7 @@ item {{ key }} ${space} {{ value.name }}
 item --gap netboot.xyz tools:
 item nbxyz-custom ${space} Set Github username [user: ${github_user}]
 item testpr ${space} Test forked netboot.xyz branch or hash
-item nbxyz netboot.xyz endpoints
+item nbxyz ${space} netboot.xyz endpoints
 choose --default ${menu} menu || goto utils_exit
 echo ${cls}
 goto ${menu} ||
diff --git a/roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2 b/roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2
index e2ac20f0..d7b49078 100644
--- a/roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2
@@ -11,7 +11,7 @@ item --gap netboot.xyz tools:
 item nbxyz-custom ${space} Set Github username [user: ${github_user}]
 item testdistro ${space} Test Distribution ISO
 item testpr ${space} Test forked netboot.xyz branch or hash
-item nbxyz netboot.xyz endpoints
+item nbxyz ${space} netboot.xyz endpoints
 choose --default ${menu} menu || goto utils_exit
 echo ${cls}
 goto ${menu} ||
diff --git a/script/build_release b/script/build_release
index 5fb1b9b2..d643e6c6 100755
--- a/script/build_release
+++ b/script/build_release
@@ -11,11 +11,11 @@ DOCKER_FILE="Dockerfile-build.production"
 
 # Set boot domain
 if [[ "${TYPE}" == "dev" ]]; then
+  BOOT_DOMAIN="s3.amazonaws.com/${DEV_URL}/${TRAVIS_COMMIT}"
   BOOT_VERSION="${TRAVIS_COMMIT}"
-  BOOT_DOMAIN="s3.amazonaws.com/${DEV_URL}/${BOOT_VERSION}"
 elif [[ "${TYPE}" == "pr" ]]; then
-  BOOT_VERSION="test"
   BOOT_DOMAIN="test.com"
+  BOOT_VERSION="test"
   DOCKER_FILE="Dockerfile-build"
 elif [[ "${TYPE}" == "rc" ]]; then
   BOOT_VERSION=$(cat version.txt)-RC