diff --git a/jans-orm/couchbase-libs/pom.xml b/jans-orm/couchbase-libs/pom.xml
new file mode 100644
index 00000000000..fa55cf43e7f
--- /dev/null
+++ b/jans-orm/couchbase-libs/pom.xml
@@ -0,0 +1,45 @@
+<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>
+	<artifactId>jans-orm-couchbase-libs</artifactId>
+	<packaging>pom</packaging>
+	<name>jans-orm-couchbase-libs</name>
+
+	<parent>
+		<groupId>io.jans</groupId>
+		<artifactId>jans-orm-parent</artifactId>
+		<version>1.0.3-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.couchbase.client</groupId>
+			<artifactId>java-client</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- maven-assembly-plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>make-assembly-dist</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/deps.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/jans-orm/couchbase-libs/src/assembly/deps.xml b/jans-orm/couchbase-libs/src/assembly/deps.xml
new file mode 100644
index 00000000000..57cd19a440e
--- /dev/null
+++ b/jans-orm/couchbase-libs/src/assembly/deps.xml
@@ -0,0 +1,14 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>distribution</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jans-orm/pom.xml b/jans-orm/pom.xml
index c31360eac3e..92da9b76384 100644
--- a/jans-orm/pom.xml
+++ b/jans-orm/pom.xml
@@ -44,8 +44,10 @@
 		<module>core</module>
 		<module>ldap</module>
 		<module>couchbase</module>
+		<module>couchbase-libs</module>
  		<module>sql</module>
  		<module>spanner</module>
+ 		<module>spanner-libs</module>
 		<module>hybrid</module>
 		<module>cdi</module>
 		<module>standalone</module>
diff --git a/jans-orm/spanner-libs/pom.xml b/jans-orm/spanner-libs/pom.xml
new file mode 100644
index 00000000000..03d9784cdba
--- /dev/null
+++ b/jans-orm/spanner-libs/pom.xml
@@ -0,0 +1,44 @@
+<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>
+	<artifactId>jans-orm-spanner-libs</artifactId>
+	<packaging>pom</packaging>
+	<name>jans-orm-spanner-libs</name>
+
+	<parent>
+		<groupId>io.jans</groupId>
+		<artifactId>jans-orm-parent</artifactId>
+		<version>1.0.3-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+		<!-- Cloud Spanner -->
+		<dependency>
+			<groupId>com.google.cloud</groupId>
+			<artifactId>google-cloud-spanner</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<!-- maven-assembly-plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>make-assembly-dist</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/deps.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/jans-orm/spanner-libs/src/assembly/deps.xml b/jans-orm/spanner-libs/src/assembly/deps.xml
new file mode 100644
index 00000000000..57cd19a440e
--- /dev/null
+++ b/jans-orm/spanner-libs/src/assembly/deps.xml
@@ -0,0 +1,14 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>distribution</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/jans-orm/spanner/pom.xml b/jans-orm/spanner/pom.xml
index 4f7444cf353..f48d813dfb2 100644
--- a/jans-orm/spanner/pom.xml
+++ b/jans-orm/spanner/pom.xml
@@ -47,6 +47,7 @@
 		<dependency>
 		    <groupId>com.google.cloud</groupId>
 		    <artifactId>google-cloud-spanner</artifactId>
+		    <scope>provided</scope>
 		</dependency>
 
 		<!-- Weld -->