diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index 335b17396..82d9f5d8e 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -178,6 +178,19 @@ class Form extends Component
         }
     }
 
+    public function saveSentinel()
+    {
+        try {
+            $this->validate();
+            $this->server->settings->save();
+            $this->dispatch('success', 'Sentinel updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->checkSyncStatus();
+        }
+    }
+
     public function restartSentinel($notification = true)
     {
         try {
@@ -185,7 +198,8 @@ class Form extends Component
             $this->validate([
                 'server.settings.sentinel_custom_url' => 'required|url',
             ]);
-            $this->server->restartSentinel();
+            $this->server->settings->save();
+            $this->server->restartSentinel(async: false);
             if ($notification) {
                 $this->dispatch('success', 'Sentinel restarted.');
             }
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index d658be125..7ae9df749 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -173,9 +173,6 @@ function get_latest_sentinel_version(): string
 
         return data_get($versions, 'coolify.sentinel.version');
     } catch (\Throwable $e) {
-        //throw $e;
-        ray($e->getMessage());
-
         return '0.0.0';
     }
 }
@@ -362,10 +359,6 @@ function isCloud(): bool
     return ! config('coolify.self_hosted');
 }
 
-function isExperimentalFeaturesEnabled(): bool
-{
-    return config('coolify.is_experimental_features_enabled');
-}
 function translate_cron_expression($expression_to_validate): string
 {
     if (isset(VALID_CRON_STRINGS[$expression_to_validate])) {
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 3f3361124..35ec6c71b 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -158,68 +158,63 @@
                 @endif
             </div>
         </div>
-        @if (!$server->isSwarm() && !$server->isBuildServer())
-            @if (isExperimentalFeaturesEnabled())
-                <div class="flex gap-2 items-center pt-4 pb-2">
-                    <h3>Sentinel</h3>
-                    @if ($server->isSentinelEnabled())
-                        <div class="flex gap-2 items-center"
-                            wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
-                            @if ($server->isSentinelLive())
-                                <x-status.running status="In sync" noLoading
-                                    title="{{ $server->sentinel_updated_at }}" />
-                                <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
-                            @else
-                                <x-status.stopped status="Out of sync" noLoading
-                                    title="{{ $server->sentinel_updated_at }}" />
-                                <x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
-                            @endif
-                        </div>
-                    @endif
-                </div>
-            @else
+    </form>
+    @if ($server->isFunctional() && !$server->isSwarm() && !$server->isBuildServer())
+        <form wire:submit.prevent='saveSentinel'>
+            <div class="flex gap-2 items-center pt-4 pb-2">
                 <h3>Sentinel</h3>
-                <div>Sentinel is not available in this version (soon).</div>
-            @endif
-            @if (isExperimentalFeaturesEnabled())
-                <div class="flex flex-col gap-2">
-                    <div class="w-64">
-                        <x-forms.checkbox wire:model.live="server.settings.is_sentinel_enabled"
-                            label="Enable Sentinel" />
-                        @if ($server->isSentinelEnabled())
-                            <x-forms.checkbox instantSave id="server.settings.is_metrics_enabled"
-                                label="Enable Metrics" />
+                @if ($server->isSentinelEnabled())
+                    <div class="flex gap-2 items-center">
+                        @if ($server->isSentinelLive())
+                            <x-status.running status="In sync" noLoading title="{{ $server->sentinel_updated_at }}" />
+                            <x-forms.button type="submit">Save</x-forms.button>
+                            <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
                         @else
-                            <x-forms.checkbox instantSave disabled id="server.settings.is_metrics_enabled"
-                                label="Enable Metrics" />
+                            <x-status.stopped status="Out of sync" noLoading
+                                title="{{ $server->sentinel_updated_at }}" />
+                            <x-forms.button type="submit">Save</x-forms.button>
+                            <x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
                         @endif
                     </div>
+                @endif
+            </div>
+            <div class="flex flex-col gap-2">
+                <div class="w-64">
+                    <x-forms.checkbox wire:model.live="server.settings.is_sentinel_enabled" label="Enable Sentinel" />
                     @if ($server->isSentinelEnabled())
-                        <div class="flex flex-wrap gap-2 sm:flex-nowrap items-end">
-                            <x-forms.input type="password" id="server.settings.sentinel_token" label="Sentinel token"
-                                required helper="Token for Sentinel." />
-                            <x-forms.button wire:click="regenerateSentinelToken">Regenerate</x-forms.button>
-                        </div>
-
-                        <x-forms.input id="server.settings.sentinel_custom_url" required label="Coolify URL"
-                            helper="URL to your Coolify instance. If it is empty that means you do not have a FQDN set for your Coolify instance." />
-
-                        <div class="flex flex-col gap-2">
-                            <div class="flex flex-wrap gap-2 sm:flex-nowrap">
-                                <x-forms.input id="server.settings.sentinel_metrics_refresh_rate_seconds"
-                                    label="Metrics rate (seconds)" required
-                                    helper="The interval for gathering metrics. Lower means more disk space will be used." />
-                                <x-forms.input id="server.settings.sentinel_metrics_history_days"
-                                    label="Metrics history (days)" required
-                                    helper="How many days should the metrics data should be reserved." />
-                                <x-forms.input id="server.settings.sentinel_push_interval_seconds"
-                                    label="Push interval (seconds)" required
-                                    helper="How many seconds should the metrics data should be pushed to the collector." />
-                            </div>
-                        </div>
+                        <x-forms.checkbox instantSave id="server.settings.is_metrics_enabled"
+                            label="Enable Metrics" />
+                    @else
+                        <x-forms.checkbox instantSave disabled id="server.settings.is_metrics_enabled"
+                            label="Enable Metrics" />
                     @endif
                 </div>
-            @endif
-        @endif
-    </form>
+                @if ($server->isSentinelEnabled())
+                    <div class="flex flex-wrap gap-2 sm:flex-nowrap items-end">
+                        <x-forms.input type="password" id="server.settings.sentinel_token" label="Sentinel token"
+                            required helper="Token for Sentinel." />
+                        <x-forms.button wire:click="regenerateSentinelToken">Regenerate</x-forms.button>
+                    </div>
+
+                    <x-forms.input id="server.settings.sentinel_custom_url" required label="Coolify URL"
+                        helper="URL to your Coolify instance. If it is empty that means you do not have a FQDN set for your Coolify instance." />
+
+                    <div class="flex flex-col gap-2">
+                        <div class="flex flex-wrap gap-2 sm:flex-nowrap">
+                            <x-forms.input id="server.settings.sentinel_metrics_refresh_rate_seconds"
+                                label="Metrics rate (seconds)" required
+                                helper="The interval for gathering metrics. Lower means more disk space will be used." />
+                            <x-forms.input id="server.settings.sentinel_metrics_history_days"
+                                label="Metrics history (days)" required
+                                helper="How many days should the metrics data should be reserved." />
+                            <x-forms.input id="server.settings.sentinel_push_interval_seconds"
+                                label="Push interval (seconds)" required
+                                helper="How many seconds should the metrics data should be pushed to the collector." />
+                        </div>
+                    </div>
+                @endif
+            </div>
+        </form>
+    @endif
+
 </div>