diff --git a/src/tools/yaml-viewer/yaml-models.ts b/src/tools/yaml-viewer/yaml-models.ts
index 9ab30431..9160255e 100644
--- a/src/tools/yaml-viewer/yaml-models.ts
+++ b/src/tools/yaml-viewer/yaml-models.ts
@@ -1,37 +1,24 @@
 import { type MaybeRef, get } from '@vueuse/core';
-import JSON5 from 'json5';
+import yaml from "js-yaml";
 
-export { sortObjectKeys, formatYaml };
-
-function sortObjectKeys<T>(obj: T): T {
-    if (typeof obj !== 'object' || obj === null) {
-        return obj;
-    }
-
-    if (Array.isArray(obj)) {
-        return obj.map(sortObjectKeys) as unknown as T;
-    }
-
-    return Object.keys(obj)
-        .sort((a, b) => a.localeCompare(b))
-        .reduce((sortedObj, key) => {
-            sortedObj[key] = sortObjectKeys((obj as Record<string, unknown>)[key]);
-            return sortedObj;
-        }, {} as Record<string, unknown>) as T;
-}
+export { formatYaml };
 
 function formatYaml({
                         rawYaml,
                         sortKeys = false,
-                        stripComments = false,
-                        indentSize = 3,
+                        indentSize = 2,
                     }: {
     rawYaml: MaybeRef<string>
     sortKeys?: MaybeRef<boolean>
     stripComments?: MaybeRef<boolean>
     indentSize?: MaybeRef<number>
 }) {
-    const parsedObject = JSON5.parse(get(rawYaml));
+    const parsedYaml = yaml.load(get(rawYaml));
 
-    return JSON.stringify(get(sortKeys) ? sortObjectKeys(parsedObject) : parsedObject, null, get(indentSize));
+    const formattedYAML = yaml.dump(parsedYaml, {
+        indent: get(indentSize),
+        sortKeys: get(sortKeys)
+    });
+
+    return formattedYAML
 }
diff --git a/src/tools/yaml-viewer/yaml-viewer.vue b/src/tools/yaml-viewer/yaml-viewer.vue
index d2c216b1..4541030f 100644
--- a/src/tools/yaml-viewer/yaml-viewer.vue
+++ b/src/tools/yaml-viewer/yaml-viewer.vue
@@ -11,9 +11,8 @@ const inputElement = ref<HTMLElement>();
 const rawYaml = useStorage('yaml-prettify:raw-yaml', '');
 const indentSize = useStorage('yaml-prettify:indent-size', 2);
 const sortKeys = useStorage('yaml-prettify:sort-keys', false);
-const stripComments = useStorage('yaml-prettify:strip-comments', false);
 
-const cleanYaml = computed(() => withDefaultOnError(() => formatYaml({ rawYaml: rawYaml, indentSize, sortKeys, stripComments }), ''));
+const cleanYaml = computed(() => withDefaultOnError(() => formatYaml({ rawYaml: rawYaml, indentSize, sortKeys }), ''));
 
 const rawYamlValidation = useValidation({
   source: rawYaml,
@@ -32,11 +31,8 @@ const rawYamlValidation = useValidation({
       <n-form-item label="Sort keys :" label-placement="left" label-width="100">
         <n-switch v-model:value="sortKeys" />
       </n-form-item>
-      <n-form-item label="Strip comments :" label-placement="left" label-width="125">
-        <n-switch v-model:value="sortKeys" />
-      </n-form-item>
       <n-form-item label="Indent size :" label-placement="left" label-width="100" :show-feedback="false">
-        <n-input-number v-model:value="indentSize" min="0" max="10" style="width: 100px" />
+        <n-input-number v-model:value="indentSize" min="1" max="10" style="width: 100px" />
       </n-form-item>
     </div>
   </div>
@@ -60,7 +56,7 @@ const rawYamlValidation = useValidation({
     />
   </n-form-item>
   <n-form-item label="Prettified version of your YAML">
-    <TextareaCopyable :value="cleanYaml" language="json" :follow-height-of="inputElement" />
+    <TextareaCopyable :value="cleanYaml" language="yaml" :follow-height-of="inputElement" />
   </n-form-item>
 </template>