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 67fb991f5..1e8b8ceec 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
@@ -46,8 +46,7 @@ public class JobBuilder extends JobBuilderHelper<JobBuilder> {
 	 * @since 5.0
 	 */
 	public JobBuilder(String name, JobRepository jobRepository) {
-		super(name);
-		super.repository(jobRepository);
+		super(name, jobRepository);
 	}
 
 	/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
index df1f262e0..70c95a821 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
@@ -54,11 +54,29 @@ public abstract class JobBuilderHelper<B extends JobBuilderHelper<B>> {
 
 	private final CommonJobProperties properties;
 
+	/**
+	 * Create a new {@link JobBuilderHelper}.
+	 * @param name the job name
+	 * @deprecated use {@link JobBuilderHelper#JobBuilderHelper(String, JobRepository)}
+	 */
+	@Deprecated(since = "5.1", forRemoval = true)
 	public JobBuilderHelper(String name) {
 		this.properties = new CommonJobProperties();
 		properties.name = name;
 	}
 
+	/**
+	 * Create a new {@link JobBuilderHelper}.
+	 * @param name the job name
+	 * @param jobRepository the job repository
+	 * @since 5.1
+	 */
+	public JobBuilderHelper(String name, JobRepository jobRepository) {
+		this.properties = new CommonJobProperties();
+		properties.name = name;
+		properties.jobRepository = jobRepository;
+	}
+
 	/**
 	 * Create a new builder initialized with any properties in the parent. The parent is
 	 * copied, so it can be re-used.
@@ -96,7 +114,9 @@ public abstract class JobBuilderHelper<B extends JobBuilderHelper<B>> {
 	 * Sets the job repository for the job.
 	 * @param jobRepository the job repository (mandatory)
 	 * @return this to enable fluent chaining
+	 * @deprecated use {@link JobBuilderHelper#JobBuilderHelper(String, JobRepository)}
 	 */
+	@Deprecated(since = "5.1", forRemoval = true)
 	public B repository(JobRepository jobRepository) {
 		properties.jobRepository = jobRepository;
 		@SuppressWarnings("unchecked")
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 cc630862e..8d49029a7 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
@@ -51,8 +51,7 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
 	 * @since 5.0
 	 */
 	public StepBuilder(String name, JobRepository jobRepository) {
-		super(name);
-		super.repository(jobRepository);
+		super(name, jobRepository);
 	}
 
 	/**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
index 3a7110655..2aea089f1 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilderHelper.java
@@ -53,11 +53,29 @@ public abstract class StepBuilderHelper<B extends StepBuilderHelper<B>> {
 
 	protected final CommonStepProperties properties;
 
+	/**
+	 * Create a new {@link StepBuilderHelper}.
+	 * @param name the step name
+	 * @deprecated use {@link StepBuilderHelper#StepBuilderHelper(String, JobRepository)}
+	 */
+	@Deprecated(since = "5.1", forRemoval = true)
 	public StepBuilderHelper(String name) {
 		this.properties = new CommonStepProperties();
 		properties.name = name;
 	}
 
+	/**
+	 * Create a new {@link StepBuilderHelper}.
+	 * @param name the step name
+	 * @param jobRepository the job repository
+	 * @since 5.1
+	 */
+	public StepBuilderHelper(String name, JobRepository jobRepository) {
+		this.properties = new CommonStepProperties();
+		properties.name = name;
+		properties.jobRepository = jobRepository;
+	}
+
 	/**
 	 * Create a new builder initialized with any properties in the parent. The parent is
 	 * copied, so it can be re-used.
@@ -67,6 +85,13 @@ public abstract class StepBuilderHelper<B extends StepBuilderHelper<B>> {
 		this.properties = new CommonStepProperties(parent.properties);
 	}
 
+	/**
+	 * Set the job repository
+	 * @param jobRepository the repository to set
+	 * @return this to enable fluent chaining
+	 * @deprecated use {@link StepBuilderHelper#StepBuilderHelper(String, JobRepository)}
+	 */
+	@Deprecated(since = "5.1", forRemoval = true)
 	public B repository(JobRepository jobRepository) {
 		properties.jobRepository = jobRepository;
 		return self();