diff --git a/subprojects/core-api/src/main/java/org/gradle/api/DomainObjectCollection.java b/subprojects/core-api/src/main/java/org/gradle/api/DomainObjectCollection.java
index be02c330dc48..ebf4c290ff24 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/DomainObjectCollection.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/DomainObjectCollection.java
@@ -168,7 +168,6 @@ public interface DomainObjectCollection<T> extends Collection<T> {
      * @param action A {@link Action} that can configure the element when required.
      * @since 4.9
      */
-    @Incubating
     void configureEach(Action<? super T> action);
 
     // note: this is here to override the default Groovy Collection.findAll { } method.
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollection.java b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollection.java
index d995011fcce5..370cb1b4761d 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollection.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollection.java
@@ -226,7 +226,6 @@ public interface NamedDomainObjectCollection<T> extends DomainObjectCollection<T
      * @throws UnknownDomainObjectException If a object with the given name is not defined.
      * @since 4.10
      */
-    @Incubating
     NamedDomainObjectProvider<T> named(String name) throws UnknownDomainObjectException;
 
     /**
@@ -238,7 +237,6 @@ public interface NamedDomainObjectCollection<T> extends DomainObjectCollection<T
      * @throws UnknownDomainObjectException If a object with the given name is not defined.
      * @since 5.0
      */
-    @Incubating
     NamedDomainObjectProvider<T> named(String name, Action<? super T> configurationAction) throws UnknownDomainObjectException;
 
     /**
@@ -250,7 +248,6 @@ public interface NamedDomainObjectCollection<T> extends DomainObjectCollection<T
      * @throws UnknownDomainObjectException If a object with the given name is not defined.
      * @since 5.0
      */
-    @Incubating
     <S extends T> NamedDomainObjectProvider<S> named(String name, Class<S> type) throws UnknownDomainObjectException;
 
     /**
@@ -264,7 +261,6 @@ public interface NamedDomainObjectCollection<T> extends DomainObjectCollection<T
      * @throws UnknownDomainObjectException If a object with the given name is not defined.
      * @since 5.0
      */
-    @Incubating
     <S extends T> NamedDomainObjectProvider<S> named(String name, Class<S> type, Action<? super S> configurationAction) throws UnknownDomainObjectException;
 
     /**
@@ -273,6 +269,5 @@ public interface NamedDomainObjectCollection<T> extends DomainObjectCollection<T
      * @since 4.10
      */
     @Internal
-    @Incubating
     NamedDomainObjectCollectionSchema getCollectionSchema();
 }
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollectionSchema.java b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollectionSchema.java
index c6c0007101c0..a45190613f8c 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollectionSchema.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectCollectionSchema.java
@@ -24,7 +24,6 @@
  * @since 4.10
  * @see NamedDomainObjectCollection
  */
-@Incubating
 public interface NamedDomainObjectCollectionSchema {
     /**
      * Returns an iterable of the schemas for each element in the collection.
@@ -36,7 +35,6 @@ public interface NamedDomainObjectCollectionSchema {
      *
      * @since 4.10
      */
-    @Incubating
     interface NamedDomainObjectSchema {
         /**
          * The name of the domain object.
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectContainer.java b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectContainer.java
index dfd696d29bd9..32dc12ec51b0 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectContainer.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectContainer.java
@@ -93,7 +93,6 @@ public interface NamedDomainObjectContainer<T> extends NamedDomainObjectSet<T>,
      * @throws InvalidUserDataException If a object with the given name already exists in this project.
      * @since 4.10
      */
-    @Incubating
     NamedDomainObjectProvider<T> register(String name, Action<? super T> configurationAction) throws InvalidUserDataException;
 
     /**
@@ -106,6 +105,5 @@ public interface NamedDomainObjectContainer<T> extends NamedDomainObjectSet<T>,
      * @throws InvalidUserDataException If a object with the given name already exists in this project.
      * @since 4.10
      */
-    @Incubating
     NamedDomainObjectProvider<T> register(String name) throws InvalidUserDataException;
 }
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectProvider.java b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectProvider.java
index 9ea17bd03114..3d4d69c78dae 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectProvider.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectProvider.java
@@ -24,7 +24,6 @@
  * @param <T> type of domain object
  * @since 4.10
  */
-@Incubating
 public interface NamedDomainObjectProvider<T> extends Provider<T> {
     /**
      * Configures the domain object with the given action. Actions are run in the order added.
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/PolymorphicDomainObjectContainer.java b/subprojects/core-api/src/main/java/org/gradle/api/PolymorphicDomainObjectContainer.java
index f1ab834cfb23..fa827877974a 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/PolymorphicDomainObjectContainer.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/PolymorphicDomainObjectContainer.java
@@ -96,7 +96,6 @@ public interface PolymorphicDomainObjectContainer<T> extends NamedDomainObjectCo
      * @throws InvalidUserDataException If a object with the given name already exists in this project.
      * @since 4.10
      */
-    @Incubating
     <U extends T> NamedDomainObjectProvider<U> register(String name, Class<U> type, Action<? super U> configurationAction) throws InvalidUserDataException;
 
     /**
@@ -111,6 +110,5 @@ public interface PolymorphicDomainObjectContainer<T> extends NamedDomainObjectCo
      * @throws InvalidUserDataException If a object with the given name already exists in this project.
      * @since 4.10
      */
-    @Incubating
     <U extends T> NamedDomainObjectProvider<U> register(String name, Class<U> type) throws InvalidUserDataException;
 }
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/provider/Provider.java b/subprojects/core-api/src/main/java/org/gradle/api/provider/Provider.java
index 56423ed71155..0a4b14dd4ee4 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/provider/Provider.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/provider/Provider.java
@@ -65,7 +65,6 @@
  * @param <T> Type of value represented by provider
  * @since 4.0
  */
-@Incubating
 @HasInternalProtocol
 @NonExtensible
 public interface Provider<T> {
@@ -120,6 +119,7 @@ public interface Provider<T> {
      * @param transformer The transformer to apply to values. Should not return {@code null}.
      * @since 5.0
      */
+    @Incubating
     <S> Provider<S> flatMap(Transformer<? extends Provider<? extends S>, ? super T> transformer);
 
     /**
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskCollection.java b/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskCollection.java
index 7ad05416d4ad..0dc3b9ae8eee 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskCollection.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskCollection.java
@@ -17,7 +17,6 @@
 
 import groovy.lang.Closure;
 import org.gradle.api.Action;
-import org.gradle.api.Incubating;
 import org.gradle.api.NamedDomainObjectSet;
 import org.gradle.api.Task;
 import org.gradle.api.UnknownTaskException;
@@ -92,7 +91,6 @@ public interface TaskCollection<T extends Task> extends NamedDomainObjectSet<T>
      * @throws UnknownTaskException If a task with the given name is not defined.
      * @since 4.9
      */
-    @Incubating
     TaskProvider<T> named(String name) throws UnknownTaskException;
 
     /**
@@ -100,7 +98,6 @@ public interface TaskCollection<T extends Task> extends NamedDomainObjectSet<T>
      *
      * @since 5.0
      */
-    @Incubating
     TaskProvider<T> named(String name, Action<? super T> configurationAction) throws UnknownTaskException;
 
 
@@ -109,7 +106,6 @@ public interface TaskCollection<T extends Task> extends NamedDomainObjectSet<T>
      *
      * @since 5.0
      */
-    @Incubating
     <S extends T> TaskProvider<S> named(String name, Class<S> type) throws UnknownTaskException;
 
     /**
@@ -117,6 +113,5 @@ public interface TaskCollection<T extends Task> extends NamedDomainObjectSet<T>
      *
      * @since 5.0
      */
-    @Incubating
     <S extends T> TaskProvider<S> named(String name, Class<S> type, Action<? super S> configurationAction) throws UnknownTaskException;
 }
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskContainer.java b/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskContainer.java
index 0aeda74ba0a6..f6afb5b1f990 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskContainer.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskContainer.java
@@ -204,7 +204,6 @@ public interface TaskContainer extends TaskCollection<Task>, PolymorphicDomainOb
      * @throws InvalidUserDataException If a task with the given name already exists in this project.
      * @since 4.9
      */
-    @Incubating
     TaskProvider<Task> register(String name, Action<? super Task> configurationAction) throws InvalidUserDataException;
 
     /**
@@ -220,7 +219,6 @@ public interface TaskContainer extends TaskCollection<Task>, PolymorphicDomainOb
      * @throws InvalidUserDataException If a task with the given name already exists in this project.
      * @since 4.9
      */
-    @Incubating
     <T extends Task> TaskProvider<T> register(String name, Class<T> type, Action<? super T> configurationAction) throws InvalidUserDataException;
 
     /**
@@ -235,7 +233,6 @@ public interface TaskContainer extends TaskCollection<Task>, PolymorphicDomainOb
      * @throws InvalidUserDataException If a task with the given name already exists in this project.
      * @since 4.9
      */
-    @Incubating
     <T extends Task> TaskProvider<T> register(String name, Class<T> type) throws InvalidUserDataException;
 
     /**
@@ -251,7 +248,6 @@ public interface TaskContainer extends TaskCollection<Task>, PolymorphicDomainOb
      * @throws NullPointerException If any of the values in {@code constructorArgs} is null.
      * @since 4.9
      */
-    @Incubating
     <T extends Task> TaskProvider<T> register(String name, Class<T> type, Object... constructorArgs) throws InvalidUserDataException;
 
     /**
@@ -264,7 +260,6 @@ public interface TaskContainer extends TaskCollection<Task>, PolymorphicDomainOb
      * @throws InvalidUserDataException If a task with the given name already exists in this project.
      * @since 4.9
      */
-    @Incubating
     TaskProvider<Task> register(String name) throws InvalidUserDataException;
 
     /**
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskProvider.java b/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskProvider.java
index d1857188629a..25f241a32031 100644
--- a/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskProvider.java
+++ b/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskProvider.java
@@ -18,7 +18,6 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectProvider;
-import org.gradle.api.Incubating;
 import org.gradle.api.Task;
 
 /**
@@ -27,7 +26,6 @@
  * @param <T> Task type
  * @since 4.8
  */
-@Incubating
 public interface TaskProvider<T extends Task> extends NamedDomainObjectProvider<T> {
     /**
      * Configures the task with the given action. Actions are run in the order added.
diff --git a/subprojects/docs/src/docs/release/notes.md b/subprojects/docs/src/docs/release/notes.md
index a5d1f14360ae..3001d99f44ae 100644
--- a/subprojects/docs/src/docs/release/notes.md
+++ b/subprojects/docs/src/docs/release/notes.md
@@ -46,6 +46,31 @@ The following are the features that have been promoted in this Gradle release.
 ### Example promoted
 -->
 
+### Configuration avoidance for Tasks
+
+[In a recent blog post](https://blog.gradle.org/preview-avoiding-task-configuration-time), we described a new API for creating and configuration `Task` instances that allow Gradle to avoid creating and configuring tasks that do not need to be executed.
+
+In this release, we now [recommend that you use this new API when working with tasks](userguide/task_configuration_avoidance.html). 
+
+By default, the Kotlin DSL [uses the new APIs](current/userguide/kotlin_dsl.html#type-safe-accessors).
+
+"Old style" task declarations in the Groovy DSL continue to be eager and force creation/configuration of any tasks created this way.
+```
+// "Old style" task declaration uses Task create API.  This always creates a task.
+task myTask(type: MyTask) {
+    // This is always called
+}
+```
+
+In Groovy, to use the new API:
+```
+tasks.register("myTask", MyTask) {
+    
+}
+```
+
+The existing API is not deprecated, but as builds transition to the new API, we will consider deprecating the API in a future release.
+
 ## Fixed issues
 
 ### Inherited configuration-wide dependency excludes are now published