diff --git a/resources/views/livewire/project/service/edit-compose.blade.php b/resources/views/livewire/project/service/edit-compose.blade.php
index ab9948cf7..2632fc0ea 100644
--- a/resources/views/livewire/project/service/edit-compose.blade.php
+++ b/resources/views/livewire/project/service/edit-compose.blade.php
@@ -9,7 +9,8 @@
             id="service.is_container_label_escape_enabled" instantSave></x-forms.checkbox>
     </div>
     <div x-cloak x-show="raw" class="font-mono">
-        <x-forms.textarea allowTab rows="20" id="service.docker_compose_raw">
+        <x-forms.textarea allowTab useMonacoEditor monacoEditorLanguage="yaml" rows="20"
+            id="service.docker_compose_raw">
         </x-forms.textarea>
     </div>
     <div x-cloak x-show="raw === false" class="font-mono">
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index f20800bcd..b7050b6ac 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -18,7 +18,8 @@
                             <path fill="currentColor"
                                 d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
                         </svg>Before switching proxies, please read <a class="underline dark:text-white"
-                            href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>.</div>
+                            href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>.
+                    </div>
                     @if ($server->proxyType() === 'TRAEFIK_V2')
                         <h4 class="pb-4">Traefik</h4>
                     @elseif ($server->proxyType() === 'CADDY')
@@ -39,8 +40,8 @@
                     <div wire:loading.remove wire:target="loadProxyConfiguration">
                         @if ($proxy_settings)
                             <div class="flex flex-col gap-2 pt-4">
-                                <x-forms.textarea label="Configuration file" name="proxy_settings"
-                                    wire:model="proxy_settings" rows="30" />
+                                <x-forms.textarea useMonacoEditor monacoEditorLanguage="yaml" label="Configuration file"
+                                    name="proxy_settings" id="proxy_settings" rows="30" />
                                 <x-forms.button wire:click.prevent="reset_proxy_configuration">
                                     Reset configuration to default
                                 </x-forms.button>
diff --git a/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php b/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php
index fadd3f3bd..3c6bee370 100644
--- a/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php
+++ b/resources/views/livewire/server/proxy/new-dynamic-configuration.blade.php
@@ -1,5 +1,5 @@
 <form wire:submit.prevent="addDynamicConfiguration" class="flex flex-col w-full gap-4">
     <x-forms.input autofocus id="fileName" label="Filename" required />
-    <x-forms.textarea allowTab id="value" label="Configuration" required rows="20" />
+    <x-forms.textarea allowTab useMonacoEditor id="value" label="Configuration" required rows="20" />
     <x-forms.button type="submit" @click="slideOverOpen=false">Save</x-forms.button>
 </form>