diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
index 93ef4c63d..67fb991f5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public class JobBuilder extends JobBuilderHelper<JobBuilder> {
 	 * @param name the name of the job
 	 * @deprecated use {@link JobBuilder#JobBuilder(String, JobRepository)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public JobBuilder(String name) {
 		super(name);
 	}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
index a6982ebc9..cc630862e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
 	 * @param name the name of the step
 	 * @deprecated use {@link StepBuilder#StepBuilder(String, JobRepository)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public StepBuilder(String name) {
 		super(name);
 	}
@@ -61,7 +61,7 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
 	 * @return a {@link TaskletStepBuilder}
 	 * @deprecated use {@link StepBuilder#tasklet(Tasklet, PlatformTransactionManager)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public TaskletStepBuilder tasklet(Tasklet tasklet) {
 		return new TaskletStepBuilder(this).tasklet(tasklet);
 	}
@@ -93,7 +93,7 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
 	 * @param <O> the type of item to be output
 	 * @deprecated use {@link StepBuilder#chunk(int, PlatformTransactionManager)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public <I, O> SimpleStepBuilder<I, O> chunk(int chunkSize) {
 		return new SimpleStepBuilder<I, O>(this).chunk(chunkSize);
 	}
@@ -138,7 +138,7 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
 	 * @deprecated use
 	 * {@link StepBuilder#chunk(CompletionPolicy, PlatformTransactionManager)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public <I, O> SimpleStepBuilder<I, O> chunk(CompletionPolicy completionPolicy) {
 		return new SimpleStepBuilder<I, O>(this).chunk(completionPolicy);
 	}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
index 385b9b085..bf4aad229 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class TaskletStepBuilder extends AbstractTaskletStepBuilder<TaskletStepBu
 	 * @deprecated use
 	 * {@link TaskletStepBuilder#tasklet(Tasklet, PlatformTransactionManager)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public TaskletStepBuilder tasklet(Tasklet tasklet) {
 		this.tasklet = tasklet;
 		return this;
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
index 2411966db..daf2fd19d 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ public class RemoteChunkingManagerStepBuilder<I, O> extends FaultTolerantStepBui
 	 * @deprecated use
 	 * {@link RemoteChunkingManagerStepBuilder#RemoteChunkingManagerStepBuilder(String, JobRepository)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public RemoteChunkingManagerStepBuilder(String stepName) {
 		super(new StepBuilder(stepName));
 	}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java
index 0bb92a36e..60178e3da 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ public class RemotePartitioningManagerStepBuilder extends PartitionStepBuilder {
 	 * @deprecated use
 	 * {@link RemotePartitioningManagerStepBuilder#RemotePartitioningManagerStepBuilder(String, JobRepository)}
 	 */
-	@Deprecated
+	@Deprecated(since = "5.0", forRemoval = true)
 	public RemotePartitioningManagerStepBuilder(String stepName) {
 		super(new StepBuilder(stepName));
 	}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java
index 7f6dda318..0b8e88967 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder {
 	 * @deprecated use
 	 * {@link RemotePartitioningWorkerStepBuilder#RemotePartitioningWorkerStepBuilder(String, JobRepository)}
 	 */
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	public RemotePartitioningWorkerStepBuilder(String name) {
 		super(name);
 	}
@@ -187,7 +187,7 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder {
 		return this;
 	}
 
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	@Override
 	public TaskletStepBuilder tasklet(Tasklet tasklet) {
 		configureWorkerIntegrationFlow();
@@ -200,7 +200,7 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder {
 		return super.tasklet(tasklet, transactionManager);
 	}
 
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	@Override
 	public <I, O> SimpleStepBuilder<I, O> chunk(int chunkSize) {
 		configureWorkerIntegrationFlow();
@@ -213,7 +213,7 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder {
 		return super.chunk(chunkSize, transactionManager);
 	}
 
-	@Deprecated(since = "5.0")
+	@Deprecated(since = "5.0", forRemoval = true)
 	@Override
 	public <I, O> SimpleStepBuilder<I, O> chunk(CompletionPolicy completionPolicy) {
 		configureWorkerIntegrationFlow();