diff --git a/pype/settings/defaults/system_settings/tools.json b/pype/settings/defaults/system_settings/tools.json
index 6f0b0a47db..af5772705c 100644
--- a/pype/settings/defaults/system_settings/tools.json
+++ b/pype/settings/defaults/system_settings/tools.json
@@ -56,12 +56,20 @@
     },
     "vray": {
         "enabled": true,
-        "environment": {},
+        "environment": {
+            "__environment_keys__": {
+                "vray": []
+            }
+        },
         "variants": {}
     },
     "yeti": {
         "enabled": true,
-        "environment": {},
+        "environment": {
+            "__environment_keys__": {
+                "yeti": []
+            }
+        },
         "variants": {}
     },
     "other": {
diff --git a/pype/settings/entities/root_entities.py b/pype/settings/entities/root_entities.py
index 53cfbb5f3d..88b9da2428 100644
--- a/pype/settings/entities/root_entities.py
+++ b/pype/settings/entities/root_entities.py
@@ -494,7 +494,7 @@ class SystemSettings(RootEntity):
 
         Implementation of abstract method.
         """
-        return DEFAULTS_DIR
+        return os.path.join(DEFAULTS_DIR, SYSTEM_SETTINGS_KEY)
 
     def _save_studio_values(self):
         settings_value = self.settings_value()
diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json
index fdb25610e0..295b3ccac3 100644
--- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json
+++ b/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json
@@ -13,7 +13,8 @@
         {
             "key": "environment",
             "label": "Environment",
-            "type": "raw-json"
+            "type": "raw-json",
+            "env_group_key": "vray"
         },
         {
             "type": "schema_template",
diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json
index 96c6b624fc..34bb09da8d 100644
--- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json
+++ b/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json
@@ -13,7 +13,8 @@
         {
             "key": "environment",
             "label": "Environment",
-            "type": "raw-json"
+            "type": "raw-json",
+            "env_group_key": "yeti"
         },
         {
             "type": "schema_template",