diff --git a/app/src/components/TemplateDialog.tsx b/app/src/components/TemplateDialog.tsx
index af7fd03e..89e08933 100644
--- a/app/src/components/TemplateDialog.tsx
+++ b/app/src/components/TemplateDialog.tsx
@@ -228,7 +228,7 @@ const TemplateDialog: React.FC<TemplateDialogProps> = ({
                         <div className="relative w-full rounded-md overflow-hidden border">
                           <CodeEditor
                             value={templateFiles.config || ""}
-                            language="yaml"
+                            language="toml"
                             className="font-mono w-full [&_*]:!break-words"
                           />
                           <Button
diff --git a/app/src/components/TemplateGrid.tsx b/app/src/components/TemplateGrid.tsx
index 34c3eeb9..5269c6fb 100644
--- a/app/src/components/TemplateGrid.tsx
+++ b/app/src/components/TemplateGrid.tsx
@@ -82,7 +82,7 @@ const TemplateGrid: React.FC<TemplateGridProps> = ({ view }) => {
     try {
       const [dockerComposeRes, configRes] = await Promise.all([
         fetch(`/blueprints/${templateId}/docker-compose.yml`),
-        fetch(`/blueprints/${templateId}/template.yml`),
+        fetch(`/blueprints/${templateId}/template.toml`),
       ]);
 
       const dockerCompose = dockerComposeRes.ok
diff --git a/app/src/components/ui/code-editor.tsx b/app/src/components/ui/code-editor.tsx
index 16960024..5865e860 100644
--- a/app/src/components/ui/code-editor.tsx
+++ b/app/src/components/ui/code-editor.tsx
@@ -121,7 +121,7 @@ function dockerComposeComplete(
 interface Props extends ReactCodeMirrorProps {
   wrapperClassName?: string;
   disabled?: boolean;
-  language?: "yaml" | "json" | "properties" | "shell";
+  language?: "yaml" | "json" | "properties" | "shell" | "toml";
   lineWrapping?: boolean;
   lineNumbers?: boolean;
 }