diff --git a/app/Actions/Proxy/CheckProxy.php b/app/Actions/Proxy/CheckProxy.php
index 5a1ae56cf..32a4897a6 100644
--- a/app/Actions/Proxy/CheckProxy.php
+++ b/app/Actions/Proxy/CheckProxy.php
@@ -35,6 +35,9 @@ public function handle(Server $server, $fromUI = false)
                 $server->save();
                 return false;
             }
+            if ($server->settings->is_cloudflare_tunnel) {
+                return false;
+            }
             $ip = $server->ip;
             if ($server->id === 0) {
                 $ip = 'host.docker.internal';
diff --git a/app/Actions/Server/ConfigureCloudflared.php b/app/Actions/Server/ConfigureCloudflared.php
new file mode 100644
index 000000000..6b08b3de6
--- /dev/null
+++ b/app/Actions/Server/ConfigureCloudflared.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\Yaml\Yaml;
+
+class ConfigureCloudflared
+{
+    use AsAction;
+    public function handle(Server $server, string $cloudflare_token)
+    {
+        try {
+            $config = [
+                "services" => [
+                    "coolify-cloudflared" => [
+                        "container_name" => "coolify-cloudflared",
+                        "image" => "cloudflare/cloudflared:latest",
+                        "restart" => RESTART_MODE,
+                        "network_mode" => "host",
+                        "command" => "tunnel run",
+                        "environment" => [
+                            "TUNNEL_TOKEN={$cloudflare_token}",
+                        ],
+                    ],
+                ],
+            ];
+            $config = Yaml::dump($config, 12, 2);
+            $docker_compose_yml_base64 = base64_encode($config);
+            $commands = collect([
+                "mkdir -p /tmp/cloudflared && cd /tmp/cloudflared",
+                "echo '$docker_compose_yml_base64' | base64 -d > docker-compose.yml",
+                "docker compose pull",
+                "docker compose down -v --remove-orphans > /dev/null 2>&1",
+                "docker compose up -d --remove-orphans",
+            ]);
+            instant_remote_process($commands, $server);
+        } catch (\Throwable $e) {
+            ray($e);
+            throw $e;
+        }
+    }
+}
diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/Livewire/Server/ConfigureCloudflareTunnels.php b/app/Livewire/Server/ConfigureCloudflareTunnels.php
new file mode 100644
index 000000000..7a07a4d04
--- /dev/null
+++ b/app/Livewire/Server/ConfigureCloudflareTunnels.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Actions\Server\ConfigureCloudflared;
+use App\Models\Server;
+use Livewire\Component;
+
+class ConfigureCloudflareTunnels extends Component
+{
+    public $server_id;
+    public string $cloudflare_token;
+    public function alreadyConfigured()
+    {
+        try {
+            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
+            $server->settings->is_cloudflare_tunnel = true;
+            $server->settings->save();
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('serverInstalled');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function submit()
+    {
+        try {
+            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
+            ConfigureCloudflared::run($server, $this->cloudflare_token);
+            $server->settings->is_cloudflare_tunnel = true;
+            $server->settings->save();
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('serverInstalled');
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.configure-cloudflare-tunnels');
+    }
+}
diff --git a/resources/css/app.css b/resources/css/app.css
index 37df40230..b7965ebbc 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -195,7 +195,7 @@ .kbd-custom {
 }
 
 .box {
-    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
 }
 .box-boarding {
     @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black  ;
diff --git a/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php b/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php
new file mode 100644
index 000000000..92811b929
--- /dev/null
+++ b/resources/views/livewire/server/configure-cloudflare-tunnels.blade.php
@@ -0,0 +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>
+    <h3 class="text-center">Or</h3>
+    <x-forms.button 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 80818c4db..260d4bcda 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -70,17 +70,27 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
                 </div>
             </div>
             <div class="w-64">
-                @if (!$server->isLocalhost())
-                    @if ($server->settings->is_build_server)
+                @if ($server->isFunctional())
+                    @if (!$server->isLocalhost())
                         <x-forms.checkbox instantSave disabled id="server.settings.is_build_server"
                             label="Use it as a build server?" />
-                    @else
-                        <x-forms.checkbox instantSave
-                            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>"
-                            id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
-                        @if ($server->isSwarm())
-                            <div class="pt-6"> Swarm support is experimental. </div>
-                        @endif
+                        <div class="flex items-center gap-1 pt-6">
+                            <h3 class="">Cloudflare Tunnels
+                            </h3>
+                            <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> --}}
+                        <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>.
+                        </div>
                         @if ($server->settings->is_swarm_worker)
                             <x-forms.checkbox disabled instantSave type="checkbox" id="server.settings.is_swarm_manager"
                                 helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
@@ -90,6 +100,7 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
                                 helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
                                 label="Is it a Swarm Manager?" />
                         @endif
+
                         @if ($server->settings->is_swarm_manager)
                             <x-forms.checkbox disabled instantSave type="checkbox" id="server.settings.is_swarm_worker"
                                 helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
@@ -101,6 +112,7 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
                         @endif
                     @endif
                 @endif
+
             </div>
         </div>