diff --git a/nodepool/scripts/convert_node_to_xenserver.sh b/nodepool/scripts/convert_node_to_xenserver.sh
index 4b367b19bd..28332c05e7 100755
--- a/nodepool/scripts/convert_node_to_xenserver.sh
+++ b/nodepool/scripts/convert_node_to_xenserver.sh
@@ -72,9 +72,9 @@ LOG_FILE="${THIS_FILE}.log"
 ADDITIONAL_PARAMETERS="$@"
 
 XENSERVER_PASSWORD="$1"
-XENSERVER_ISO_URL="http://downloadns.citrix.com.edgesuite.net/akdlm/8159/XenServer-6.2.0-install-cd.iso"
 STAGING_APPLIANCE_URL="$2"
 APPLIANCE_NAME="$3"
+XENSERVER_ISO_URL="$4"
 FILE_TO_TOUCH_ON_COMPLETION="/var/run/xenserver.ready"
 
 # It is assumed, that the appliance has a user, DOMZERO_USER, and by
diff --git a/nodepool/scripts/install_xenserver.sh b/nodepool/scripts/install_xenserver.sh
index 9d8c7adfec..ed264e39fb 100755
--- a/nodepool/scripts/install_xenserver.sh
+++ b/nodepool/scripts/install_xenserver.sh
@@ -17,7 +17,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+XENSERVER_XVA_URL=${NODEPOOL_XENSERVER_XVA_URL:-http://downloads.vmd.citrix.com/OpenStack/xenapi-in-the-cloud-appliances/prod_ci}
+XENSERVER_ISO_URL=${NODEPOOL_XENSERVER_ISO_URL:-http://downloadns.citrix.com.edgesuite.net/akdlm/8159/XenServer-6.2.0-install-cd.iso}
+
 ./convert_node_to_xenserver.sh \
     password \
-    http://downloads.vmd.citrix.com/OpenStack/xenapi-in-the-cloud-appliances/1.1.4.xva \
-    devstack
+    "$XENSERVER_XVA_URL" \
+    devstack \
+    "$XENSERVER_ISO_URL"