diff --git a/docker-compose.yml b/docker-compose.yml
index 3d61e13..b354018 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -148,6 +148,8 @@ services:
       POSTGRES_USER: ${DB_USER_ADMIN}
       POSTGRES_PASSWORD: ${DB_PASSWORD_ADMIN}
       POSTGRES_DB: ${DB_NAME2}
+      FED_DATA_SOURCE: ${DB_UI_FEDERATION_SOURCES}
+      LOCAL_DATA_SOURCE: ${DB_UI_LOCAL_SOURCES}
     depends_on:
       - db
     restart: unless-stopped # Used only by docker-compose
diff --git a/settings.default.sh b/settings.default.sh
index df70f9f..96a50e0 100644
--- a/settings.default.sh
+++ b/settings.default.sh
@@ -12,10 +12,6 @@
 : ${DB_USER_ADMIN:="postgres"}
 : ${DB_PASSWORD_ADMIN:="test"}
 
-: ${DB_UI_IMAGE:="hbpmip/postgresraw-ui"}
-: ${DB_UI_VERSION:=":v1.4"}
-: ${DB_UI_PORT:="31555"} # External port, if exposed
-
 # Databases Definitions:
 #  1. To add a new DB, copy the last 3 lines below and increment the id
 #  2. Add the new number in DB_CREATE_LIST
@@ -110,6 +106,15 @@
 : ${CHRONOS_PORT1:="4400"}
 : ${CHRONOS_PORT2:="4401"}
 
+#: ${FEATURES_LOCAL_TABLE:="cde_features_a"}
+: ${FEATURES_LOCAL_TABLE:="mip_cde_features"} # Stable Config
+
+: ${DB_UI_IMAGE:="hbpmip/postgresraw-ui"}
+: ${DB_UI_VERSION:=":v1.4"}
+: ${DB_UI_PORT:="31555"} # External port, if exposed
+: ${DB_UI_FEDERATION_SOURCES:="harmonized_clinical_data"}
+: ${DB_UI_LOCAL_SOURCES:="${FEATURES_LOCAL_TABLE} harmonized_clinical_data"}
+
 : ${WOKEN_IMAGE:="hbpmip/woken"}
 #: ${WOKEN_VERSION:=":2.1.4"}
 : ${WOKEN_VERSION:=":2.0.4"} # Stable Config
@@ -118,8 +123,7 @@
 : ${WOKEN_PORT2:="8087"}
 : ${WOKEN_AKKA_PORT:=${WOKEN_PORT1}}
 : ${WOKEN_CONF:="${PWD}/woken/application.conf"}
-#: ${WOKEN_MAIN_TABLE:="cde_features_a"}
-: ${WOKEN_MAIN_TABLE:="mip_cde_features"} # Stable Config
+: ${WOKEN_MAIN_TABLE:="${FEATURES_LOCAL_TABLE}"}
 : ${WOKEN_EXAREME_URL:="http://prozac.madgik.di.uoa.gr:9090/mining/query"}
 #: ${WOKEN_CONTEXT_PATH:="/services"}
 : ${WOKEN_CONTEXT_PATH:=""} # Stable Config