diff --git a/scenario-task/src/main/java/io/spring/scenariotask/configuration/ScenarioTaskConfiguration.java b/scenario-task/src/main/java/io/spring/scenariotask/configuration/ScenarioTaskConfiguration.java
index ff203c3..6221e32 100644
--- a/scenario-task/src/main/java/io/spring/scenariotask/configuration/ScenarioTaskConfiguration.java
+++ b/scenario-task/src/main/java/io/spring/scenariotask/configuration/ScenarioTaskConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 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.
@@ -18,27 +18,34 @@ package io.spring.scenariotask.configuration;
 
 import java.util.List;
 
+import javax.sql.DataSource;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.configuration.annotation.BatchConfigurer;
+import org.springframework.batch.core.configuration.annotation.DefaultBatchConfigurer;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
 import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
 import org.springframework.batch.core.explore.JobExplorer;
 import org.springframework.batch.core.job.builder.SimpleJobBuilder;
 import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
 import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.task.configuration.EnableTask;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 /**
  * Configure the Task and or Batch components of the test application.
@@ -53,50 +60,86 @@ public class ScenarioTaskConfiguration {
 
 	private static final Log logger = LogFactory.getLog(ScenarioTaskConfiguration.class);
 
-	@Autowired
-	public JobBuilderFactory jobBuilderFactory;
-
-	@Autowired
-	public StepBuilderFactory stepBuilderFactory;
-
-	@Autowired
-	public JobExplorer jobExplorer;
-
-	@Autowired
-	public ScenarioProperties properties;
-
-	@Bean
+	@Configuration
 	@ConditionalOnProperty(
 			value = "io.spring.launchBatchJob",
 			havingValue = "true",
 			matchIfMissing = true)
-	public Job pausedemoAgain() {
-		SimpleJobBuilder jobBuilder = this.jobBuilderFactory.get(properties.getJobName())
-				.start(this.stepBuilderFactory.get(properties.getStepName())
-						.tasklet((contribution, chunkContext) -> {
-							logger.info(String.format("%s is starting", properties.getStepName()));
-							if (properties.getPauseInSeconds() > 0) {
-								logger.info(String.format("%s is pausing", properties.getStepName()));
-								Thread.sleep(properties.getPauseInSeconds() * 1000);
-							}
-							logger.info(String.format("%s is completing", properties.getStepName()));
+	static class BatchConfig {
+		@Autowired
+		public JobBuilderFactory jobBuilderFactory;
 
-							if (jobExecutionCount() == 1 && properties.isFailBatch()) {
-								throw new ExpectedException("Exception thrown during Batch Execution");
-							}
-							return RepeatStatus.FINISHED;
-						})
-						.build());
-		if (this.properties.isIncludeRunidIncrementer()) {
-			jobBuilder.incrementer(new RunIdIncrementer());
+		@Autowired
+		public StepBuilderFactory stepBuilderFactory;
+
+		@Autowired
+		public JobExplorer jobExplorer;
+
+		@Autowired
+		public ScenarioProperties properties;
+
+		@Bean
+		public Job pausedemoAgain() {
+			SimpleJobBuilder jobBuilder = this.jobBuilderFactory.get(properties.getJobName())
+					.start(this.stepBuilderFactory.get(properties.getStepName())
+							.tasklet((contribution, chunkContext) -> {
+								logger.info(String.format("%s is starting", properties.getStepName()));
+								if (properties.getPauseInSeconds() > 0) {
+									logger.info(String.format("%s is pausing", properties.getStepName()));
+									Thread.sleep(properties.getPauseInSeconds() * 1000);
+								}
+								logger.info(String.format("%s is completing", properties.getStepName()));
+
+								if (jobExecutionCount() == 1 && properties.isFailBatch()) {
+									throw new ExpectedException("Exception thrown during Batch Execution");
+								}
+								return RepeatStatus.FINISHED;
+							})
+							.build());
+			if (this.properties.isIncludeRunidIncrementer()) {
+				jobBuilder.incrementer(new RunIdIncrementer());
+			}
+			return jobBuilder.build();
 		}
-		return jobBuilder.build();
-	}
 
-	private int jobExecutionCount() {
-		JobInstance jobInstance = jobExplorer.getLastJobInstance(this.properties.getJobName());
-		List<JobExecution> jobExecutions = jobExplorer.getJobExecutions(jobInstance);
-		return jobExecutions.size();
+		/**
+		 * Override default transaction isolation level 'ISOLATION_REPEATABLE_READ' which Oracle does not
+		 * support.
+		 */
+		@Configuration
+		@ConditionalOnProperty(value = "spring.datasource.driver", havingValue = "oracle.jdbc.OracleDriver")
+		static class OracleBatchConfig {
+			@Bean
+			BatchConfigurer oracleBatchConfigurer(DataSource dataSource) {
+				return new DefaultBatchConfigurer() {
+					@Override
+					public JobRepository getJobRepository() {
+						JobRepositoryFactoryBean factoryBean = new JobRepositoryFactoryBean();
+						factoryBean.setDatabaseType("ORACLE");
+						factoryBean.setDataSource(dataSource);
+						factoryBean.setTransactionManager(getTransactionManager());
+						factoryBean.setIsolationLevelForCreate("ISOLATION_READ_COMMITTED");
+						try {
+							return factoryBean.getObject();
+						}
+						catch (Exception e) {
+							throw new BeanCreationException(e.getMessage(), e);
+						}
+					}
+
+					@Override
+					public DataSourceTransactionManager getTransactionManager() {
+						return new DataSourceTransactionManager(dataSource);
+					}
+				};
+			}
+		}
+
+		private int jobExecutionCount() {
+			JobInstance jobInstance = jobExplorer.getLastJobInstance(this.properties.getJobName());
+			List<JobExecution> jobExecutions = jobExplorer.getJobExecutions(jobInstance);
+			return jobExecutions.size();
+		}
 	}
 
 	/**