diff --git a/app/Http/Controllers/NodeController.php b/app/Http/Controllers/NodeController.php
index 7d55cb7..73c2c48 100644
--- a/app/Http/Controllers/NodeController.php
+++ b/app/Http/Controllers/NodeController.php
@@ -8,7 +8,6 @@
 use App\Models\Node;
 use App\Models\NodeTaskGroupType;
 use App\Models\Service;
-use App\Models\Swarm;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Inertia\Inertia;
@@ -87,13 +86,11 @@ public function show(Node $node)
 
         return Inertia::render('Nodes/Show', [
             'node' => $node,
-            'swarms' => Swarm::all(),
             'isLastNode' => $node->team->nodes->count() === 1,
             'initTaskGroup' => $initTaskGroup ?: $joinTaskGroup,
             'lastAgentVersion' => $lastAgentVersion,
             'agentUpgradeTaskGroup' => $taskGroup?->is_completed ? null : $taskGroup,
             'registryUpdateTaskGroup' => $registryTaskGroup?->is_completed ? null : $registryTaskGroup,
-            'swarmsQuotaReached' => auth()->user()->currentTeam->quotas()->swarms->quotaReached(),
         ]);
     }
 
diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php
index f5f324d..e324238 100644
--- a/app/Http/Controllers/ServiceController.php
+++ b/app/Http/Controllers/ServiceController.php
@@ -33,19 +33,18 @@ public function index()
      */
     public function create()
     {
-        $swarms = Swarm::all();
+        $swarm = auth()->user()->currentTeam->swarms()->first();
 
-        $networks = count($swarms) ? $swarms[0]->networks : [];
-        $nodes = count($swarms) ? $swarms[0]->nodes : [];
-        $dockerRegistries = count($swarms) ? $swarms[0]->data->registries : [];
-        $s3Storages = count($swarms) ? $swarms[0]->data->s3Storages : [];
+        $networks = $swarm->networks;
+        $nodes = $swarm->nodes;
+        $dockerRegistries = $swarm->data->registries;
+        $s3Storages = $swarm->data->s3Storages;
 
         $deploymentData = DeploymentData::make([
-            'networkName' => count($networks) ? $networks[0]->name : null,
+            'networkName' => $networks->first()->name,
         ]);
 
         return Inertia::render('Services/Create', [
-            'swarms' => $swarms,
             'networks' => $networks,
             'nodes' => $nodes,
             'deploymentData' => $deploymentData,
@@ -62,15 +61,21 @@ public function store(StoreServiceRequest $request)
     {
         $deploymentData = DeploymentData::validateAndCreate($request->get('deploymentData'));
 
+        $team = auth()->user()->currentTeam;
+        $swarm = $team->swarms()->firstOrFail();
+
         $service = Service::make($request->validated());
-        $service->team_id = auth()->user()->current_team_id;
+        $service->team_id = $team->id;
+        $service->swarm_id = $swarm->id;
+
         DB::transaction(function () use ($service, $deploymentData) {
             $service->save();
 
             $service->deploy($deploymentData);
         });
 
-        return to_route('services.deployments', ['service' => $service->id]);
+        return to_route('services.deployments', $service)
+            ->with('success', 'Service created and deployment scheduled successfully.');
     }
 
     /**
diff --git a/app/Http/Controllers/SwarmTaskController.php b/app/Http/Controllers/SwarmTaskController.php
index b08cb1d..b4f1d16 100644
--- a/app/Http/Controllers/SwarmTaskController.php
+++ b/app/Http/Controllers/SwarmTaskController.php
@@ -217,16 +217,22 @@ public function initCluster(InitClusterFormRequest $request)
     public function joinCluster(JoinClusterFormRequest $request)
     {
         DB::transaction(function () use ($request) {
+            $node = Node::findOrFail($request->node_id);
+            $swarm = $node->team->swarms()->first();
+
+            if (! $swarm) {
+                throw new \Exception('No swarm found for the node\'s team.');
+            }
+
             $taskGroup = NodeTaskGroup::create([
                 'type' => NodeTaskGroupType::JoinSwarm,
-                'swarm_id' => $request->swarm_id,
-                'team_id' => auth()->user()->currentTeam->id,
-                'node_id' => $request->node_id,
+                'swarm_id' => $swarm->id,
+                'team_id' => $node->team_id,
+                'node_id' => $node->id,
                 'invoker_id' => auth()->user()->id,
             ]);
 
-            $node = Node::findOrFail($request->node_id);
-            $node->swarm_id = $request->swarm_id;
+            $node->swarm_id = $swarm->id;
             $node->save();
 
             $remoteAddrs = collect($taskGroup->swarm->data->managerNodes)->map(fn (SwarmData\ManagerNode $node) => $node->addr)->toArray();
@@ -238,7 +244,7 @@ public function joinCluster(JoinClusterFormRequest $request)
 
             $taskGroup->tasks()->create([
                 'type' => NodeTaskType::JoinSwarm,
-                'meta' => JoinSwarmMeta::from(['swarmId' => $request->swarm_id, 'role' => $request->role]),
+                'meta' => JoinSwarmMeta::from(['swarmId' => $swarm->id, 'role' => $request->role]),
                 'payload' => [
                     'JoinSpec' => [
                         'ListenAddr' => '0.0.0.0:2377',
diff --git a/app/Http/Requests/NodeTask/InitClusterFormRequest.php b/app/Http/Requests/NodeTask/InitClusterFormRequest.php
index 6cfb88c..71453fe 100644
--- a/app/Http/Requests/NodeTask/InitClusterFormRequest.php
+++ b/app/Http/Requests/NodeTask/InitClusterFormRequest.php
@@ -15,7 +15,6 @@ public function rules(): array
     {
         return [
             'node_id' => ['required', 'exists:nodes,id'],
-            'name' => ['required', 'string', 'max:255'],
             'advertise_addr' => ['required', 'ipv4'],
             'force_new_cluster' => ['boolean'],
         ];
diff --git a/app/Http/Requests/NodeTask/JoinClusterFormRequest.php b/app/Http/Requests/NodeTask/JoinClusterFormRequest.php
index 03ee3a9..ffecee7 100644
--- a/app/Http/Requests/NodeTask/JoinClusterFormRequest.php
+++ b/app/Http/Requests/NodeTask/JoinClusterFormRequest.php
@@ -15,7 +15,6 @@ public function rules(): array
     {
         return [
             'node_id' => ['required', 'exists:nodes,id'],
-            'swarm_id' => ['required', 'exists:swarms,id'],
             'role' => ['required', 'in:manager,worker'],
             'advertise_addr' => ['exclude_if:role,worker', 'required', 'ipv4'],
         ];
diff --git a/app/Http/Requests/StoreServiceRequest.php b/app/Http/Requests/StoreServiceRequest.php
index 137ce2c..cbac1f3 100644
--- a/app/Http/Requests/StoreServiceRequest.php
+++ b/app/Http/Requests/StoreServiceRequest.php
@@ -23,7 +23,6 @@ public function rules(): array
     {
         return [
             'name' => ['required', 'string'],
-            'swarm_id' => ['required', 'exists:swarms,id'],
         ];
     }
 }
diff --git a/app/Models/NodeTasks/InitSwarm/InitSwarmMeta.php b/app/Models/NodeTasks/InitSwarm/InitSwarmMeta.php
index 2064f6e..408169e 100644
--- a/app/Models/NodeTasks/InitSwarm/InitSwarmMeta.php
+++ b/app/Models/NodeTasks/InitSwarm/InitSwarmMeta.php
@@ -8,13 +8,12 @@ class InitSwarmMeta extends AbstractTaskMeta
 {
     public function __construct(
         public int $swarmId,
-        public string $name,
         public bool $forceNewCluster
     ) {}
 
     public function formattedHtml(): string
     {
-        $msg = 'Initialize Docker Swarm cluster <code>'.$this->name.'</code>';
+        $msg = 'Initialize Docker Swarm cluster';
         if ($this->forceNewCluster) {
             $msg .= ' with <b>force cluster creation</b>';
         }
diff --git a/app/Models/Swarm.php b/app/Models/Swarm.php
index 454ef78..137fb72 100644
--- a/app/Models/Swarm.php
+++ b/app/Models/Swarm.php
@@ -13,7 +13,6 @@ class Swarm extends Model
     use HasOwningTeam;
 
     protected $fillable = [
-        'name',
         'data',
         'team_id',
     ];
diff --git a/app/Notifications/TrialEndsSoonNotification.php b/app/Notifications/TrialEndsSoonNotification.php
index 91c1f96..3241073 100644
--- a/app/Notifications/TrialEndsSoonNotification.php
+++ b/app/Notifications/TrialEndsSoonNotification.php
@@ -45,7 +45,7 @@ public function toMail(object $notifiable): MailMessage
         $dateDiff = $nextPayment->date->longRelativeToNowDiffForHumans();
 
         return (new MailMessage)
-            ->subject("Your trial ends in {$dateDiff}")
+            ->subject("Your free trial ends in {$dateDiff}")
             ->greeting("Hello {$this->team->customer->name}!")
             ->line('Your trial for team '.$this->team->name.' ends soon.')
             ->line("You will be charged {$nextPayment->amount()} on {$nextPayment->date->toDateTimeString()} ({$dateDiff}).")
diff --git a/database/migrations/2024_08_20_202958_alter_swarms_remove_name_column.php b/database/migrations/2024_08_20_202958_alter_swarms_remove_name_column.php
new file mode 100644
index 0000000..acf5cc0
--- /dev/null
+++ b/database/migrations/2024_08_20_202958_alter_swarms_remove_name_column.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('swarms', function (Blueprint $table) {
+            $table->dropColumn('name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('swarms', function (Blueprint $table) {
+            $table->string('name')->after('id');
+        });
+
+        DB::table('swarms')->update(['name' => DB::raw('CAST(id AS VARCHAR)')]);
+
+        Schema::table('swarms', function (Blueprint $table) {
+            $table->string('name')->nullable(false)->change();
+        });
+    }
+};
diff --git a/resources/js/Pages/Nodes/Partials/InitSwarmCluster.vue b/resources/js/Pages/Nodes/Partials/InitSwarmCluster.vue
new file mode 100644
index 0000000..0d7ea7f
--- /dev/null
+++ b/resources/js/Pages/Nodes/Partials/InitSwarmCluster.vue
@@ -0,0 +1,88 @@
+<script setup>
+import { defineProps } from "vue";
+import { useForm } from "@inertiajs/vue3";
+import PrimaryButton from "@/Components/PrimaryButton.vue";
+import FormSection from "@/Components/FormSection.vue";
+import InputError from "@/Components/InputError.vue";
+import { FwbCheckbox } from "flowbite-vue";
+import Select from "@/Components/Select.vue";
+import FormField from "@/Components/FormField.vue";
+
+const props = defineProps({
+    node: Object,
+});
+
+const initForm = useForm({
+    node_id: props.node.id,
+    advertise_addr: "",
+    force_new_cluster: false,
+});
+
+const submit = () => {
+    initForm.post(route("swarm-tasks.init-cluster"), {
+        preserveScroll: "errors",
+    });
+};
+</script>
+
+<template>
+    <FormSection @submitted="submit">
+        <template #title>Swarm Cluster</template>
+
+        <template #description>
+            This is your first node in the swarm cluster. Initializing a new
+            swarm cluster will make this node the manager node, responsible for
+            orchestrating and managing the cluster. You can add worker nodes to
+            this cluster later to distribute workloads efficiently.
+        </template>
+
+        <template #form>
+            <div v-auto-animate class="col-span-6 sm:col-span-4">
+                <div class="grid gap-4">
+                    <template v-if="$props.node.data.host.networks.length > 0">
+                        <FormField :error="initForm.errors.advertise_addr">
+                            <template #label>Advertisement Address</template>
+                            <Select
+                                id="advertise_addr"
+                                v-model="initForm.advertise_addr"
+                                placeholder="Select Advertise Address"
+                            >
+                                <optgroup
+                                    v-for="network in $props.node.data.host
+                                        .networks"
+                                    :label="network.if_name"
+                                >
+                                    <option
+                                        v-for="ip in network.ips"
+                                        :value="ip.ip"
+                                    >
+                                        {{ ip.ip }}
+                                    </option>
+                                </optgroup>
+                            </Select>
+                        </FormField>
+
+                        <FormField :error="initForm.errors.force_new_cluster">
+                            <!-- TODO: add warning that the force new cluster will wipe out your existing cluster (services, data?) -->
+                            <FwbCheckbox
+                                label="Force New Cluster"
+                                v-model="initForm.force_new_cluster"
+                            />
+                        </FormField>
+                        <InputError
+                            v-if="initForm.force_new_cluster"
+                            message="Be aware that you will lose your data!"
+                        />
+                    </template>
+                    <template v-else> No IP found </template>
+                </div>
+            </div>
+        </template>
+
+        <template #submit>
+            <PrimaryButton type="submit"
+                >Initialize Swarm Cluster</PrimaryButton
+            >
+        </template>
+    </FormSection>
+</template>
diff --git a/resources/js/Pages/Nodes/Partials/JoinSwarmCluster.vue b/resources/js/Pages/Nodes/Partials/JoinSwarmCluster.vue
new file mode 100644
index 0000000..3d9928f
--- /dev/null
+++ b/resources/js/Pages/Nodes/Partials/JoinSwarmCluster.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { defineProps } from "vue";
+import { useForm } from "@inertiajs/vue3";
+import PrimaryButton from "@/Components/PrimaryButton.vue";
+import FormSection from "@/Components/FormSection.vue";
+import Select from "@/Components/Select.vue";
+import FormField from "@/Components/FormField.vue";
+
+const props = defineProps({
+    node: Object,
+});
+
+const joinForm = useForm({
+    node_id: props.node.id,
+    role: "manager",
+    advertise_addr: "",
+});
+
+const submit = () => {
+    joinForm.post(route("swarm-tasks.join-cluster"), {
+        preserveScroll: "errors",
+    });
+};
+</script>
+
+<template>
+    <FormSection @submitted="submit">
+        <template #title>Swarm Cluster</template>
+
+        <template #description>
+            Connect this node to an existing Docker Swarm cluster, enabling
+            seamless integration and distributed computing capabilities.
+        </template>
+
+        <template #form>
+            <div class="col-span-6 sm:col-span-4">
+                <div class="grid gap-4">
+                    <FormField :error="joinForm.errors.role">
+                        <template #label> Role </template>
+
+                        <Select v-model="joinForm.role">
+                            <option value="manager">Manager</option>
+                            <option value="worker">Worker</option>
+                        </Select>
+                    </FormField>
+
+                    <FormField :error="joinForm.errors.advertise_addr">
+                        <template #label>Advertisement Address</template>
+                        <Select
+                            id="advertise_addr"
+                            v-model="joinForm.advertise_addr"
+                            placeholder="Select Advertise Address"
+                        >
+                            <optgroup
+                                v-for="network in $props.node.data.host
+                                    .networks"
+                                :label="network.if_name"
+                            >
+                                <option
+                                    v-for="ip in network.ips"
+                                    :value="ip.ip"
+                                >
+                                    {{ ip.ip }}
+                                </option>
+                            </optgroup>
+                        </Select>
+                    </FormField>
+                </div>
+            </div>
+        </template>
+
+        <template #submit>
+            <PrimaryButton type="submit">Join Swarm Cluster</PrimaryButton>
+        </template>
+    </FormSection>
+</template>
diff --git a/resources/js/Pages/Nodes/Partials/NewSwarmCluster.vue b/resources/js/Pages/Nodes/Partials/NewSwarmCluster.vue
deleted file mode 100644
index f56c063..0000000
--- a/resources/js/Pages/Nodes/Partials/NewSwarmCluster.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<script setup>
-import { defineProps, reactive } from "vue";
-import { router, useForm } from "@inertiajs/vue3";
-import PrimaryButton from "@/Components/PrimaryButton.vue";
-import FormSection from "@/Components/FormSection.vue";
-import TextInput from "@/Components/TextInput.vue";
-import InputLabel from "@/Components/InputLabel.vue";
-import InputError from "@/Components/InputError.vue";
-import Dropdown from "@/Components/Dropdown.vue";
-import { FwbCheckbox, FwbRadio, FwbSelect } from "flowbite-vue";
-import Select from "@/Components/Select.vue";
-import FormField from "@/Components/FormField.vue";
-
-const props = defineProps({
-    node: Object,
-    swarms: Array,
-    swarmsQuotaReached: Boolean,
-});
-
-const swarmOption = reactive({
-    form: props.swarmsQuotaReached ? "join" : "init",
-});
-
-const initForm = useForm({
-    node_id: props.node.id,
-    name: "",
-    advertise_addr: "",
-    force_new_cluster: false,
-});
-
-const joinForm = useForm({
-    node_id: props.node.id,
-    swarm_id: props.swarms[0]?.id ?? "",
-    role: "worker",
-    advertise_addr: "",
-});
-
-const submit = () => {
-    // TODO: if option is 'init' -> initCluster()
-    // TODO: if option is 'join' -> joinCluster()
-    if (swarmOption.form === "init") {
-        initForm.post(route("swarm-tasks.init-cluster"), {
-            preserveScroll: "errors",
-        });
-    } else if (swarmOption.form === "join") {
-        joinForm.post(route("swarm-tasks.join-cluster"), {
-            preserveScroll: "errors",
-        });
-    }
-};
-</script>
-
-<template>
-    <FormSection @submitted="submit">
-        <template #title> Swarm Cluster </template>
-
-        <template #description>
-            Select either to initialize a new cluster or join an existing
-            cluster.
-        </template>
-
-        <template #form>
-            <div class="col-span-6 sm:col-span-4">
-                <ul
-                    class="items-center w-full text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-lg sm:flex dark:bg-gray-700 dark:border-gray-600 dark:text-white"
-                >
-                    <li
-                        class="w-full border-b border-gray-200 sm:border-b-0 sm:border-r dark:border-gray-600"
-                    >
-                        <div class="flex items-center ps-3">
-                            <input
-                                id="swarm-init-option"
-                                v-model="swarmOption.form"
-                                type="radio"
-                                value="init"
-                                name="list-radio"
-                                class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-700 dark:focus:ring-offset-gray-700 focus:ring-2 dark:bg-gray-600 dark:border-gray-500"
-                            />
-                            <label
-                                for="swarm-init-option"
-                                class="w-full py-3 ms-2 text-sm font-medium text-gray-900 dark:text-gray-300"
-                                >Initialize Cluster</label
-                            >
-                        </div>
-                    </li>
-                    <li
-                        class="w-full border-b border-gray-200 sm:border-b-0 sm:border-r dark:border-gray-600"
-                    >
-                        <div class="flex items-center ps-3">
-                            <input
-                                id="swarm-join-option"
-                                v-model="swarmOption.form"
-                                type="radio"
-                                value="join"
-                                name="list-radio"
-                                class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-700 dark:focus:ring-offset-gray-700 focus:ring-2 dark:bg-gray-600 dark:border-gray-500"
-                            />
-                            <label
-                                for="swarm-join-option"
-                                class="w-full py-3 ms-2 text-sm font-medium text-gray-900 dark:text-gray-300"
-                                >Join an Existing Cluster</label
-                            >
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <div v-auto-animate class="col-span-6 sm:col-span-4">
-                <div v-if="swarmOption.form === 'init'" class="grid gap-4">
-                    <template v-if="swarmsQuotaReached">
-                        <p class="text-sm text-red-500">
-                            You have reached the maximum number of Swarm
-                            Clusters allowed.
-                        </p>
-                    </template>
-                    <template
-                        v-else-if="$props.node.data.host.networks.length > 0"
-                    >
-                        <FormField :error="initForm.errors.name">
-                            <template #label>Swarm Name</template>
-
-                            <TextInput
-                                v-model="initForm.name"
-                                class="block w-full"
-                            />
-                        </FormField>
-                        <FormField :error="initForm.errors.advertise_addr">
-                            <template #label>Advertisement Address</template>
-                            <Select
-                                id="advertise_addr"
-                                v-model="initForm.advertise_addr"
-                                placeholder="Select Advertise Address"
-                            >
-                                <optgroup
-                                    v-for="network in $props.node.data.host
-                                        .networks"
-                                    :label="network.if_name"
-                                >
-                                    <option
-                                        v-for="ip in network.ips"
-                                        :value="ip.ip"
-                                    >
-                                        {{ ip.ip }}
-                                    </option>
-                                </optgroup>
-                            </Select>
-                        </FormField>
-
-                        <FormField :error="initForm.errors.force_new_cluster">
-                            <!-- TODO: add warning that the force new cluster will wipe out your existing cluster (services, data?) -->
-                            <FwbCheckbox
-                                label="Force New Cluster"
-                                v-model="initForm.force_new_cluster"
-                            />
-                        </FormField>
-                        <InputError
-                            v-if="initForm.force_new_cluster"
-                            message="Be aware that you will lose your data!"
-                        />
-                    </template>
-                    <template v-else> No IP found </template>
-                </div>
-
-                <div
-                    v-if="swarmOption.form === 'join'"
-                    v-auto-animate
-                    class="grid gap-4"
-                >
-                    <template v-if="swarms.length === 0">
-                        <p class="text-sm text-red-500">
-                            Please initialize a cluster first - no Swarm
-                            Clusters exist yet.
-                        </p>
-                    </template>
-                    <template>
-                        <FormField :error="joinForm.errors.swarm_id">
-                            <template #label> Swarm Cluster </template>
-
-                            <Select v-model="joinForm.swarm_id">
-                                <option
-                                    v-for="swarm in $page.props.swarms"
-                                    :value="swarm.id"
-                                >
-                                    {{ swarm.name }}
-                                </option>
-                            </Select>
-                        </FormField>
-
-                        <FormField :error="joinForm.errors.role">
-                            <template #label> Role </template>
-
-                            <Select v-model="joinForm.role">
-                                <option value="manager">Manager</option>
-                                <option value="worker">Worker</option>
-                            </Select>
-                        </FormField>
-
-                        <FormField :error="joinForm.errors.advertise_addr">
-                            <template #label>Advertisement Address</template>
-                            <Select
-                                id="advertise_addr"
-                                v-model="joinForm.advertise_addr"
-                                placeholder="Select Advertise Address"
-                            >
-                                <optgroup
-                                    v-for="network in $props.node.data.host
-                                        .networks"
-                                    :label="network.if_name"
-                                >
-                                    <option
-                                        v-for="ip in network.ips"
-                                        :value="ip.ip"
-                                    >
-                                        {{ ip.ip }}
-                                    </option>
-                                </optgroup>
-                            </Select>
-                        </FormField>
-                    </template>
-                </div>
-            </div>
-        </template>
-
-        <template #submit>
-            <PrimaryButton type="submit">Initialize Node</PrimaryButton>
-        </template>
-    </FormSection>
-</template>
diff --git a/resources/js/Pages/Nodes/Show.vue b/resources/js/Pages/Nodes/Show.vue
index 737635c..0557811 100644
--- a/resources/js/Pages/Nodes/Show.vue
+++ b/resources/js/Pages/Nodes/Show.vue
@@ -1,5 +1,6 @@
 <script setup>
-import NewSwarmCluster from "@/Pages/Nodes/Partials/NewSwarmCluster.vue";
+import InitSwarmCluster from "@/Pages/Nodes/Partials/InitSwarmCluster.vue";
+import JoinSwarmCluster from "@/Pages/Nodes/Partials/JoinSwarmCluster.vue";
 import ServerDetailsForm from "@/Pages/Nodes/Partials/ServerDetailsForm.vue";
 import ShowLayout from "@/Pages/Nodes/ShowLayout.vue";
 import AgentStatus from "@/Pages/Nodes/Partials/AgentStatus.vue";
@@ -9,19 +10,16 @@ import SwarmDetails from "@/Pages/Nodes/Partials/SwarmDetails.vue";
 import AgentUpgradeStatus from "@/Pages/Nodes/Partials/AgentUpgradeStatus.vue";
 import DockerRegistries from "@/Pages/Nodes/Partials/DockerRegistries.vue";
 import S3Storages from "@/Pages/Nodes/Partials/S3Storages.vue";
-import ActionSection from "@/Components/ActionSection.vue";
 import DeleteResourceSection from "@/Components/DeleteResourceSection.vue";
 import { router } from "@inertiajs/vue3";
 
 const props = defineProps([
     "node",
-    "swarms",
     "isLastNode",
     "initTaskGroup",
     "lastAgentVersion",
     "agentUpgradeTaskGroup",
     "registryUpdateTaskGroup",
-    "swarmsQuotaReached",
 ]);
 
 const destroyNode = () => router.delete(route("nodes.destroy", props.node.id));
@@ -46,12 +44,16 @@ const destroyNode = () => router.delete(route("nodes.destroy", props.node.id));
         <SectionBorder v-if="$props.node.online" />
 
         <template v-if="$props.node.online">
-            <NewSwarmCluster
-                v-if="$props.node.swarm_id === null"
+            <InitSwarmCluster
+                v-if="isLastNode && node.swarm_id === null"
                 :node="$props.node"
-                :swarms="$props.swarms"
-                :swarmsQuotaReached="swarmsQuotaReached"
             />
+
+            <JoinSwarmCluster
+                v-if="!isLastNode && node.swarm_id === null"
+                :node="$props.node"
+            />
+
             <InitSwarmProgress
                 v-if="$props.initTaskGroup"
                 :taskGroup="$props.initTaskGroup"
diff --git a/resources/js/Pages/Services/Create.vue b/resources/js/Pages/Services/Create.vue
index 4b53f7f..9d6a230 100644
--- a/resources/js/Pages/Services/Create.vue
+++ b/resources/js/Pages/Services/Create.vue
@@ -16,7 +16,6 @@ import DeploymentData from "@/Pages/Services/Partials/DeploymentData.vue";
 import TemplatePicker from "@/Pages/Services/Partials/TemplatePicker.vue";
 
 const props = defineProps({
-    swarms: Array,
     networks: Array,
     nodes: Array,
     deploymentData: Object,
@@ -27,7 +26,6 @@ const props = defineProps({
 
 const form = useForm({
     name: "",
-    swarm_id: props.swarms[0]?.id,
     deploymentData: props.deploymentData,
 });
 
@@ -89,33 +87,9 @@ const applyTemplate = (template) => {
 
                     <template #description>
                         <p>
-                            Select a swarm where the service will be deployed
-                            to.
-                        </p>
-                        <p>
-                            The name of the service can be changed at any time.
-                            Be aware, that the service name in the Swarm cluster
-                            will not be changed.
-                        </p>
-
-                        <p>
-                            You can isolate containers from each other by using
-                            different networks.
-                        </p>
-                        <p>
-                            Service will be accessible by the internal domain
-                            name to other containers on the same network.
-                        </p>
-                        <p>
-                            You can make certain ports of the containers
-                            accessible from the host network. Please set up the
-                            firewall rule on your host to prevent unwanted
-                            access.
-                        </p>
-                        <p>
-                            If you don't select the Placement Node, the
-                            containers will be able to run on any node of the
-                            Swarm Cluster.
+                            Note that the service name can be modified at any
+                            time, but this change will not affect the service
+                            name within the Swarm cluster.
                         </p>
                     </template>
 
@@ -123,7 +97,6 @@ const applyTemplate = (template) => {
                         <ServiceDetailsForm
                             v-model="form"
                             :team="$page.props.auth.user.current_team"
-                            :swarms="swarms"
                         />
                     </template>
                 </ActionSection>
diff --git a/resources/js/Pages/Services/Partials/DeploymentData.vue b/resources/js/Pages/Services/Partials/DeploymentData.vue
index 51c6452..97d19aa 100644
--- a/resources/js/Pages/Services/Partials/DeploymentData.vue
+++ b/resources/js/Pages/Services/Partials/DeploymentData.vue
@@ -26,7 +26,6 @@ import BackupSchedule from "@/Components/BackupSchedule.vue";
 const model = defineModel();
 
 const props = defineProps({
-    swarms: Array,
     networks: Array,
     nodes: Array,
     serviceName: String | undefined,
@@ -287,7 +286,18 @@ const extractFieldErrors = (basePath) => {
         <template #title> Service Location </template>
 
         <template #description>
-            <p>Configure the location of the service in the swarm.</p>
+            <p>
+                To isolate containers from one another, you can utilize
+                different networks.
+            </p>
+            <p>
+                Services can be accessed by their internal domain name by other
+                containers on the same network.
+            </p>
+            <p>
+                If no Placement Node is selected, the containers will be able to
+                run on any node within the Swarm Cluster.
+            </p>
         </template>
 
         <template #content>
diff --git a/resources/js/Pages/Services/Partials/ServiceDetailsForm.vue b/resources/js/Pages/Services/Partials/ServiceDetailsForm.vue
index e0125bb..e028ed6 100644
--- a/resources/js/Pages/Services/Partials/ServiceDetailsForm.vue
+++ b/resources/js/Pages/Services/Partials/ServiceDetailsForm.vue
@@ -3,30 +3,21 @@ import TextInput from "@/Components/TextInput.vue";
 import TeamCard from "@/Components/TeamCard.vue";
 import FormField from "@/Components/FormField.vue";
 import Select from "@/Components/Select.vue";
-import {effect, reactive} from "vue";
+import { effect, reactive } from "vue";
 
 const model = defineModel();
 
 const props = defineProps({
-  team: Object,
-  swarms: Array,
-})
+    team: Object,
+});
 </script>
 
 <template>
-  <TeamCard :team="$props.team" />
+    <TeamCard :team="$props.team" />
 
-  <FormField :error="model.errors.name" class="col-span-2">
-    <template #label>Service Name</template>
+    <FormField :error="model.errors.name" class="col-span-2">
+        <template #label>Service Name</template>
 
-    <TextInput v-model="model.name" class="block w-full"/>
-  </FormField>
-
-  <FormField :error="model.errors.swarm_id" class="col-span-2">
-    <template #label>Swarm</template>
-
-    <Select v-model="model.swarm_id" :disabled="model.id">
-      <option v-for="swarm in $props.swarms" :value="swarm.id">{{ swarm.name }}</option>
-    </Select>
-  </FormField>
-</template>
\ No newline at end of file
+        <TextInput v-model="model.name" class="block w-full" />
+    </FormField>
+</template>
diff --git a/resources/js/Pages/Services/Show.vue b/resources/js/Pages/Services/Show.vue
index 6ad38e4..fbd203e 100644
--- a/resources/js/Pages/Services/Show.vue
+++ b/resources/js/Pages/Services/Show.vue
@@ -1,7 +1,7 @@
 <script setup>
 import ShowLayout from "@/Pages/Services/ShowLayout.vue";
 import PrimaryButton from "@/Components/PrimaryButton.vue";
-import {useForm} from "@inertiajs/vue3";
+import { useForm } from "@inertiajs/vue3";
 import DeploymentData from "@/Pages/Services/Partials/DeploymentData.vue";
 import ServiceDetailsForm from "@/Pages/Services/Partials/ServiceDetailsForm.vue";
 import FormSection from "@/Components/FormSection.vue";
@@ -11,79 +11,100 @@ import TextInput from "@/Components/TextInput.vue";
 import DialogModal from "@/Components/DialogModal.vue";
 import InputError from "@/Components/InputError.vue";
 import SecondaryButton from "@/Components/SecondaryButton.vue";
-import {nextTick, reactive, ref} from "vue";
+import { nextTick, reactive, ref } from "vue";
 import ActionSection from "@/Components/ActionSection.vue";
 import DeleteResourceSection from "@/Components/DeleteResourceSection.vue";
 
 const props = defineProps({
-  service: Object,
-  dockerRegistries: Array,
-  s3Storages: Array,
-})
+    service: Object,
+    dockerRegistries: Array,
+    s3Storages: Array,
+});
 
 const serviceForm = useForm({
-  id: props.service.id,
-  name: props.service.name,
-  swarm_id: props.service.swarm_id,
+    id: props.service.id,
+    name: props.service.name,
 });
 
 const updateService = () => {
-  serviceForm.put(route('services.update', props.service.id));
-}
+    serviceForm.put(route("services.update", props.service.id));
+};
 
 const deploymentForm = useForm(props.service.latest_deployment.data);
 
 const deploy = () => {
-  deploymentForm.post(route('services.deploy', props.service.id));
-}
+    deploymentForm.post(route("services.deploy", props.service.id));
+};
 
 const deletionForm = useForm({
-  serviceName: '',
+    serviceName: "",
 });
 
 const destroyService = () => {
-    return deletionForm.delete(route('services.destroy', props.service.id));
-}
+    return deletionForm.delete(route("services.destroy", props.service.id));
+};
 
 const serviceDeleteInput = ref(null);
 </script>
 
 <template>
-  <ShowLayout :service="props.service">
-    <FormSection @submit="updateService">
-      <template #title>
-        Service Details
-      </template>
-
-      <template #description>
-        <p>You can update the name of the service. Currently it is not possible to move the service between swarms and/or teams.</p>
-        <p>The service name change will affect only the UI and not the actual service on the Docker Swarm.</p>
-      </template>
-
-      <template #form>
-        <ServiceDetailsForm v-model="serviceForm" :team="$props.service.team" :swarms="[$props.service.swarm]" />
-      </template>
-
-      <template #submit>
-        <PrimaryButton :class="{ 'opacity-25': serviceForm.processing }" :disabled="serviceForm.processing">
-          Save
-        </PrimaryButton>
-      </template>
-    </FormSection>
-
-    <form @submit.prevent="deploy">
-      <DeploymentData v-model="deploymentForm" :errors="deploymentForm.errors" :docker-registries="props.dockerRegistries" :s3-storages="props.s3Storages" />
-
-      <div class="flex justify-end">
-        <PrimaryButton :class="{ 'opacity-25': deploymentForm.processing }" :disabled="deploymentForm.processing">
-          Deploy Changes
-        </PrimaryButton>
-      </div>
-    </form>
-
-    <SectionBorder />
-
-    <DeleteResourceSection resource-kind="Service" :resource-name="props.service.name" :destroy="destroyService">
-    </DeleteResourceSection>
-  </ShowLayout>
-</template>
\ No newline at end of file
+    <ShowLayout :service="props.service">
+        <FormSection @submit="updateService">
+            <template #title> Service Details </template>
+
+            <template #description>
+                <p>
+                    You can update the name of the service. Currently it is not
+                    possible to move the service between swarms and/or teams.
+                </p>
+                <p>
+                    The service name change will affect only the UI and not the
+                    actual service on the Docker Swarm.
+                </p>
+            </template>
+
+            <template #form>
+                <ServiceDetailsForm
+                    v-model="serviceForm"
+                    :team="$props.service.team"
+                />
+            </template>
+
+            <template #submit>
+                <PrimaryButton
+                    :class="{ 'opacity-25': serviceForm.processing }"
+                    :disabled="serviceForm.processing"
+                >
+                    Save
+                </PrimaryButton>
+            </template>
+        </FormSection>
+
+        <form @submit.prevent="deploy">
+            <DeploymentData
+                v-model="deploymentForm"
+                :errors="deploymentForm.errors"
+                :docker-registries="props.dockerRegistries"
+                :s3-storages="props.s3Storages"
+            />
+
+            <div class="flex justify-end">
+                <PrimaryButton
+                    :class="{ 'opacity-25': deploymentForm.processing }"
+                    :disabled="deploymentForm.processing"
+                >
+                    Deploy Changes
+                </PrimaryButton>
+            </div>
+        </form>
+
+        <SectionBorder />
+
+        <DeleteResourceSection
+            resource-kind="Service"
+            :resource-name="props.service.name"
+            :destroy="destroyService"
+        >
+        </DeleteResourceSection>
+    </ShowLayout>
+</template>