diff --git a/lib-authentication/settings.gradle b/lib-authentication/settings.gradle
index d1561187aded391ac14355bde68276817afadbab..f4e1dfbc9e77db15349e024e9204e13ddb6c091d 100644
--- a/lib-authentication/settings.gradle
+++ b/lib-authentication/settings.gradle
@@ -1 +1 @@
-includeFlat 'lib-commonbase', 'lib-common'
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common'
diff --git a/lib-dbmigration/settings.gradle b/lib-dbmigration/settings.gradle
index d1561187aded391ac14355bde68276817afadbab..f4e1dfbc9e77db15349e024e9204e13ddb6c091d 100644
--- a/lib-dbmigration/settings.gradle
+++ b/lib-dbmigration/settings.gradle
@@ -1 +1 @@
-includeFlat 'lib-commonbase', 'lib-common'
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common'
diff --git a/lib-image-readers/settings.gradle b/lib-image-readers/settings.gradle
index d1561187aded391ac14355bde68276817afadbab..f4e1dfbc9e77db15349e024e9204e13ddb6c091d 100644
--- a/lib-image-readers/settings.gradle
+++ b/lib-image-readers/settings.gradle
@@ -1 +1 @@
-includeFlat 'lib-commonbase', 'lib-common'
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common'
diff --git a/lib-openbis-common/settings.gradle b/lib-openbis-common/settings.gradle
index cef66946b6dcfcd0a9045234b7551fa32946ba6b..8adf820df728aa03a60439858b2601752aaa3fe9 100644
--- a/lib-openbis-common/settings.gradle
+++ b/lib-openbis-common/settings.gradle
@@ -1 +1 @@
-includeFlat 'lib-commonbase', 'lib-common', 'lib-dbmigration', 'lib-authentication'
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common', 'lib-dbmigration', 'lib-authentication'
diff --git a/server-original-data-store/settings.gradle b/server-original-data-store/settings.gradle
index 9cd9754f77ab5d690f47563a6b910b3482db258e..d83747ae018b30f69d2347ac6ca3ab689cba91f4 100644
--- a/server-original-data-store/settings.gradle
+++ b/server-original-data-store/settings.gradle
@@ -1,2 +1,2 @@
-includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication',
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication',
         'lib-dbmigration', 'server-application-server', 'api-openbis-javascript'
diff --git a/test-api-openbis-javascript/settings.gradle b/test-api-openbis-javascript/settings.gradle
index 09200920db5ef12840c394fe246d98d75df73732..a4452566d8ef64d34e8021706f18a82f236f92e2 100644
--- a/test-api-openbis-javascript/settings.gradle
+++ b/test-api-openbis-javascript/settings.gradle
@@ -1,3 +1,3 @@
-includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication',
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication',
         'lib-dbmigration', 'server-application-server', 'server-original-data-store', 'server-screening',
         'core-plugin-openbis', 'test-ui-core', 'api-openbis-javascript'
diff --git a/test-ui-core/settings.gradle b/test-ui-core/settings.gradle
index e6e70fc93cf8fcfeeb3d95e29906b09c8250afeb..63d5a45a486c924abb89786b4c9c99eba03e57ce 100644
--- a/test-ui-core/settings.gradle
+++ b/test-ui-core/settings.gradle
@@ -1,3 +1,3 @@
-includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication',
+includeFlat 'lib-base', 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication',
         'lib-dbmigration', 'server-application-server', 'api-openbis-javascript',
         'server-original-data-store', 'server-screening', 'core-plugin-openbis'