diff --git a/jberet-core/pom.xml b/jberet-core/pom.xml
index 61b0515c2..33c4cd15a 100644
--- a/jberet-core/pom.xml
+++ b/jberet-core/pom.xml
@@ -42,8 +42,8 @@
             <artifactId>jakarta.transaction-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-security-manager</artifactId>
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
diff --git a/jberet-job-repositories/batchlet/pom.xml b/jberet-job-repositories/batchlet/pom.xml
new file mode 100644
index 000000000..8b1501e13
--- /dev/null
+++ b/jberet-job-repositories/batchlet/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2012-2014 Red Hat, Inc. and/or its affiliates.
+
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jberet</groupId>
+        <artifactId>jberet-job-repositories</artifactId>
+        <version>2.0.3.Final-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jberet-job-repository-batchlet</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jberet</groupId>
+            <artifactId>jberet-infinispan-repository</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jberet</groupId>
+            <artifactId>jberet-mongo-repository</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/jberet-core/src/main/java/org/jberet/repository/PurgeBatchlet.java b/jberet-job-repositories/batchlet/src/main/java/org/jberet/repository/PurgeBatchlet.java
similarity index 100%
rename from jberet-core/src/main/java/org/jberet/repository/PurgeBatchlet.java
rename to jberet-job-repositories/batchlet/src/main/java/org/jberet/repository/PurgeBatchlet.java
diff --git a/jberet-job-repositories/infinispan-repository/pom.xml b/jberet-job-repositories/infinispan-repository/pom.xml
new file mode 100644
index 000000000..1056e41a3
--- /dev/null
+++ b/jberet-job-repositories/infinispan-repository/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2012-2014 Red Hat, Inc. and/or its affiliates.
+
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jberet</groupId>
+        <artifactId>jberet-job-repositories</artifactId>
+        <version>2.0.3.Final-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jberet-infinispan-repository</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-commons</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/jberet-core/src/main/java/org/jberet/repository/InfinispanRepository.java b/jberet-job-repositories/infinispan-repository/src/main/java/org/jberet/repository/InfinispanRepository.java
similarity index 100%
rename from jberet-core/src/main/java/org/jberet/repository/InfinispanRepository.java
rename to jberet-job-repositories/infinispan-repository/src/main/java/org/jberet/repository/InfinispanRepository.java
diff --git a/jberet-job-repositories/mongo-repository/pom.xml b/jberet-job-repositories/mongo-repository/pom.xml
new file mode 100644
index 000000000..5b405eccc
--- /dev/null
+++ b/jberet-job-repositories/mongo-repository/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2012-2014 Red Hat, Inc. and/or its affiliates.
+
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jberet</groupId>
+        <artifactId>jberet-job-repositories</artifactId>
+        <version>2.0.3.Final-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jberet-mongo-repository</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/jberet-core/src/main/java/org/jberet/repository/MongoRepository.java b/jberet-job-repositories/mongo-repository/src/main/java/org/jberet/repository/MongoRepository.java
similarity index 100%
rename from jberet-core/src/main/java/org/jberet/repository/MongoRepository.java
rename to jberet-job-repositories/mongo-repository/src/main/java/org/jberet/repository/MongoRepository.java
diff --git a/jberet-job-repositories/pom.xml b/jberet-job-repositories/pom.xml
new file mode 100644
index 000000000..a7157b381
--- /dev/null
+++ b/jberet-job-repositories/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2012-2014 Red Hat, Inc. and/or its affiliates.
+
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jberet</groupId>
+        <artifactId>jberet-parent</artifactId>
+        <version>2.0.3.Final-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jberet-job-repositories</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>mongo-repository</module>
+        <module>infinispan-repository</module>
+        <module>batchlet</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jberet</groupId>
+            <artifactId>jberet-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/jberet-se/pom.xml b/jberet-se/pom.xml
index 3f4ebd0d7..677b7b124 100644
--- a/jberet-se/pom.xml
+++ b/jberet-se/pom.xml
@@ -31,6 +31,16 @@ SPDX-License-Identifier: EPL-2.0
             <artifactId>jberet-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jberet</groupId>
+            <artifactId>jberet-infinispan-repository</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jberet</groupId>
+            <artifactId>jberet-mongo-repository</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
diff --git a/pom.xml b/pom.xml
index d42190944..341bab68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,7 @@
     <modules>
         <module>jberet-core</module>
         <module>jberet-se</module>
+        <module>jberet-job-repositories</module>
         <module>jberet-se-bom</module>
         <module>jberet-manifest</module>
         <module>test-apps</module>