diff --git a/releng/build-scripts/bin/createRepository-hipp.sh b/releng/build-scripts/bin/createRepository-hipp.sh
index d8de2bc..e1b9ba0 100755
--- a/releng/build-scripts/bin/createRepository-hipp.sh
+++ b/releng/build-scripts/bin/createRepository-hipp.sh
@@ -2,7 +2,7 @@
 
 # OPTIONAL VARIABLES TO BE SUPPLIED VIA ENV:
 # 	SIGN (unset or nosign)
-# 	PROMOTE (unset or true)
+# 	PROMOTE (unset or false or target directory)
 
 BASE=`pwd`
 
@@ -237,13 +237,13 @@
 if [ "${PROMOTE}" != "false" ]
 then
 	BUILDID=`echo $OTDTVERSION | cut -d '.' -f 4`
-	if [ "${PROMOTE}" == "staging" ]
+	if [ "${PROMOTE}" != "" ]
 	then
-            DEST=${UPDATES_BASE}/${2}/staging
-            /bin/rm -rf ${DEST}
-        else
-            DEST=${UPDATES_BASE}/${2}/${BUILDID}
-        fi
+        DEST=${UPDATES_BASE}/${2}/${PROMOTE}
+        /bin/rm -rf ${DEST}
+    else
+        DEST=${UPDATES_BASE}/${2}/${BUILDID}
+    fi
 	echo "====Step 11: promote to ${DEST}===="
 	if [ -d ${UPDATES_BASE}/${2} ]
 	then
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index d86e505..2aab6fd 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -65,7 +65,8 @@
 
 		<!--	directories for update sites: -->
 		<property name="compilerUpdatesDir"		value="${user.dir}/updateSiteCompiler"/>
-		<property name="previousPublishedUpdatesDir"		value="http://download.eclipse.org/objectteams/updates/ot2.7/previous"/>
+		<!-- TODO: extract to prerequisistes? -->
+		<property name="compilerUpdatesDir"     value="http://download.eclipse.org/objectteams/updates/ot2.7/compiler"/>
 		<property name="otdtUpdatesDir" 		value="${user.dir}/updateSite"/>
 		<property name="testsUpdatesDirBase" 	value="${user.dir}/updateSiteTests"/>
 			<!-- will have sub directories "eclipse" and "otdt" -->
@@ -264,11 +265,11 @@
 		<!-- Now we should have an update site with the patch feature, time to install it into base: -->
         <ant antfile="${OTScriptDir}/p2helper.xml" target="installFeatureFromUrl" dir="${baseLocation}">
             <property name="feature" value="org.eclipse.objectteams.otdt.core.patch.feature.group"/>
-            <property name="sourceUpdatesUrl" value="${previousPublishedUpdatesDir}"/>
+            <property name="sourceUpdatesUrl" value="${compilerUpdatesDir}"/>
             <property name="targetEclipseDir" value="${baseLocation}"/>
         </ant>
 		<delete>
-		    <fileset dir="${baseLocation}/plugins/" includes="org.eclipse.jdt.core_3.14.0.v2018*" />
+		    <fileset dir="${baseLocation}/plugins/" includes="org.eclipse.jdt.core_*.v* org.eclipse.jdt.core.source_*.v*" />
 		</delete>
     </target>