diff --git a/lib/xos-config/tests/config_test.py b/lib/xos-config/tests/config_test.py
index c89ed47..a3e57db 100644
--- a/lib/xos-config/tests/config_test.py
+++ b/lib/xos-config/tests/config_test.py
@@ -126,6 +126,7 @@
         # not only from the one that has been used to initialize it
         res = Config2.get("database")
         self.assertEqual(res, {
+            "name": "xos",
             "username": "test",
             "password": "safe"
         })
diff --git a/lib/xos-config/tests/confs/basic_conf.yaml b/lib/xos-config/tests/confs/basic_conf.yaml
index 0f1d0b0..4337b6c 100644
--- a/lib/xos-config/tests/confs/basic_conf.yaml
+++ b/lib/xos-config/tests/confs/basic_conf.yaml
@@ -1,4 +1,5 @@
 name: test
 database:
+  name: xos
   username: test
   password: safe
\ No newline at end of file
diff --git a/lib/xos-config/tests/confs/sample_conf.yaml b/lib/xos-config/tests/confs/sample_conf.yaml
index b398b40..4d4c792 100644
--- a/lib/xos-config/tests/confs/sample_conf.yaml
+++ b/lib/xos-config/tests/confs/sample_conf.yaml
@@ -1,5 +1,6 @@
 name: xos-core
 database:
+  name: xos
   username: test
   password: safe
 logging:
diff --git a/lib/xos-config/xosconfig/config-schema.yaml b/lib/xos-config/xosconfig/config-schema.yaml
index 9a6f000..5d30b86 100644
--- a/lib/xos-config/xosconfig/config-schema.yaml
+++ b/lib/xos-config/xosconfig/config-schema.yaml
@@ -2,13 +2,20 @@
   name:
     type: str
     required: True
+  xos_dir:
+    type: str
   database:
     type: map
     map:
+      name:
+        type: str
+        required: True
       username:
         type: str
+        required: True
       password:
         type: str
+        required: True
   logging:
     type: map
     map:
diff --git a/lib/xos-config/xosconfig/config.py b/lib/xos-config/xosconfig/config.py
index e58477c..608beac 100644
--- a/lib/xos-config/xosconfig/config.py
+++ b/lib/xos-config/xosconfig/config.py
@@ -5,7 +5,7 @@
 import default
 from pykwalify.core import Core as PyKwalify
 
-DEFAULT_CONFIG_FILE = "/opt/xos/config.yaml"
+DEFAULT_CONFIG_FILE = "/opt/xos/xos_config.yaml"
 INITIALIZED = False
 CONFIG = {}
 
diff --git a/lib/xos-config/xosconfig/default.py b/lib/xos-config/xosconfig/default.py
index 221e0e8..eaea40a 100644
--- a/lib/xos-config/xosconfig/default.py
+++ b/lib/xos-config/xosconfig/default.py
@@ -1,4 +1,5 @@
 DEFAULT_VALUES = {
+    'xos_dir': '/opt/xos',
     'logging': {
         'level': 'info',
         'channels': ['file', 'console']