diff --git a/.gitmodules b/.gitmodules
index e6afa8a..2acc283 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "submodules/kuksa.val"]
-	path = submodules/kuksa.val
-	url = https://github.com/eclipse/kuksa.val
 [submodule "submodules/kuksa-common"]
 	path = submodules/kuksa-common
 	url = https://github.com/eclipse-kuksa/kuksa-common
+[submodule "submodules/kuksa-databroker"]
+	path = submodules/kuksa-databroker
+	url = https://github.com/eclipse-kuksa/kuksa-databroker
diff --git a/kuksa-client/kuksa/val/v1/README.md b/kuksa-client/kuksa/val/v1/README.md
index e3c7451..07f51a3 120000
--- a/kuksa-client/kuksa/val/v1/README.md
+++ b/kuksa-client/kuksa/val/v1/README.md
@@ -1 +1 @@
-../../../../submodules/kuksa.val/proto/kuksa/val/v1/README.md
\ No newline at end of file
+../../../../submodules/kuksa-databroker/proto/kuksa/val/v1/README.md
\ No newline at end of file
diff --git a/kuksa-client/kuksa/val/v1/types.proto b/kuksa-client/kuksa/val/v1/types.proto
index c006b2d..446f09c 120000
--- a/kuksa-client/kuksa/val/v1/types.proto
+++ b/kuksa-client/kuksa/val/v1/types.proto
@@ -1 +1 @@
-../../../../submodules/kuksa.val/proto/kuksa/val/v1/types.proto
\ No newline at end of file
+../../../../submodules/kuksa-databroker/proto/kuksa/val/v1/types.proto
\ No newline at end of file
diff --git a/kuksa-client/kuksa/val/v1/val.proto b/kuksa-client/kuksa/val/v1/val.proto
index a5c8ed0..3b80543 120000
--- a/kuksa-client/kuksa/val/v1/val.proto
+++ b/kuksa-client/kuksa/val/v1/val.proto
@@ -1 +1 @@
-../../../../submodules/kuksa.val/proto/kuksa/val/v1/val.proto
\ No newline at end of file
+../../../../submodules/kuksa-databroker/proto/kuksa/val/v1/val.proto
\ No newline at end of file
diff --git a/submodules/kuksa-databroker b/submodules/kuksa-databroker
new file mode 160000
index 0000000..7b2d798
--- /dev/null
+++ b/submodules/kuksa-databroker
@@ -0,0 +1 @@
+Subproject commit 7b2d798b54f90da02eff6d8ae27972d840c08df5
diff --git a/submodules/kuksa.val b/submodules/kuksa.val
deleted file mode 160000
index df6dcb0..0000000
--- a/submodules/kuksa.val
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit df6dcb0fafd651d5e9bec037194c352a822cd3f9