diff --git a/produce_tunedimage.sh b/produce_tunedimage.sh
index 26e879a..d55cfa6 100755
--- a/produce_tunedimage.sh
+++ b/produce_tunedimage.sh
@@ -3,8 +3,8 @@
 scriptroot="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 
-rm -r -f $scriptroot/src/ApiTemplate/tibcdata
-mkdir -p $scriptroot/src/ApiTemplate/tibcdata
-cp $scriptroot/tibcdata/* $scriptroot/src/ApiTemplate/tibcdata
+rm -r -f $scriptroot/src/coreclrbin/tibcdata
+mkdir -p $scriptroot/src/coreclrbin/tibcdata
+cp $scriptroot/tibcdata/* $scriptroot/src/coreclrbin/tibcdata
 
-dotnet publish -c Release src/ApiTemplate/ApiTemplate.csproj -o publish -p:SelfContained=true -p:UseStaticHost=true -p:UsePublishFilterList=true -p:PublishTrimmed=true -p:PublishReadyToRun=true -p:UseTibcData=true -p:UseCrossgen2=true $1
+dotnet publish -c Release src/ApiTemplate/ApiTemplate.csproj -o publish -p:LinkAggressively=true -p:SelfContained=true -p:UseStaticHost=true -p:UsePublishFilterList=true -p:PublishTrimmed=true -p:PublishReadyToRun=true -p:UseTibcData=true -p:UseCrossgen2=true $1
diff --git a/src/CustomR2RLogic.targets b/src/CustomR2RLogic.targets
index 0650e5c..f674057 100644
--- a/src/CustomR2RLogic.targets
+++ b/src/CustomR2RLogic.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TibcDir>$(MSBuildProjectDirectory)/tibcdata/</TibcDir>
+    <TibcDir>$(CoreClrBinariesDir)tibcdata/</TibcDir>
   </PropertyGroup>
 
   <!-- These targets will use the locally-built crossgen, which doesn't take /JITPath -->