diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh
index 336e6ff8408..59f8eae5fc9 100755
--- a/releng/org.eclipse.rse.build/go.sh
+++ b/releng/org.eclipse.rse.build/go.sh
@@ -66,7 +66,8 @@ command="$command -DbuildType=${buildType} "
 command="$command -DbuildId=${buildId} "
 command="$command -DmapVersionTag=${tag} "
 command="$command -DdoPublish=true "
-command="$command -DforceContextQualifier=${buildId} "
+#command="$command -DforceContextQualifier=${buildId} "
+command="$command -DforceContextQualifier=${mydstamp}${mytstamp} "
 command="$command -DfetchTag=HEAD "
 command="$command -DskipFetch "
 command="$command -Dmydstamp=${mydstamp} "
diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
index fefdbc05770..ba821fdf805 100755
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ b/releng/org.eclipse.rse.build/nightly.sh
@@ -93,7 +93,8 @@ command="$command -DmapVersionTag=${tag} "
 command="$command -Dmydstamp=${mydstamp} "
 command="$command -Dmytstamp=${mytstamp} "
 if [ "$buildType" = "N" ]; then
-  command="$command -DforceContextQualifier=${buildId} "
+  #command="$command -DforceContextQualifier=${buildId} "
+  command="$command -DforceContextQualifier=${mydstamp}${mytstamp} "
   command="$command -DfetchTag=HEAD "
 fi
 command="$command -DdoPublish=true "
diff --git a/releng/org.eclipse.tm.releng/build.xml b/releng/org.eclipse.tm.releng/build.xml
index c1cf906db6a..f008cc5e5c2 100644
--- a/releng/org.eclipse.tm.releng/build.xml
+++ b/releng/org.eclipse.tm.releng/build.xml
@@ -21,7 +21,7 @@
 		<tstamp>
 			<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
 		</tstamp>
-		<property name="forceContextQualifier" value="v${buildTimestamp}" />
+		<property name="forceContextQualifier" value="${buildTimestamp}" />
 
 		<!-- 1. Import these projects using File > Import > Team Project Set > ./psfs/athena.psf.
 			 2. Close the org.eclipse.releng.basebuilder project - it does not need to compile to be of use.