diff --git a/app/Livewire/Server/ConfigureCloudflareTunnels.php b/app/Livewire/Server/ConfigureCloudflareTunnels.php
index 7a07a4d04..03a48c3e1 100644
--- a/app/Livewire/Server/ConfigureCloudflareTunnels.php
+++ b/app/Livewire/Server/ConfigureCloudflareTunnels.php
@@ -10,6 +10,7 @@ class ConfigureCloudflareTunnels extends Component
 {
     public $server_id;
     public string $cloudflare_token;
+    public string $ssh_domain;
     public function alreadyConfigured()
     {
         try {
@@ -28,6 +29,8 @@ class ConfigureCloudflareTunnels extends Component
             $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
             ConfigureCloudflared::run($server, $this->cloudflare_token);
             $server->settings->is_cloudflare_tunnel = true;
+            $server->ip = $this->ssh_domain;
+            $server->save();
             $server->settings->save();
             $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
             $this->dispatch('serverInstalled');
diff --git a/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php b/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php
index 92811b929..4f8ebc741 100644
--- a/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php
+++ b/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php
@@ -1,9 +1,9 @@
 <form wire:submit.prevent='submit' class="flex flex-col w-full gap-2">
     <x-forms.input id="cloudflare_token" required label="Cloudflare Token" />
     <x-forms.input id="ssh_domain" label="Configured SSH Domain" required
-        helper="ssh://localhost configured in Cloudflare" />
-    <x-forms.button type="submit">Configure</x-forms.button>
+        helper="The SSH Domain you configured in Cloudflare" />
+    <x-forms.button type="submit" @click="modalOpen=false">Configure</x-forms.button>
     <h3 class="text-center">Or</h3>
-    <x-forms.button wire:click.prevent='alreadyConfigured' @click="modalOpen=false">I already configured the tunnel
+    <x-forms.button isError wire:click.prevent='alreadyConfigured' @click="modalOpen=false">I already configured the tunnel
         manually on the server</x-forms.button>
 </form>
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 7f4a12272..48c00d6f9 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -80,12 +80,13 @@
                             <x-helper class="inline-flex"
                                 helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br><span class='dark:text-warning'>Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
                         </div>
-                        {{-- @if ($server->settings->is_cloudflare_tunnel) --}}
-                        <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
-                        {{-- @endif --}}
-                        {{-- <x-modal-input buttonTitle="Configure" title="Cloudflare Tunnels">
-                            <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
-                        </x-modal-input> --}}
+                        @if ($server->settings->is_cloudflare_tunnel)
+                            <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
+                        @else
+                            <x-modal-input buttonTitle="Configure" title="Cloudflare Tunnels">
+                                <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
+                            </x-modal-input>
+                        @endif
                         <h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3>
                         <div class="pb-4">Read the docs <a class='underline dark:text-white'
                                 href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>.
@@ -117,7 +118,13 @@
                         <x-helper class="inline-flex"
                             helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br><span class='dark:text-warning'>Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
                     </div>
-                    <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
+                    @if ($server->settings->is_cloudflare_tunnel)
+                        <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
+                    @else
+                        <x-modal-input buttonTitle="Configure" title="Cloudflare Tunnels">
+                            <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
+                        </x-modal-input>
+                    @endif
                 @endif
 
             </div>