diff --git a/openpype/settings/defaults/system_settings/general.json b/openpype/settings/defaults/system_settings/general.json
index 7c78de9a5c..5a3e39e5b6 100644
--- a/openpype/settings/defaults/system_settings/general.json
+++ b/openpype/settings/defaults/system_settings/general.json
@@ -2,9 +2,6 @@
     "studio_name": "Studio name",
     "studio_code": "stu",
     "admin_password": "",
-    "production_version": "",
-    "staging_version": "",
-    "version_check_interval": 5,
     "environment": {
         "__environment_keys__": {
             "global": []
@@ -19,5 +16,8 @@
         "windows": [],
         "darwin": [],
         "linux": []
-    }
+    },
+    "production_version": "",
+    "staging_version": "",
+    "version_check_interval": 5
 }
\ No newline at end of file
diff --git a/openpype/settings/entities/schemas/system_schema/schema_general.json b/openpype/settings/entities/schemas/system_schema/schema_general.json
index 3af3f5ce35..6306317df8 100644
--- a/openpype/settings/entities/schemas/system_schema/schema_general.json
+++ b/openpype/settings/entities/schemas/system_schema/schema_general.json
@@ -30,36 +30,6 @@
         {
             "type": "splitter"
         },
-        {
-            "type": "label",
-            "label": "Define explicit OpenPype version that should be used. Keep empty to use latest available version."
-        },
-        {
-            "type": "production-versions-text",
-            "key": "production_version",
-            "label": "Production version"
-        },
-        {
-            "type": "staging-versions-text",
-            "key": "staging_version",
-            "label": "Staging version"
-        },
-        {
-            "type": "splitter"
-        },
-        {
-            "type": "label",
-            "label": "Trigger validation if running OpenPype is using studio defined version each 'n' <b>minutes</b>. Validation happens in OpenPype tray application."
-        },
-        {
-            "type": "number",
-            "key": "version_check_interval",
-            "label": "Version check interval",
-            "minimum": 0
-        },
-        {
-            "type": "splitter"
-        },
         {
             "key": "environment",
             "label": "Environment",
@@ -141,12 +111,49 @@
             "type": "splitter"
         },
         {
-            "type": "path",
-            "key": "openpype_path",
-            "label": "Versions Repository",
-            "multiplatform": true,
-            "multipath": true,
-            "require_restart": true
+            "type": "collapsible-wrap",
+            "label": "OpenPype deployment control",
+            "collapsible": false,
+            "children": [
+                {
+                    "type": "path",
+                    "key": "openpype_path",
+                    "label": "Versions Repository",
+                    "multiplatform": true,
+                    "multipath": true,
+                    "require_restart": true
+                },
+                {
+                    "type": "splitter"
+                },
+                {
+                    "type": "label",
+                    "label": "Define explicit OpenPype version that should be used. Keep empty to use latest available version."
+                },
+                {
+                    "type": "production-versions-text",
+                    "key": "production_version",
+                    "label": "Production version"
+                },
+                {
+                    "type": "staging-versions-text",
+                    "key": "staging_version",
+                    "label": "Staging version"
+                },
+                {
+                    "type": "splitter"
+                },
+                {
+                    "type": "label",
+                    "label": "Trigger validation if running OpenPype is using studio defined version each 'n' <b>minutes</b>. Validation happens in OpenPype tray application."
+                },
+                {
+                    "type": "number",
+                    "key": "version_check_interval",
+                    "label": "Version check interval",
+                    "minimum": 0
+                }
+            ]
         }
     ]
 }
diff --git a/openpype/tools/settings/settings/wrapper_widgets.py b/openpype/tools/settings/settings/wrapper_widgets.py
index b14a226912..7370fcf945 100644
--- a/openpype/tools/settings/settings/wrapper_widgets.py
+++ b/openpype/tools/settings/settings/wrapper_widgets.py
@@ -92,8 +92,7 @@ class CollapsibleWrapper(WrapperWidget):
         self.content_layout = content_layout
 
         if self.collapsible:
-            if not self.collapsed:
-                body_widget.toggle_content()
+            body_widget.toggle_content(self.collapsed)
         else:
             body_widget.hide_toolbox(hide_content=False)