diff --git a/stack.sh b/stack.sh
index 40eab36e20..0a9e4d47c0 100755
--- a/stack.sh
+++ b/stack.sh
@@ -2003,7 +2003,7 @@ if is_service_enabled g-reg; then
 
     # Option to upload legacy ami-tty, which works with xenserver
     if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then
-        IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}http://images.ansolabs.com/tty.tgz"
+        IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz"
     fi
 
     for image_url in ${IMAGE_URLS//,/ }; do
diff --git a/tools/xen/prepare_guest_template.sh b/tools/xen/prepare_guest_template.sh
index baf9c3a25a..19bd2f841a 100755
--- a/tools/xen/prepare_guest_template.sh
+++ b/tools/xen/prepare_guest_template.sh
@@ -60,7 +60,7 @@ if [ -e "$ISO_DIR" ]; then
     rm -rf $TMP_DIR
 else
     echo "WARNING: no XenServer tools found, falling back to 5.6 tools"
-    TOOLS_URL="http://images.ansolabs.com/xen/xe-guest-utilities_5.6.100-651_amd64.deb"
+    TOOLS_URL="https://github.com/downloads/citrix-openstack/warehouse/xe-guest-utilities_5.6.100-651_amd64.deb"
     wget $TOOLS_URL -O $XS_TOOLS_FILE_NAME
     cp $XS_TOOLS_FILE_NAME "${STAGING_DIR}${XS_TOOLS_PATH}"
     rm -rf $XS_TOOLS_FILE_NAME