diff --git a/releng/build-scripts/build/OT-Compiler/customTargets.xml b/releng/build-scripts/build/OT-Compiler/customTargets.xml
index 7a23053..cea1858 100644
--- a/releng/build-scripts/build/OT-Compiler/customTargets.xml
+++ b/releng/build-scripts/build/OT-Compiler/customTargets.xml
@@ -53,8 +53,7 @@
 	<!-- ===================================================================== -->
 	<target name="getMapFiles">
 		<mkdir dir="${buildDirectory}/maps"/>
-		<echo message="REMEMBER: this is a workaround which requires manual pulling in ${git.repository.path}."/>
-		<copy file="${git.repository.path}/${pathToMapFile}/${mapFileName}" todir="${buildDirectory}/maps/" />
+		<copy file="${map.file.path}" todir="${buildDirectory}/maps/" />
 	</target>
 	
 	<!-- ===================================================================== -->
diff --git a/releng/build-scripts/build/OTDT-Build/customTargets.xml b/releng/build-scripts/build/OTDT-Build/customTargets.xml
index d9676d5..dd930a2 100644
--- a/releng/build-scripts/build/OTDT-Build/customTargets.xml
+++ b/releng/build-scripts/build/OTDT-Build/customTargets.xml
@@ -44,8 +44,7 @@
 		-->
 
 		<mkdir dir="${buildDirectory}/maps"/>
-		<echo message="REMEMBER: this is a workaround which requires manual pulling in ${git.repository.path}."/>
-		<copy file="${git.repository.path}/${pathToMapFile}/${mapFileName}" todir="${buildDirectory}/maps/" />
+		<copy file="${map.file.path}" todir="${buildDirectory}/maps/" />
 	</target>
 
 	<target name="checkLocalMaps">
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 15a4b88..1963ca8 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -15,9 +15,8 @@
 # this one is used by eclipse junit tests:
 vmargs=-Xmx768m -XX:-UseGCOverheadLimit
 
-# GIT repository information (FIXME: WORKAROUND):
-git.repository.path=/shared/tools/objectteams/gitCache/git___git_eclipse_org_gitroot_objectteams_org_eclipse_objectteams_git/
-pathToMapFile=releng/map
+# the map file is expected to be checked out into this location prior to calling the main script:
+map.file.path=/shared/tools/objectteams/releng/map/otdt.map
 
 # Version dependent names:
 
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 049db50..2d709e7 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -221,9 +221,7 @@
 	            <arg value="-Dtest.root.dir=${test.root.dir}"/>
 	            <arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
 	            <arg value="-DmapVersionTag=${mapVersionTag}"/>
-	            <arg value="-DpathToMapFile=${pathToMapFile}"/>
-		    	<arg value="-DmapFileName=otdt.map"/>
-		    	<arg value="-Dgit.repository.path=${git.repository.path}"/>
+		    	<arg value="-Dmap.file.path=${map.file.path}"/>
 	            <arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
 	            <arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
 	            <!--arg value="-verbose" /-->
@@ -299,10 +297,8 @@
 				<arg value="-Dbasearch=${arch}"/>
 				<arg value="-Dtest.root.dir=${test.root.dir}"/>
 				<arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
-				<arg value="-Dgit.repository.path=${git.repository.path}"/>
+				<arg value="-Dmap.file.path=${map.file.path}"/>
 				<arg value="-DmapVersionTag=${mapVersionTag}"/>
-				<arg value="-DpathToMapFile=${pathToMapFile}"/>
-				<arg value="-DmapFileName=otdt.map"/>
 				<arg value="-Ddo.run.tests=${do.run.tests}"/>
 				<arg value="-Ddo.build.all=${do.build.all}"/>
 				<arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>