diff --git a/app/Livewire/Project/CloneMe.php b/app/Livewire/Project/CloneMe.php
index be9de139f..a4f50ee06 100644
--- a/app/Livewire/Project/CloneMe.php
+++ b/app/Livewire/Project/CloneMe.php
@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Project;
 
-use App\Actions\Application\StopApplication;
 use App\Actions\Database\StartDatabase;
 use App\Actions\Database\StopDatabase;
 use App\Actions\Service\StartService;
@@ -128,144 +127,10 @@ class CloneMe extends Component
             $databases = $this->environment->databases();
             $services = $this->environment->services;
             foreach ($applications as $application) {
-                $applicationSettings = $application->settings;
-
-                $uuid = (string) new Cuid2;
-                $url = $application->fqdn;
-                if ($this->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
-                    $url = generateUrl(server: $this->server, random: $uuid);
-                }
-
-                $newApplication = $application->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                    'additional_servers_count',
-                    'additional_networks_count',
-                ])->fill([
-                    'uuid' => $uuid,
-                    'fqdn' => $url,
-                    'status' => 'exited',
+                $selectedDestination = $this->servers->flatMap(fn ($server) => $server->destinations)->where('id', $this->selectedDestination)->first();
+                clone_application($application, $selectedDestination, [
                     'environment_id' => $environment->id,
-                    'destination_id' => $this->selectedDestination,
-                ]);
-                $newApplication->save();
-
-                if ($newApplication->destination->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
-                    $customLabels = str(implode('|coolify|', generateLabelsApplication($newApplication)))->replace('|coolify|', "\n");
-                    $newApplication->custom_labels = base64_encode($customLabels);
-                    $newApplication->save();
-                }
-
-                $newApplication->settings()->delete();
-                if ($applicationSettings) {
-                    $newApplicationSettings = $applicationSettings->replicate([
-                        'id',
-                        'created_at',
-                        'updated_at',
-                    ])->fill([
-                        'application_id' => $newApplication->id,
-                    ]);
-                    $newApplicationSettings->save();
-                }
-
-                $tags = $application->tags;
-                foreach ($tags as $tag) {
-                    $newApplication->tags()->attach($tag->id);
-                }
-
-                $scheduledTasks = $application->scheduled_tasks()->get();
-                foreach ($scheduledTasks as $task) {
-                    $newTask = $task->replicate([
-                        'id',
-                        'created_at',
-                        'updated_at',
-                    ])->fill([
-                        'uuid' => (string) new Cuid2,
-                        'application_id' => $newApplication->id,
-                        'team_id' => currentTeam()->id,
-                    ]);
-                    $newTask->save();
-                }
-
-                $applicationPreviews = $application->previews()->get();
-                foreach ($applicationPreviews as $preview) {
-                    $newPreview = $preview->replicate([
-                        'id',
-                        'created_at',
-                        'updated_at',
-                    ])->fill([
-                        'application_id' => $newApplication->id,
-                        'status' => 'exited',
-                    ]);
-                    $newPreview->save();
-                }
-
-                $persistentVolumes = $application->persistentStorages()->get();
-                foreach ($persistentVolumes as $volume) {
-                    $newName = '';
-                    if (str_starts_with($volume->name, $application->uuid)) {
-                        $newName = str($volume->name)->replace($application->uuid, $newApplication->uuid);
-                    } else {
-                        $newName = $newApplication->uuid.'-'.$volume->name;
-                    }
-
-                    $newPersistentVolume = $volume->replicate([
-                        'id',
-                        'created_at',
-                        'updated_at',
-                    ])->fill([
-                        'name' => $newName,
-                        'resource_id' => $newApplication->id,
-                    ]);
-                    $newPersistentVolume->save();
-
-                    if ($this->cloneVolumeData) {
-                        try {
-                            StopApplication::dispatch($application, false, false);
-                            $sourceVolume = $volume->name;
-                            $targetVolume = $newPersistentVolume->name;
-                            $sourceServer = $application->destination->server;
-                            $targetServer = $newApplication->destination->server;
-
-                            VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
-
-                            queue_application_deployment(
-                                deployment_uuid: (string) new Cuid2,
-                                application: $application,
-                                server: $sourceServer,
-                                destination: $application->destination,
-                                no_questions_asked: true
-                            );
-                        } catch (\Exception $e) {
-                            \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
-                        }
-                    }
-                }
-
-                $fileStorages = $application->fileStorages()->get();
-                foreach ($fileStorages as $storage) {
-                    $newStorage = $storage->replicate([
-                        'id',
-                        'created_at',
-                        'updated_at',
-                    ])->fill([
-                        'resource_id' => $newApplication->id,
-                    ]);
-                    $newStorage->save();
-                }
-
-                $environmentVaribles = $application->environment_variables()->get();
-                foreach ($environmentVaribles as $environmentVarible) {
-                    $newEnvironmentVariable = $environmentVarible->replicate([
-                        'id',
-                        'created_at',
-                        'updated_at',
-                    ])->fill([
-                        'resourceable_id' => $newApplication->id,
-                    ]);
-                    $newEnvironmentVariable->save();
-                }
+                ], $this->cloneVolumeData);
             }
 
             foreach ($databases as $database) {
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index 28a6380d5..47b3534a2 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Project\Shared;
 
-use App\Actions\Application\StopApplication;
 use App\Actions\Database\StartDatabase;
 use App\Actions\Database\StopDatabase;
 use App\Actions\Service\StartService;
@@ -61,145 +60,7 @@ class ResourceOperations extends Component
         $server = $new_destination->server;
 
         if ($this->resource->getMorphClass() === \App\Models\Application::class) {
-            $name = 'clone-of-'.str($this->resource->name)->limit(20).'-'.$uuid;
-            $applicationSettings = $this->resource->settings;
-            $url = $this->resource->fqdn;
-
-            if ($server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
-                $url = generateUrl(server: $server, random: $uuid);
-            }
-
-            $new_resource = $this->resource->replicate([
-                'id',
-                'created_at',
-                'updated_at',
-                'additional_servers_count',
-                'additional_networks_count',
-            ])->fill([
-                'uuid' => $uuid,
-                'name' => $name,
-                'fqdn' => $url,
-                'status' => 'exited',
-                'destination_id' => $new_destination->id,
-            ]);
-            $new_resource->save();
-
-            if ($new_resource->destination->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
-                $customLabels = str(implode('|coolify|', generateLabelsApplication($new_resource)))->replace('|coolify|', "\n");
-                $new_resource->custom_labels = base64_encode($customLabels);
-                $new_resource->save();
-            }
-
-            $new_resource->settings()->delete();
-            if ($applicationSettings) {
-                $newApplicationSettings = $applicationSettings->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'application_id' => $new_resource->id,
-                ]);
-                $newApplicationSettings->save();
-            }
-
-            $tags = $this->resource->tags;
-            foreach ($tags as $tag) {
-                $new_resource->tags()->attach($tag->id);
-            }
-
-            $scheduledTasks = $this->resource->scheduled_tasks()->get();
-            foreach ($scheduledTasks as $task) {
-                $newTask = $task->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'uuid' => (string) new Cuid2,
-                    'application_id' => $new_resource->id,
-                    'team_id' => currentTeam()->id,
-                ]);
-                $newTask->save();
-            }
-
-            $applicationPreviews = $this->resource->previews()->get();
-            foreach ($applicationPreviews as $preview) {
-                $newPreview = $preview->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'application_id' => $new_resource->id,
-                    'status' => 'exited',
-                ]);
-                $newPreview->save();
-            }
-
-            $persistentVolumes = $this->resource->persistentStorages()->get();
-            foreach ($persistentVolumes as $volume) {
-                $newName = '';
-                if (str_starts_with($volume->name, $this->resource->uuid)) {
-                    $newName = str($volume->name)->replace($this->resource->uuid, $new_resource->uuid);
-                } else {
-                    $newName = $new_resource->uuid.'-'.str($volume->name)->afterLast('-');
-                }
-
-                $newPersistentVolume = $volume->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'name' => $newName,
-                    'resource_id' => $new_resource->id,
-                ]);
-                $newPersistentVolume->save();
-
-                if ($this->cloneVolumeData) {
-                    try {
-                        StopApplication::dispatch($this->resource, false, false);
-                        $sourceVolume = $volume->name;
-                        $targetVolume = $newPersistentVolume->name;
-                        $sourceServer = $this->resource->destination->server;
-                        $targetServer = $new_resource->destination->server;
-
-                        VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
-
-                        queue_application_deployment(
-                            deployment_uuid: (string) new Cuid2,
-                            application: $this->resource,
-                            server: $sourceServer,
-                            destination: $this->resource->destination,
-                            no_questions_asked: true
-                        );
-                    } catch (\Exception $e) {
-                        \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
-                    }
-                }
-            }
-
-            $fileStorages = $this->resource->fileStorages()->get();
-            foreach ($fileStorages as $storage) {
-                $newStorage = $storage->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'resource_id' => $new_resource->id,
-                ]);
-                $newStorage->save();
-            }
-
-            $environmentVaribles = $this->resource->environment_variables()->get();
-            foreach ($environmentVaribles as $environmentVarible) {
-                $newEnvironmentVariable = $environmentVarible->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'resourceable_id' => $new_resource->id,
-                    'resourceable_type' => $new_resource->getMorphClass(),
-                ]);
-                $newEnvironmentVariable->save();
-            }
+            $new_resource = clone_application($this->resource, $new_destination, ['uuid' => $uuid], $this->cloneVolumeData);
 
             $route = route('project.application.configuration', [
                 'project_uuid' => $this->projectUuid,
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index 87c24dbc6..2ae641a2b 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -1,12 +1,15 @@
 <?php
 
+use App\Actions\Application\StopApplication;
 use App\Enums\ApplicationDeploymentStatus;
 use App\Jobs\ApplicationDeploymentJob;
+use App\Jobs\VolumeCloneJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
 use Spatie\Url\Url;
+use Visus\Cuid2\Cuid2;
 
 function queue_application_deployment(Application $application, string $deployment_uuid, ?int $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $is_api = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, ?Server $server = null, ?StandaloneDocker $destination = null, bool $only_this_server = false, bool $rollback = false)
 {
@@ -162,3 +165,176 @@ function next_after_cancel(?Server $server = null)
         }
     }
 }
+
+function clone_application(Application $source, $destination, array $overrides = [], bool $cloneVolumeData = false): Application
+{
+    $uuid = $overrides['uuid'] ?? (string) new Cuid2;
+    $server = $destination->server;
+
+    // Prepare name and URL
+    $name = $overrides['name'] ?? 'clone-of-'.str($source->name)->limit(20).'-'.$uuid;
+    $applicationSettings = $source->settings;
+    $url = $overrides['fqdn'] ?? $source->fqdn;
+
+    if ($server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
+        $url = generateUrl(server: $server, random: $uuid);
+    }
+
+    // Clone the application
+    $newApplication = $source->replicate([
+        'id',
+        'created_at',
+        'updated_at',
+        'additional_servers_count',
+        'additional_networks_count',
+    ])->fill(array_merge([
+        'uuid' => $uuid,
+        'name' => $name,
+        'fqdn' => $url,
+        'status' => 'exited',
+        'destination_id' => $destination->id,
+    ], $overrides));
+    $newApplication->save();
+
+    // Update custom labels if needed
+    if ($newApplication->destination->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
+        $customLabels = str(implode('|coolify|', generateLabelsApplication($newApplication)))->replace('|coolify|', "\n");
+        $newApplication->custom_labels = base64_encode($customLabels);
+        $newApplication->save();
+    }
+
+    // Clone settings
+    $newApplication->settings()->delete();
+    if ($applicationSettings) {
+        $newApplicationSettings = $applicationSettings->replicate([
+            'id',
+            'created_at',
+            'updated_at',
+        ])->fill([
+            'application_id' => $newApplication->id,
+        ]);
+        $newApplicationSettings->save();
+    }
+
+    // Clone tags
+    $tags = $source->tags;
+    foreach ($tags as $tag) {
+        $newApplication->tags()->attach($tag->id);
+    }
+
+    // Clone scheduled tasks
+    $scheduledTasks = $source->scheduled_tasks()->get();
+    foreach ($scheduledTasks as $task) {
+        $newTask = $task->replicate([
+            'id',
+            'created_at',
+            'updated_at',
+        ])->fill([
+            'uuid' => (string) new Cuid2,
+            'application_id' => $newApplication->id,
+            'team_id' => currentTeam()->id,
+        ]);
+        $newTask->save();
+    }
+
+    // Clone previews with FQDN regeneration
+    clone_application_previews($source, $newApplication);
+
+    // Clone persistent volumes
+    $persistentVolumes = $source->persistentStorages()->get();
+    foreach ($persistentVolumes as $volume) {
+        $newName = '';
+        if (str_starts_with($volume->name, $source->uuid)) {
+            $newName = str($volume->name)->replace($source->uuid, $newApplication->uuid);
+        } else {
+            $newName = $newApplication->uuid.'-'.str($volume->name)->afterLast('-');
+        }
+
+        $newPersistentVolume = $volume->replicate([
+            'id',
+            'created_at',
+            'updated_at',
+        ])->fill([
+            'name' => $newName,
+            'resource_id' => $newApplication->id,
+        ]);
+        $newPersistentVolume->save();
+
+        if ($cloneVolumeData) {
+            try {
+                StopApplication::dispatch($source, false, false);
+                $sourceVolume = $volume->name;
+                $targetVolume = $newPersistentVolume->name;
+                $sourceServer = $source->destination->server;
+                $targetServer = $newApplication->destination->server;
+
+                VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
+
+                queue_application_deployment(
+                    deployment_uuid: (string) new Cuid2,
+                    application: $source,
+                    server: $sourceServer,
+                    destination: $source->destination,
+                    no_questions_asked: true
+                );
+            } catch (\Exception $e) {
+                \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
+            }
+        }
+    }
+
+    // Clone file storages
+    $fileStorages = $source->fileStorages()->get();
+    foreach ($fileStorages as $storage) {
+        $newStorage = $storage->replicate([
+            'id',
+            'created_at',
+            'updated_at',
+        ])->fill([
+            'resource_id' => $newApplication->id,
+        ]);
+        $newStorage->save();
+    }
+
+    // Clone environment variables
+    $environmentVariables = $source->environment_variables()->get();
+    foreach ($environmentVariables as $environmentVariable) {
+        $newEnvironmentVariable = $environmentVariable->replicate([
+            'id',
+            'created_at',
+            'updated_at',
+        ])->fill([
+            'resourceable_id' => $newApplication->id,
+            'resourceable_type' => $newApplication->getMorphClass(),
+        ]);
+        $newEnvironmentVariable->save();
+    }
+
+    return $newApplication;
+}
+
+function clone_application_previews(Application $sourceApplication, Application $targetApplication): void
+{
+    $applicationPreviews = $sourceApplication->previews()->get();
+    foreach ($applicationPreviews as $preview) {
+        $newPreview = $preview->replicate([
+            'id',
+            'created_at',
+            'updated_at',
+        ])->fill([
+            'uuid' => (string) new Cuid2,
+            'application_id' => $targetApplication->id,
+            'status' => 'exited',
+            'fqdn' => null,
+            'docker_compose_domains' => null,
+        ]);
+        $newPreview->save();
+
+        // Regenerate FQDN for the cloned preview
+        if ($targetApplication->build_pack === 'dockercompose') {
+            $newPreview->generate_preview_fqdn_compose();
+        } else {
+            $newPreview->generate_preview_fqdn();
+        }
+    }
+}