diff --git a/config/constants.php b/config/constants.php
index 7f41ee868..d8e8223cd 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -1,10 +1,46 @@
 <?php
 
 return [
-    'docs' => [
-        'base_url' => 'https://coolify.io/docs',
+    'coolify' => [
+        'version' => '4.0.0-beta.368',
+        'self_hosted' => env('SELF_HOSTED', true),
+        'autoupdate' => env('AUTOUPDATE', false),
+        'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
+        'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper'),
+        'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),
+    ],
+
+    'urls' => [
+        'docs' => 'https://coolify.io/docs',
         'contact' => 'https://coolify.io/docs/contact',
     ],
+
+    'services' => [
+        // Temporary disabled until cache is implemented
+        // 'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
+        'official' => 'https://raw.githubusercontent.com/coollabsio/coolify/main/templates/service-templates.json',
+    ],
+
+    'terminal' => [
+        'protocol' => env('TERMINAL_PROTOCOL'),
+        'host' => env('TERMINAL_HOST'),
+        'port' => env('TERMINAL_PORT'),
+    ],
+
+    'pusher' => [
+        'host' => env('PUSHER_HOST'),
+        'app_key' => env('PUSHER_APP_KEY'),
+    ],
+
+    'horizon' => [
+        'is_horizon_enabled' => env('HORIZON_ENABLED', true),
+        'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true),
+    ],
+
+    'docker' => [
+        'minimum_required_version' => '26.0',
+    ],
+
     'ssh' => [
         'mux_enabled' => env('MUX_ENABLED', env('SSH_MUX_ENABLED', true)),
         'mux_persist_time' => env('SSH_MUX_PERSIST_TIME', 3600),
@@ -12,23 +48,28 @@ return [
         'server_interval' => 20,
         'command_timeout' => 7200,
     ],
-    'docker' => [
-        'minimum_required_version' => '26.0',
-    ],
-    'waitlist' => [
-        'expiration' => 10,
-    ],
+
     'invitation' => [
         'link' => [
             'base_url' => '/invitations/',
             'expiration_days' => 3,
         ],
     ],
-    'services' => [
-        // Temporary disabled until cache is implemented
-        // 'official' => 'https://cdn.coollabs.io/coolify/service-templates.json',
-        'official' => 'https://raw.githubusercontent.com/coollabsio/coolify/main/templates/service-templates.json',
+
+    'waitlist' => [
+        'enabled' => env('WAITLIST', true),
+        'expiration' => 10,
     ],
+
+    'sentry' => [
+        'sentry_dsn' => env('SENTRY_DSN'),
+    ],
+
+    'webhooks' => [
+        'feedback_discord_webhook' => env('FEEDBACK_DISCORD_WEBHOOK'),
+        'dev_webhook' => env('SERVEO_URL'),
+    ],
+
     'limits' => [
         'trial_period' => 0,
         'server' => [
diff --git a/config/coolify.php b/config/coolify.php
deleted file mode 100644
index 225dfe6fa..000000000
--- a/config/coolify.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-return [
-    'sentry_dsn' => env('SENTRY_DSN'),
-    'docs' => 'https://coolify.io/docs/',
-    'contact' => 'https://coolify.io/docs/contact',
-    'feedback_discord_webhook' => env('FEEDBACK_DISCORD_WEBHOOK'),
-    'self_hosted' => env('SELF_HOSTED', true),
-    'waitlist' => env('WAITLIST', false),
-    'license_url' => 'https://licenses.coollabs.io',
-    'dev_webhook' => env('SERVEO_URL'),
-    'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),
-    'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
-    'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper'),
-    'is_horizon_enabled' => env('HORIZON_ENABLED', true),
-    'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true),
-];