diff --git a/mk/declarations.sh b/mk/declarations.sh
index 308570435..c91a32cf0 100644
--- a/mk/declarations.sh
+++ b/mk/declarations.sh
@@ -129,15 +129,7 @@ XENCENTER_LOGDIR="${ROOT}/log"
 mkdir -p ${XENCENTER_LOGDIR}
 
 # WEB_LIB is where the libraries stored in /usr/groups/linux/distfiles are exposed
-#WEB_LATEST_BUILD is where the current build will retrieve some of its dependendencies,
-#i.e. XenCenterOvf, version number, branding info and XenServer.NET;
-#use xe-phase-2-latest to ensure we use a build where phases 1 and 2 have succeeded
-WEB_HOST="http://www.uk.xensource.com"
-WEB_LIB="${WEB_HOST}/linux/distfiles/windows-build"
-WEB_LATEST_BUILD="${WEB_HOST}/carbon/${XS_BRANCH}/xe-phase-2-latest"
-REBRANDING_WEB_LATEST_BUILD="${WEB_HOST}/carbon/${XS_BRANCH}/xe-phase-rebrand-latest"
-WEB_XE_PHASE_1=${WEB_LATEST_BUILD}/xe-phase-1
-WEB_XE_PHASE_2=${WEB_LATEST_BUILD}/xe-phase-2
+WEB_LIB="http://www.uk.xensource.com/linux/distfiles/windows-build"
 
 # REPO_CITRITE_LIB is where repo.citrite.net files can be found
 REPO_CITRITE_HOST="https://repo.citrite.net"
diff --git a/mk/xenadmin-build.sh b/mk/xenadmin-build.sh
index 5e6b6ce43..af6d0ce58 100755
--- a/mk/xenadmin-build.sh
+++ b/mk/xenadmin-build.sh
@@ -111,13 +111,10 @@ dotnet_cp_to_dir "${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}" "NDP46-KB3045560-
 dotnet_cp_to_dir "${PUTTY_DIR}" "UNSIGNED/putty.exe"
 dotnet_cp_to_dir "${REPO}" "sign.bat" && chmod a+x "${REPO}/sign.bat"
 
-#bring in stuff from xencenter-ovf latest xe-phase-1
-_WGET -P "${SCRATCH_DIR}" "${WEB_XE_PHASE_1}/XenCenterOVF.zip"
+#bring in the ovf fixup iso from artifactory (currently one location)
+_WGET -P "${SCRATCH_DIR}" ${REPO_CITRITE_HOST}/list/xs-local-contrib/citrix/xencenter/XenCenterOVF.zip
 ${UNZIP} -d ${REPO}/XenOvfApi ${SCRATCH_DIR}/XenCenterOVF.zip
 
-#bring manifest from latest xe-phase-1
-_WGET -O ${SCRATCH_DIR}/xe-phase-1-manifest "${WEB_XE_PHASE_1}/manifest"
-
 #bring in some more libraries
 mkdir_clean ${REPO}/NUnit
 _WGET -P ${REPO}/NUnit ${WEB_LIB}/nunit.framework.dll 
@@ -298,9 +295,17 @@ cd ${OUTPUT_DIR} && tar cjf XenCenter.Symbols.tar.bz2 --remove-files *.pdb
 #create manifest
 echo "@branch=${XS_BRANCH}" >> ${OUTPUT_DIR}/manifest
 echo "xenadmin xenadmin.git ${get_REVISION:0:12}" >> ${OUTPUT_DIR}/manifest
-cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep xencenter-ovf >> ${OUTPUT_DIR}/manifest
-cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep chroot-lenny >> ${OUTPUT_DIR}/manifest
-cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep branding >> ${OUTPUT_DIR}/manifest
+
+#for the time being we download a fixed version of the ovf fixup iso, hence put this in the manifest
+echo "xencenter-ovf xencenter-ovf.git 21d3d7a7041f15abfa73f916e5fd596fd7e610c4" >> ${OUTPUT_DIR}/manifest
+echo "chroot-lenny chroots.hg 1a75fa5848e8" >> ${OUTPUT_DIR}/manifest
+
+XENADMIN_BRANDING_TIP=$(cd ${ROOT}/xenadmin-branding.git && git rev-parse HEAD)
+echo "xenadmin-branding xenadmin-branding.git ${XENADMIN_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
+
+SERVER_BRANDING_TIP=$(cd ${ROOT}/branding.git && git rev-parse HEAD)
+echo "branding branding.git ${SERVER_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
+
 cat ${SCRATCH_DIR}/dotnet-packages-manifest >> ${OUTPUT_DIR}/manifest
 get_BUILD_PATH=/usr/groups/xen/carbon/windowsbuilds/WindowsBuilds/${get_JOB_NAME}/${BUILD_NUMBER}
 if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]