diff --git a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
index c333706c7..76fac18e4 100644
--- a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
+++ b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
@@ -74,6 +74,12 @@
     </ItemGroup>
     -->
 
+    <ItemGroup>
+        <UpToDateCheckOutput Include="$(Il2cpuOutput)" />
+        <UpToDateCheckOutput Include="$(NasmOutput)" />
+        <UpToDateCheckOutput Include="$(IsoFile)" />
+    </ItemGroup>
+
     <ItemGroup Condition="'$(KernelPkg)' == ''">
         <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Core_Asm.dll" />
         <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Core_Plugs.dll" />
@@ -101,6 +107,10 @@
     <UsingTask TaskName="Cosmos.Build.Tasks.ReadNasmMapToDebugInfo" AssemblyFile="$(CosmosBuildTasksAssembly)" />
     <UsingTask TaskName="Cosmos.Build.Tasks.TheRingMaster" AssemblyFile="$(CosmosBuildTasksAssembly)" />
 
+    <PropertyGroup>
+        <CoreBuildDependsOn>$(CoreBuildDependsOn);CosmosBuild</CoreBuildDependsOn>
+    </PropertyGroup>
+
     <PropertyGroup>
         <CosmosBuildDependsOn>
             FailIfRelease;
@@ -114,7 +124,7 @@
         </CosmosBuildDependsOn>
     </PropertyGroup>
 
-    <Target Name="CosmosBuild" AfterTargets="Build" DependsOnTargets="$(CosmosBuildDependsOn)" />
+    <Target Name="CosmosBuild" DependsOnTargets="$(CosmosBuildDependsOn)" />
 
     <Target Name="FailIfRelease" Condition="'$(Configuration)' == 'Release'">
         <Error Text="The Release configuration isn't currently supported!" />