diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..cbd279b8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "emerald-java-client"]
+	path = emerald-java-client
+	url = git@github.com:p2p-org/emerald-java-client.git
diff --git a/emerald-java-client b/emerald-java-client
new file mode 160000
index 00000000..934a7d0f
--- /dev/null
+++ b/emerald-java-client
@@ -0,0 +1 @@
+Subproject commit 934a7d0fd01e2920c3dc1db3097384e17a0166af
diff --git a/settings.gradle b/settings.gradle
index 0778dbab..c0b940b8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,8 @@
 enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+includeBuild('./emerald-java-client') {
+    dependencySubstitution {
+        substitute module('io.emeraldpay:emerald-api:0.12-alpha.1') using project(':')
+    }
+}
\ No newline at end of file