diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..c0eee2a
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir;Configuration">
+  <PropertyGroup>
+    <RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>$(RepositoryRootDirectory)\build\$(MSBuildProjectName)\$(Configuration)\bin\</OutputPath>
+    <BaseIntermediateOutputPath>$(RepositoryRootDirectory)\build\$(MSBuildProjectName)\$(Configuration)\obj\</BaseIntermediateOutputPath>
+    <_WatchTarget>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).dotnetwatch.g.targets</_WatchTarget>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e6dc635..7ad1119 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER 1
 # WORKDIR /app
 RUN mkdir /app
 COPY ./src/*.csproj /app
+COPY ./Directory.Build.props /
 WORKDIR /app
 RUN dotnet restore
 
diff --git a/src/WatchRunDocker.csproj b/src/WatchRunDocker.csproj
index 93d766d..33034b3 100644
--- a/src/WatchRunDocker.csproj
+++ b/src/WatchRunDocker.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <_WatchTarget>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).dotnetwatch.g.targets</_WatchTarget>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
@@ -10,9 +11,6 @@
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
   </ItemGroup>
-  <PropertyGroup>
-    <BaseIntermediateOutputPath>..\build\$(AssemblyName)\obj</BaseIntermediateOutputPath>
-    <IntermediateOutputPath Condition=" '$(PlatformName)' == 'AnyCPU' ">$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
-    <IntermediateOutputPath Condition=" '$(PlatformName)' != 'AnyCPU' ">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
+   <!-- This is a temporary workaround suggested to handle a known issue with watcher -->
+   <Import Project="$(_WatchTarget)" Condition="Exists('$(_WatchTarget)')" />  
 </Project>
\ No newline at end of file