diff --git a/build.mill b/build.mill
index c3cb65ff74d..02b4f126b8a 100644
--- a/build.mill
+++ b/build.mill
@@ -606,7 +606,7 @@ trait BridgeModule extends MillPublishJavaModule with CrossScalaModule {
     ivy"org.scala-lang:scala-compiler:${crossScalaVersion}"
   )
 
-  def resources = Task.Sources {
+  def resources = Task {
     os.copy(generatedSources().head.path / "META-INF", Task.dest / "META-INF")
     Seq(PathRef(Task.dest))
   }
diff --git a/contrib/playlib/src/mill/playlib/Layout.scala b/contrib/playlib/src/mill/playlib/Layout.scala
index d769b63184f..d5492e33160 100644
--- a/contrib/playlib/src/mill/playlib/Layout.scala
+++ b/contrib/playlib/src/mill/playlib/Layout.scala
@@ -8,6 +8,6 @@ private[playlib] trait Layout extends JavaModule {
   def conf = Task.Sources { millSourcePath / "conf" }
   def app = Task.Sources { millSourcePath / "app" }
 
-  override def sources = Task.Sources { app() }
-  override def resources = Task.Sources { conf() }
+  override def sources = Task { app() }
+  override def resources = Task { conf() }
 }
diff --git a/contrib/playlib/src/mill/playlib/Twirl.scala b/contrib/playlib/src/mill/playlib/Twirl.scala
index 380f0bbdc5c..367d3d6d0df 100644
--- a/contrib/playlib/src/mill/playlib/Twirl.scala
+++ b/contrib/playlib/src/mill/playlib/Twirl.scala
@@ -5,7 +5,7 @@ import mill.twirllib._
 
 trait Twirl extends TwirlModule with Layout {
 
-  override def twirlSources = Task.Sources { app() }
+  override def twirlSources = Task { app() }
 
   override def twirlImports = Task {
     super.twirlImports() ++ Seq(
diff --git a/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala b/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala
index a6a97db4d6f..51629d2fc86 100644
--- a/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala
@@ -40,7 +40,7 @@ object PlayModuleTests extends TestSuite with PlayTestSuite {
               app.value.map(_.path.relativeTo(playmulti.millSourcePath).toString()) == Seq(
                 "core/app"
               ),
-              sources == app,
+              sources.value == app.value,
               resources.value.map(_.path.relativeTo(playmulti.millSourcePath).toString()).contains(
                 "core/conf"
               ),
diff --git a/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala b/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala
index dd90a34bcd1..34773f2fcad 100644
--- a/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala
@@ -38,8 +38,8 @@ object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
             "conf"
           ),
           app.value.map(_.path.relativeTo(playsingleapi.millSourcePath).toString()) == Seq("app"),
-          sources == app,
-          resources == conf,
+          sources.value == app.value,
+          resources.value == conf.value,
           testSources.value.map(
             _.path.relativeTo(playsingleapi.millSourcePath).toString()
           ) == Seq(
diff --git a/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala b/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala
index 698fc0c98d3..17f00324481 100644
--- a/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala
@@ -27,7 +27,7 @@ object PlaySingleModuleTests extends TestSuite with PlayTestSuite {
         assert(
           conf.value.map(_.path.relativeTo(playsingle.millSourcePath).toString()) == Seq("conf"),
           app.value.map(_.path.relativeTo(playsingle.millSourcePath).toString()) == Seq("app"),
-          sources == app,
+          sources.value == app.value,
           resources.value.map(_.path.relativeTo(playsingle.millSourcePath).toString()).contains(
             "conf"
           ),
diff --git a/contrib/scoverage/src/mill/contrib/scoverage/ScoverageModule.scala b/contrib/scoverage/src/mill/contrib/scoverage/ScoverageModule.scala
index f30b3798d1b..121899d8bb3 100644
--- a/contrib/scoverage/src/mill/contrib/scoverage/ScoverageModule.scala
+++ b/contrib/scoverage/src/mill/contrib/scoverage/ScoverageModule.scala
@@ -156,8 +156,8 @@ trait ScoverageModule extends ScalaModule { outer: ScalaModule =>
     override def allSources: T[Seq[PathRef]] = Task { outer.allSources() }
     override def moduleDeps: Seq[JavaModule] = outer.moduleDeps
     override def compileModuleDeps: Seq[JavaModule] = outer.compileModuleDeps
-    override def sources: T[Seq[PathRef]] = Task.Sources { outer.sources() }
-    override def resources: T[Seq[PathRef]] = Task.Sources { outer.resources() }
+    override def sources: T[Seq[PathRef]] = Task { outer.sources() }
+    override def resources: T[Seq[PathRef]] = Task { outer.resources() }
     override def scalaVersion = Task { outer.scalaVersion() }
     override def repositoriesTask: Task[Seq[Repository]] = Task.Anon { outer.repositoriesTask() }
     override def compileIvyDeps: T[Agg[Dep]] = Task { outer.compileIvyDeps() }
diff --git a/example/extending/metabuild/4-meta-build/build.mill b/example/extending/metabuild/4-meta-build/build.mill
index 9e485be1108..0bc45bf79f2 100644
--- a/example/extending/metabuild/4-meta-build/build.mill
+++ b/example/extending/metabuild/4-meta-build/build.mill
@@ -11,7 +11,7 @@ object `package` extends RootModule with ScalaModule {
   )
 
   def htmlSnippet = Task { h1("hello").toString }
-  def resources = Task.Sources {
+  def resources = Task {
     os.write(Task.dest / "snippet.txt", htmlSnippet())
     super.resources() ++ Seq(PathRef(Task.dest))
   }
diff --git a/example/pythonlib/module/3-override-tasks/build.mill b/example/pythonlib/module/3-override-tasks/build.mill
index 2a9b231227e..d9f408e6316 100644
--- a/example/pythonlib/module/3-override-tasks/build.mill
+++ b/example/pythonlib/module/3-override-tasks/build.mill
@@ -2,7 +2,7 @@ package build
 import mill._, pythonlib._
 
 object foo extends PythonModule {
-  def sources = Task.Sources {
+  def sources = Task {
     val destPath = Task.dest / "src"
     os.makeDir.all(destPath)
 
@@ -20,7 +20,7 @@ object foo extends PythonModule {
     Seq(PathRef(destPath))
   }
 
-  def mainScript = Task.Source { sources().head.path / "foo.py" }
+  def mainScript = Task { PathRef(sources().head.path / "foo.py") }
 
   def typeCheck = Task {
     println("Type Checking...")
@@ -53,7 +53,7 @@ object foo2 extends PythonModule {
     Seq(PathRef(destPath))
   }
 
-  def mainScript = Task.Source { generatedSources().head.path / "foo.py" }
+  def mainScript = Task { PathRef(generatedSources().head.path / "foo.py") }
 
 }
 
@@ -64,7 +64,7 @@ object foo3 extends PythonModule {
     os.write(destPath / "foo.py", """...""")
     super.sources() ++ Seq(PathRef(destPath))
   }
-  def mainScript = Task.Source { sources().head.path / "foo.py" }
+  def mainScript = Task { PathRef(sources().head.path / "foo.py") }
 
 }
 
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala
index 9c0f144e941..6d1344b5d1b 100644
--- a/scalalib/src/mill/scalalib/JavaModule.scala
+++ b/scalalib/src/mill/scalalib/JavaModule.scala
@@ -919,7 +919,7 @@ trait JavaModule
    * Typically, includes the source files to generate documentation from.
    * @see [[docResources]]
    */
-  def docSources: T[Seq[PathRef]] = Task.Sources(allSources())
+  def docSources: T[Seq[PathRef]] = Task { allSources() }
 
   /**
    * Extra directories to be copied into the documentation.
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index f88b7f5773a..deda05f2120 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -308,7 +308,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
       }
     }
 
-  override def docSources: T[Seq[PathRef]] = Task.Sources {
+  override def docSources: T[Seq[PathRef]] = Task {
     if (
       ZincWorkerUtil.isScala3(scalaVersion()) && !ZincWorkerUtil.isScala3Milestone(scalaVersion())
     ) Seq(compile().classes)