diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index dfdd0e3..cb8f737 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -28,7 +28,7 @@ jobs:
               TEMPLATE_NAME=$(basename "$dir")
 
               COMPOSE_FILE="$dir/docker-compose.yml"
-              TEMPLATE_FILE="$dir/template.yml"
+              TEMPLATE_FILE="$dir/template.toml"
 
               if [ ! -f "$COMPOSE_FILE" ]; then
                 echo "❌ Missing docker-compose.yml in $TEMPLATE_NAME"
@@ -36,7 +36,7 @@ jobs:
               fi
 
               if [ ! -f "$TEMPLATE_FILE" ]; then
-                echo "❌ Missing template.yml in $TEMPLATE_NAME"
+                echo "❌ Missing template.toml in $TEMPLATE_NAME"
                 ERROR=1
               fi
             fi
diff --git a/README.md b/README.md
index 10ecec7..01fe605 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ services:
 volumes:
   grafana-storage: {}
 ```
-3. Add the `template.yml` file to the folder, this is where we specify the domains, mounts and env variables, to understand more the structure of `template.yml` you can read here [Template.yml structure](#templateyml-structure)
+3. Add the `template.toml` file to the folder, this is where we specify the domains, mounts and env variables, to understand more the structure of `template.toml` you can read here [Template.toml structure](#template.toml-structure)
 
 ```yaml
 variables:
@@ -82,48 +82,50 @@ config:
 6. Commit and push your changes
 7. Create a pull request
 
-### Template.yml structure
-
-Dokploy use a defined structure for the `template.yml` file, we have 4 sections available:
+### Template.toml structure
 
+Dokploy use a defined structure for the `template.toml` file, we have 4 sections available:
 
 1. `variables`: This is where we define the variables that will be used in the `domains`, `env` and `mounts` sections.
 2. `domains`: This is where we define the configuration for the template.
 3. `env`: This is where we define the environment variables for the template.
 4. `mounts`: This is where we define the mounts for the template.
 
-
 - The `variables(Optional)` structure is the following:
 
-```yaml
-variables:
-  main_domain: ${domain}
-  my_domain: https://my-domain.com
-  my_password: ${password:32}
-  any_helper: ${you-can-use-any-helper}
+```toml
+[variables]
+main_domain = "${domain}"
+my_domain = "https://my-domain.com"
+my_password = "${password:32}"
+any_helper = "${you-can-use-any-helper}"
 ```
 
 - The `config` structure is the following:
 
-```yaml
-config:
-  domains: # Optional
-    - serviceName: grafana # Required
-      port: 3000 # Required
-      host: ${main_domain} # Required
-      path: / # Optional
+```toml
+[config]
+# Optional sections below
 
-  env: # Optional
-    - AP_HOST=${main_domain}
-    - AP_API_KEY=${api_key}
-    - AP_ENCRYPTION_KEY=${encryption_key}
-    - AP_JWT_SECRET=${jwt_secret}
-    - AP_POSTGRES_PASSWORD=${postgres_password}
+[[config.domains]]
+serviceName = "grafana" # Required
+port = 3000 # Required
+host = "${main_domain}" # Required
+path = "/" # Optional
 
-  mounts: # Optional or []
-    - filePath: /content/file.txt
-      content: |
-        My content
+env = [
+    "AP_HOST=${main_domain}",
+    "AP_API_KEY=${api_key}",
+    "AP_ENCRYPTION_KEY=${encryption_key}",
+    "AP_JWT_SECRET=${jwt_secret}",
+    "AP_POSTGRES_PASSWORD=${postgres_password}"
+]
+
+[[config.mounts]]
+filePath = "/content/file.txt"
+content = """
+My content
+"""
 ```
 
 Important: you can reference any variable in the `domains`, `env` and `mounts` sections. just use the `${variable_name}` syntax, in the case you don't want to define a variable, you can use the `domain`, `base64`, `password`, `hash`, `uuid`, `randomPort` or `timestamp` helpers.
diff --git a/app/package.json b/app/package.json
index a0f490f..19dc0c5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,6 +10,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "yaml":"2.7.1",
+    "@iarna/toml": "^2.2.5",
     "@codemirror/autocomplete": "^6.18.6",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-yaml": "^6.1.1",
diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 3669f77..b73fc7d 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -26,6 +26,9 @@ importers:
       '@codemirror/view':
         specifier: 6.29.0
         version: 6.29.0
+      '@iarna/toml':
+        specifier: ^2.2.5
+        version: 2.2.5
       '@radix-ui/react-dialog':
         specifier: ^1.1.6
         version: 1.1.6(@types/react-dom@19.0.4(@types/react@19.0.10))(@types/react@19.0.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
@@ -46,7 +49,7 @@ importers:
         version: 1.1.3(@types/react-dom@19.0.4(@types/react@19.0.10))(@types/react@19.0.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       '@tailwindcss/vite':
         specifier: ^4.0.12
-        version: 4.0.12(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2))
+        version: 4.0.12(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1))
       '@uiw/codemirror-theme-github':
         specifier: ^4.22.1
         version: 4.23.10(@codemirror/language@6.10.8)(@codemirror/state@6.5.2)(@codemirror/view@6.29.0)
@@ -91,7 +94,10 @@ importers:
         version: 1.0.7(tailwindcss@4.0.12)
       vite-plugin-static-copy:
         specifier: 2.3.0
-        version: 2.3.0(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2))
+        version: 2.3.0(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1))
+      yaml:
+        specifier: 2.7.1
+        version: 2.7.1
       zustand:
         specifier: ^5.0.3
         version: 5.0.3(@types/react@19.0.10)(react@19.0.0)
@@ -107,7 +113,7 @@ importers:
         version: 19.0.4(@types/react@19.0.10)
       '@vitejs/plugin-react':
         specifier: ^4.3.4
-        version: 4.3.4(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2))
+        version: 4.3.4(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1))
       globals:
         specifier: ^15.15.0
         version: 15.15.0
@@ -116,7 +122,7 @@ importers:
         version: 5.7.3
       vite:
         specifier: ^6.2.0
-        version: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)
+        version: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1)
 
 packages:
 
@@ -408,6 +414,9 @@ packages:
   '@floating-ui/utils@0.2.9':
     resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==}
 
+  '@iarna/toml@2.2.5':
+    resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
+
   '@jridgewell/gen-mapping@0.3.8':
     resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
     engines: {node: '>=6.0.0'}
@@ -1657,6 +1666,11 @@ packages:
   yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
+  yaml@2.7.1:
+    resolution: {integrity: sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==}
+    engines: {node: '>= 14'}
+    hasBin: true
+
   zustand@5.0.3:
     resolution: {integrity: sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg==}
     engines: {node: '>=12.20.0'}
@@ -1965,6 +1979,8 @@ snapshots:
 
   '@floating-ui/utils@0.2.9': {}
 
+  '@iarna/toml@2.2.5': {}
+
   '@jridgewell/gen-mapping@0.3.8':
     dependencies:
       '@jridgewell/set-array': 1.2.1
@@ -2581,13 +2597,13 @@ snapshots:
       '@tailwindcss/oxide-win32-arm64-msvc': 4.0.12
       '@tailwindcss/oxide-win32-x64-msvc': 4.0.12
 
-  '@tailwindcss/vite@4.0.12(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2))':
+  '@tailwindcss/vite@4.0.12(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1))':
     dependencies:
       '@tailwindcss/node': 4.0.12
       '@tailwindcss/oxide': 4.0.12
       lightningcss: 1.29.2
       tailwindcss: 4.0.12
-      vite: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)
+      vite: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1)
 
   '@types/babel__core@7.20.5':
     dependencies:
@@ -2665,14 +2681,14 @@ snapshots:
       - '@codemirror/lint'
       - '@codemirror/search'
 
-  '@vitejs/plugin-react@4.3.4(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2))':
+  '@vitejs/plugin-react@4.3.4(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1))':
     dependencies:
       '@babel/core': 7.26.9
       '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.9)
       '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.9)
       '@types/babel__core': 7.20.5
       react-refresh: 0.14.2
-      vite: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)
+      vite: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -3087,16 +3103,16 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.0.10
 
-  vite-plugin-static-copy@2.3.0(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)):
+  vite-plugin-static-copy@2.3.0(vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1)):
     dependencies:
       chokidar: 3.6.0
       fast-glob: 3.3.3
       fs-extra: 11.3.0
       p-map: 7.0.3
       picocolors: 1.1.1
-      vite: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)
+      vite: 6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1)
 
-  vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2):
+  vite@6.2.1(@types/node@20.17.24)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.7.1):
     dependencies:
       esbuild: 0.25.1
       postcss: 8.5.3
@@ -3106,11 +3122,14 @@ snapshots:
       fsevents: 2.3.3
       jiti: 2.4.2
       lightningcss: 1.29.2
+      yaml: 2.7.1
 
   w3c-keyname@2.2.8: {}
 
   yallist@3.1.1: {}
 
+  yaml@2.7.1: {}
+
   zustand@5.0.3(@types/react@19.0.10)(react@19.0.0):
     optionalDependencies:
       '@types/react': 19.0.10
diff --git a/app/script.js b/app/script.js
new file mode 100644
index 0000000..fd64000
--- /dev/null
+++ b/app/script.js
@@ -0,0 +1,36 @@
+import yaml from "yaml";
+import toml from "@iarna/toml";
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+function convertYamlToToml(yamlContent) {
+  const parsedYaml = yaml.parse(yamlContent);
+  return toml.stringify(parsedYaml);
+}
+
+function processDirectory(dirPath) {
+  const files = fs.readdirSync(dirPath);
+
+  files.forEach((file) => {
+    const filePath = path.join(dirPath, file);
+    const stat = fs.statSync(filePath);
+
+    if (stat.isDirectory()) {
+      processDirectory(filePath);
+    } else if (file === "template.yml") {
+      console.log(`Converting ${filePath}`);
+      const yamlContent = fs.readFileSync(filePath, "utf8");
+      const tomlContent = convertYamlToToml(yamlContent);
+      const tomlPath = path.join(dirPath, "template.toml");
+      fs.writeFileSync(tomlPath, tomlContent);
+    }
+  });
+}
+
+// Ruta al directorio blueprints relativa al script
+const blueprintsPath = path.join(__dirname, "..", "blueprints");
+processDirectory(blueprintsPath);
diff --git a/app/src/components/TemplateDialog.tsx b/app/src/components/TemplateDialog.tsx
index af7fd03..89e0893 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 34c3eeb..5269c6f 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 1696002..5865e86 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;
 }
diff --git a/blueprints/activepieces/template.toml b/blueprints/activepieces/template.toml
new file mode 100644
index 0000000..387a7c7
--- /dev/null
+++ b/blueprints/activepieces/template.toml
@@ -0,0 +1,21 @@
+[variables]
+main_domain = "${domain}"
+api_key = "${password:32}"
+encryption_key = "${password:32}"
+jwt_secret = "${password:32}"
+postgres_password = "${password:32}"
+
+[config]
+env = [
+  "AP_HOST=${main_domain}",
+  "AP_API_KEY=${api_key}",
+  "AP_ENCRYPTION_KEY=${encryption_key}",
+  "AP_JWT_SECRET=${jwt_secret}",
+  "AP_POSTGRES_PASSWORD=${postgres_password}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "activepieces"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/activepieces/template.yml b/blueprints/activepieces/template.yml
deleted file mode 100644
index c30eeaf..0000000
--- a/blueprints/activepieces/template.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-variables:
-  main_domain: ${domain}
-  api_key: ${password:32}
-  encryption_key: ${password:32}
-  jwt_secret: ${password:32}
-  postgres_password: ${password:32}
-
-config:
-  domains:
-    - serviceName: activepieces
-      port: 80
-      host: ${main_domain}
-
-  env:
-    - AP_HOST=${main_domain}
-    - AP_API_KEY=${api_key}
-    - AP_ENCRYPTION_KEY=${encryption_key}
-    - AP_JWT_SECRET=${jwt_secret}
-    - AP_POSTGRES_PASSWORD=${postgres_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/actualbudget/template.toml b/blueprints/actualbudget/template.toml
new file mode 100644
index 0000000..a3e4dd6
--- /dev/null
+++ b/blueprints/actualbudget/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "actualbudget"
+port = 5_006
+host = "${main_domain}"
diff --git a/blueprints/actualbudget/template.yml b/blueprints/actualbudget/template.yml
deleted file mode 100644
index 2df5577..0000000
--- a/blueprints/actualbudget/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: actualbudget
-      port: 5006
-      host: ${main_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/alist/template.toml b/blueprints/alist/template.toml
new file mode 100644
index 0000000..3244836
--- /dev/null
+++ b/blueprints/alist/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "alist"
+port = 5_244
+host = "${main_domain}"
diff --git a/blueprints/alist/template.yml b/blueprints/alist/template.yml
deleted file mode 100644
index 56102d2..0000000
--- a/blueprints/alist/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: alist
-      port: 5244
-      host: ${main_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/answer/template.toml b/blueprints/answer/template.toml
new file mode 100644
index 0000000..2d77e89
--- /dev/null
+++ b/blueprints/answer/template.toml
@@ -0,0 +1,12 @@
+[variables]
+main_domain = "${domain}"
+service_hash = "${hash:32}"
+
+[config]
+env = ["ANSWER_HOST=http://${main_domain}", "SERVICE_HASH=${service_hash}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "answer"
+port = 9_080
+host = "${main_domain}"
diff --git a/blueprints/answer/template.yml b/blueprints/answer/template.yml
deleted file mode 100644
index a7c749d..0000000
--- a/blueprints/answer/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  service_hash: ${hash:32}
-
-config:
-  domains:
-    - serviceName: answer
-      port: 9080
-      host: ${main_domain}
-
-  env:
-    - ANSWER_HOST=http://${main_domain}
-    - SERVICE_HASH=${service_hash}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/appsmith/template.toml b/blueprints/appsmith/template.toml
new file mode 100644
index 0000000..ab3b1c0
--- /dev/null
+++ b/blueprints/appsmith/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "appsmith"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/appsmith/template.yml b/blueprints/appsmith/template.yml
deleted file mode 100644
index 706df33..0000000
--- a/blueprints/appsmith/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: appsmith
-      port: 80
-      host: ${main_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/appwrite/template.toml b/blueprints/appwrite/template.toml
new file mode 100644
index 0000000..3188ea1
--- /dev/null
+++ b/blueprints/appwrite/template.toml
@@ -0,0 +1,143 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = [
+  "_APP_ENV=production",
+  "_APP_LOCALE=en",
+  "_APP_OPTIONS_ABUSE=enabled",
+  "_APP_OPTIONS_FORCE_HTTPS=disabled",
+  "_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled",
+  "_APP_OPTIONS_ROUTER_PROTECTION=disabled",
+  "_APP_OPENSSL_KEY_V1=your-secret-key",
+  "_APP_DOMAIN=${main_domain}",
+  "_APP_DOMAIN_FUNCTIONS=${main_domain}",
+  "_APP_DOMAIN_TARGET=${main_domain}",
+  "_APP_CONSOLE_WHITELIST_ROOT=enabled",
+  "_APP_CONSOLE_WHITELIST_EMAILS=",
+  "_APP_CONSOLE_WHITELIST_IPS=",
+  "_APP_CONSOLE_HOSTNAMES=",
+  "_APP_SYSTEM_EMAIL_NAME=Appwrite",
+  "_APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io",
+  "_APP_SYSTEM_TEAM_EMAIL=team@appwrite.io",
+  "_APP_SYSTEM_RESPONSE_FORMAT=",
+  "_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=certs@appwrite.io",
+  "_APP_EMAIL_SECURITY=",
+  "_APP_EMAIL_CERTIFICATES=",
+  "_APP_USAGE_STATS=enabled",
+  "_APP_LOGGING_PROVIDER=",
+  "_APP_LOGGING_CONFIG=",
+  "_APP_USAGE_AGGREGATION_INTERVAL=30",
+  "_APP_USAGE_TIMESERIES_INTERVAL=30",
+  "_APP_USAGE_DATABASE_INTERVAL=900",
+  "_APP_WORKER_PER_CORE=6",
+  "_APP_CONSOLE_SESSION_ALERTS=disabled",
+  "_APP_REDIS_HOST=redis",
+  "_APP_REDIS_PORT=6379",
+  "_APP_REDIS_USER=",
+  "_APP_REDIS_PASS=",
+  "_APP_DB_HOST=mariadb",
+  "_APP_DB_PORT=3306",
+  "_APP_DB_SCHEMA=appwrite",
+  "_APP_DB_USER=user",
+  "_APP_DB_PASS=password",
+  "_APP_DB_ROOT_PASS=rootsecretpassword",
+  "_APP_INFLUXDB_HOST=influxdb",
+  "_APP_INFLUXDB_PORT=8086",
+  "_APP_STATSD_HOST=telegraf",
+  "_APP_STATSD_PORT=8125",
+  "_APP_SMTP_HOST=",
+  "_APP_SMTP_PORT=",
+  "_APP_SMTP_SECURE=",
+  "_APP_SMTP_USERNAME=",
+  "_APP_SMTP_PASSWORD=",
+  "_APP_SMS_PROVIDER=",
+  "_APP_SMS_FROM=",
+  "_APP_STORAGE_LIMIT=30000000",
+  "_APP_STORAGE_PREVIEW_LIMIT=20000000",
+  "_APP_STORAGE_ANTIVIRUS=disabled",
+  "_APP_STORAGE_ANTIVIRUS_HOST=clamav",
+  "_APP_STORAGE_ANTIVIRUS_PORT=3310",
+  "_APP_STORAGE_DEVICE=local",
+  "_APP_STORAGE_S3_ACCESS_KEY=",
+  "_APP_STORAGE_S3_SECRET=",
+  "_APP_STORAGE_S3_REGION=us-east-1",
+  "_APP_STORAGE_S3_BUCKET=",
+  "_APP_STORAGE_DO_SPACES_ACCESS_KEY=",
+  "_APP_STORAGE_DO_SPACES_SECRET=",
+  "_APP_STORAGE_DO_SPACES_REGION=us-east-1",
+  "_APP_STORAGE_DO_SPACES_BUCKET=",
+  "_APP_STORAGE_BACKBLAZE_ACCESS_KEY=",
+  "_APP_STORAGE_BACKBLAZE_SECRET=",
+  "_APP_STORAGE_BACKBLAZE_REGION=us-west-004",
+  "_APP_STORAGE_BACKBLAZE_BUCKET=",
+  "_APP_STORAGE_LINODE_ACCESS_KEY=",
+  "_APP_STORAGE_LINODE_SECRET=",
+  "_APP_STORAGE_LINODE_REGION=eu-central-1",
+  "_APP_STORAGE_LINODE_BUCKET=",
+  "_APP_STORAGE_WASABI_ACCESS_KEY=",
+  "_APP_STORAGE_WASABI_SECRET=",
+  "_APP_STORAGE_WASABI_REGION=eu-central-1",
+  "_APP_STORAGE_WASABI_BUCKET=",
+  "_APP_FUNCTIONS_SIZE_LIMIT=30000000",
+  "_APP_FUNCTIONS_BUILD_SIZE_LIMIT=2000000000",
+  "_APP_FUNCTIONS_TIMEOUT=900",
+  "_APP_FUNCTIONS_BUILD_TIMEOUT=900",
+  "_APP_FUNCTIONS_CONTAINERS=10",
+  "_APP_FUNCTIONS_CPUS=0",
+  "_APP_FUNCTIONS_MEMORY=0",
+  "_APP_FUNCTIONS_MEMORY_SWAP=0",
+  "_APP_FUNCTIONS_RUNTIMES=node-16.0,php-8.0,python-3.9,ruby-3.0",
+  "_APP_EXECUTOR_SECRET=your-secret-key",
+  "_APP_EXECUTOR_HOST=http://exc1/v1",
+  "_APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes",
+  "_APP_FUNCTIONS_ENVS=node-16.0,php-7.4,python-3.9,ruby-3.0",
+  "_APP_FUNCTIONS_INACTIVE_THRESHOLD=60",
+  "DOCKERHUB_PULL_USERNAME=",
+  "DOCKERHUB_PULL_PASSWORD=",
+  "DOCKERHUB_PULL_EMAIL=",
+  "OPEN_RUNTIMES_NETWORK=appwrite_runtimes",
+  "_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes",
+  "_APP_DOCKER_HUB_USERNAME=",
+  "_APP_DOCKER_HUB_PASSWORD=",
+  "_APP_FUNCTIONS_MAINTENANCE_INTERVAL=3600",
+  "_APP_VCS_GITHUB_APP_NAME=",
+  "_APP_VCS_GITHUB_PRIVATE_KEY=",
+  "_APP_VCS_GITHUB_APP_ID=",
+  "_APP_VCS_GITHUB_CLIENT_ID=",
+  "_APP_VCS_GITHUB_CLIENT_SECRET=",
+  "_APP_VCS_GITHUB_WEBHOOK_SECRET=",
+  "_APP_MAINTENANCE_INTERVAL=86400",
+  "_APP_MAINTENANCE_DELAY=0",
+  "_APP_MAINTENANCE_RETENTION_CACHE=2592000",
+  "_APP_MAINTENANCE_RETENTION_EXECUTION=1209600",
+  "_APP_MAINTENANCE_RETENTION_AUDIT=1209600",
+  "_APP_MAINTENANCE_RETENTION_ABUSE=86400",
+  "_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000",
+  "_APP_MAINTENANCE_RETENTION_SCHEDULES=86400",
+  "_APP_GRAPHQL_MAX_BATCH_SIZE=10",
+  "_APP_GRAPHQL_MAX_COMPLEXITY=250",
+  "_APP_GRAPHQL_MAX_DEPTH=3",
+  "_APP_MIGRATIONS_FIREBASE_CLIENT_ID=",
+  "_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=",
+  "_APP_ASSISTANT_OPENAI_API_KEY=",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "appwrite"
+port = 80
+host = "${main_domain}"
+path = "/"
+
+[[config.domains]]
+serviceName = "appwrite-console"
+port = 80
+host = "${main_domain}"
+path = "/console"
+
+[[config.domains]]
+serviceName = "appwrite-realtime"
+port = 80
+host = "${main_domain}"
+path = "/v1/realtime"
diff --git a/blueprints/appwrite/template.yml b/blueprints/appwrite/template.yml
deleted file mode 100644
index c86eb8a..0000000
--- a/blueprints/appwrite/template.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: appwrite
-      port: 80
-      host: ${main_domain}
-      path: /
-    - serviceName: appwrite-console
-      port: 80
-      host: ${main_domain}
-      path: /console
-    - serviceName: appwrite-realtime
-      port: 80
-      host: ${main_domain}
-      path: /v1/realtime
-
-  env:
-    - _APP_ENV=production
-    - _APP_LOCALE=en
-    - _APP_OPTIONS_ABUSE=enabled
-    - _APP_OPTIONS_FORCE_HTTPS=disabled
-    - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
-    - _APP_OPTIONS_ROUTER_PROTECTION=disabled
-    - _APP_OPENSSL_KEY_V1=your-secret-key
-    - _APP_DOMAIN=${main_domain}
-    - _APP_DOMAIN_FUNCTIONS=${main_domain}
-    - _APP_DOMAIN_TARGET=${main_domain}
-    - _APP_CONSOLE_WHITELIST_ROOT=enabled
-    - _APP_CONSOLE_WHITELIST_EMAILS=
-    - _APP_CONSOLE_WHITELIST_IPS=
-    - _APP_CONSOLE_HOSTNAMES=
-    - _APP_SYSTEM_EMAIL_NAME=Appwrite
-    - _APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io
-    - _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
-    - _APP_SYSTEM_RESPONSE_FORMAT=
-    - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=certs@appwrite.io
-    - _APP_EMAIL_SECURITY=
-    - _APP_EMAIL_CERTIFICATES=
-    - _APP_USAGE_STATS=enabled
-    - _APP_LOGGING_PROVIDER=
-    - _APP_LOGGING_CONFIG=
-    - _APP_USAGE_AGGREGATION_INTERVAL=30
-    - _APP_USAGE_TIMESERIES_INTERVAL=30
-    - _APP_USAGE_DATABASE_INTERVAL=900
-    - _APP_WORKER_PER_CORE=6
-    - _APP_CONSOLE_SESSION_ALERTS=disabled
-    - _APP_REDIS_HOST=redis
-    - _APP_REDIS_PORT=6379
-    - _APP_REDIS_USER=
-    - _APP_REDIS_PASS=
-    - _APP_DB_HOST=mariadb
-    - _APP_DB_PORT=3306
-    - _APP_DB_SCHEMA=appwrite
-    - _APP_DB_USER=user
-    - _APP_DB_PASS=password
-    - _APP_DB_ROOT_PASS=rootsecretpassword
-    - _APP_INFLUXDB_HOST=influxdb
-    - _APP_INFLUXDB_PORT=8086
-    - _APP_STATSD_HOST=telegraf
-    - _APP_STATSD_PORT=8125
-    - _APP_SMTP_HOST=
-    - _APP_SMTP_PORT=
-    - _APP_SMTP_SECURE=
-    - _APP_SMTP_USERNAME=
-    - _APP_SMTP_PASSWORD=
-    - _APP_SMS_PROVIDER=
-    - _APP_SMS_FROM=
-    - _APP_STORAGE_LIMIT=30000000
-    - _APP_STORAGE_PREVIEW_LIMIT=20000000
-    - _APP_STORAGE_ANTIVIRUS=disabled
-    - _APP_STORAGE_ANTIVIRUS_HOST=clamav
-    - _APP_STORAGE_ANTIVIRUS_PORT=3310
-    - _APP_STORAGE_DEVICE=local
-    - _APP_STORAGE_S3_ACCESS_KEY=
-    - _APP_STORAGE_S3_SECRET=
-    - _APP_STORAGE_S3_REGION=us-east-1
-    - _APP_STORAGE_S3_BUCKET=
-    - _APP_STORAGE_DO_SPACES_ACCESS_KEY=
-    - _APP_STORAGE_DO_SPACES_SECRET=
-    - _APP_STORAGE_DO_SPACES_REGION=us-east-1
-    - _APP_STORAGE_DO_SPACES_BUCKET=
-    - _APP_STORAGE_BACKBLAZE_ACCESS_KEY=
-    - _APP_STORAGE_BACKBLAZE_SECRET=
-    - _APP_STORAGE_BACKBLAZE_REGION=us-west-004
-    - _APP_STORAGE_BACKBLAZE_BUCKET=
-    - _APP_STORAGE_LINODE_ACCESS_KEY=
-    - _APP_STORAGE_LINODE_SECRET=
-    - _APP_STORAGE_LINODE_REGION=eu-central-1
-    - _APP_STORAGE_LINODE_BUCKET=
-    - _APP_STORAGE_WASABI_ACCESS_KEY=
-    - _APP_STORAGE_WASABI_SECRET=
-    - _APP_STORAGE_WASABI_REGION=eu-central-1
-    - _APP_STORAGE_WASABI_BUCKET=
-    - _APP_FUNCTIONS_SIZE_LIMIT=30000000
-    - _APP_FUNCTIONS_BUILD_SIZE_LIMIT=2000000000
-    - _APP_FUNCTIONS_TIMEOUT=900
-    - _APP_FUNCTIONS_BUILD_TIMEOUT=900
-    - _APP_FUNCTIONS_CONTAINERS=10
-    - _APP_FUNCTIONS_CPUS=0
-    - _APP_FUNCTIONS_MEMORY=0
-    - _APP_FUNCTIONS_MEMORY_SWAP=0
-    - _APP_FUNCTIONS_RUNTIMES=node-16.0,php-8.0,python-3.9,ruby-3.0
-    - _APP_EXECUTOR_SECRET=your-secret-key
-    - _APP_EXECUTOR_HOST=http://exc1/v1
-    - _APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes
-    - _APP_FUNCTIONS_ENVS=node-16.0,php-7.4,python-3.9,ruby-3.0
-    - _APP_FUNCTIONS_INACTIVE_THRESHOLD=60
-    - DOCKERHUB_PULL_USERNAME=
-    - DOCKERHUB_PULL_PASSWORD=
-    - DOCKERHUB_PULL_EMAIL=
-    - OPEN_RUNTIMES_NETWORK=appwrite_runtimes
-    - _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
-    - _APP_DOCKER_HUB_USERNAME=
-    - _APP_DOCKER_HUB_PASSWORD=
-    - _APP_FUNCTIONS_MAINTENANCE_INTERVAL=3600
-    - _APP_VCS_GITHUB_APP_NAME=
-    - _APP_VCS_GITHUB_PRIVATE_KEY=
-    - _APP_VCS_GITHUB_APP_ID=
-    - _APP_VCS_GITHUB_CLIENT_ID=
-    - _APP_VCS_GITHUB_CLIENT_SECRET=
-    - _APP_VCS_GITHUB_WEBHOOK_SECRET=
-    - _APP_MAINTENANCE_INTERVAL=86400
-    - _APP_MAINTENANCE_DELAY=0
-    - _APP_MAINTENANCE_RETENTION_CACHE=2592000
-    - _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
-    - _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-    - _APP_MAINTENANCE_RETENTION_ABUSE=86400
-    - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
-    - _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
-    - _APP_GRAPHQL_MAX_BATCH_SIZE=10
-    - _APP_GRAPHQL_MAX_COMPLEXITY=250
-    - _APP_GRAPHQL_MAX_DEPTH=3
-    - _APP_MIGRATIONS_FIREBASE_CLIENT_ID=
-    - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=
-    - _APP_ASSISTANT_OPENAI_API_KEY=
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/aptabase/template.toml b/blueprints/aptabase/template.toml
new file mode 100644
index 0000000..e7ebb66
--- /dev/null
+++ b/blueprints/aptabase/template.toml
@@ -0,0 +1,12 @@
+[variables]
+main_domain = "${domain}"
+auth_secret = "${base64:32}"
+
+[config]
+env = ["APTABASE_HOST=${main_domain}", "AUTH_SECRET=${auth_secret}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "aptabase"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/aptabase/template.yml b/blueprints/aptabase/template.yml
deleted file mode 100644
index 1471746..0000000
--- a/blueprints/aptabase/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  auth_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: aptabase
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - APTABASE_HOST=${main_domain}
-    - AUTH_SECRET=${auth_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/backrest/template.toml b/blueprints/backrest/template.toml
new file mode 100644
index 0000000..7e42678
--- /dev/null
+++ b/blueprints/backrest/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["TZ=Europe/Paris"]
+mounts = []
+
+[[config.domains]]
+serviceName = "backrest"
+port = 9_898
+host = "${main_domain}"
diff --git a/blueprints/baserow/template.toml b/blueprints/baserow/template.toml
new file mode 100644
index 0000000..d4afcc5
--- /dev/null
+++ b/blueprints/baserow/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["BASEROW_HOST=${main_domain}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "baserow"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/baserow/template.yml b/blueprints/baserow/template.yml
deleted file mode 100644
index 0aa1240..0000000
--- a/blueprints/baserow/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: baserow
-      port: 80
-      host: ${main_domain}
-
-  env:
-    - BASEROW_HOST=${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/blender/template.toml b/blueprints/blender/template.toml
new file mode 100644
index 0000000..52907f1
--- /dev/null
+++ b/blueprints/blender/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = [
+  "PUID=1000",
+  "PGID=1000",
+  "TZ=Etc/UTC",
+  "SUBFOLDER=/",
+  "NVIDIA_VISIBLE_DEVICES=all",
+  "NVIDIA_DRIVER_CAPABILITIES=all",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "blender"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/blender/template.yml b/blueprints/blender/template.yml
deleted file mode 100644
index b4703f9..0000000
--- a/blueprints/blender/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: blender
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - PUID=1000
-    - PGID=1000
-    - TZ=Etc/UTC
-    - SUBFOLDER=/
-    - NVIDIA_VISIBLE_DEVICES=all
-    - NVIDIA_DRIVER_CAPABILITIES=all
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/blinko/template.toml b/blueprints/blinko/template.toml
new file mode 100644
index 0000000..127e39b
--- /dev/null
+++ b/blueprints/blinko/template.toml
@@ -0,0 +1,20 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password:16}"
+nextauth_secret = "${password:32}"
+nextauth_url = "http://${main_domain}"
+next_public_base_url = "http://${main_domain}"
+
+[config]
+env = [
+  "nextauth_secret=${nextauth_secret}",
+  "postgres_password=${postgres_password}",
+  "nextauth_url=${nextauth_url}",
+  "next_public_base_url=${next_public_base_url}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "blinko-website"
+port = 1_111
+host = "${main_domain}"
diff --git a/blueprints/browserless/template.toml b/blueprints/browserless/template.toml
new file mode 100644
index 0000000..e1714af
--- /dev/null
+++ b/blueprints/browserless/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+browserless_token = "${password:16}"
+
+[config]
+env = [
+  "BROWERLESS_HOST=${main_domain}",
+  "BROWSERLESS_TOKEN=${browserless_token}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "browserless"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/browserless/template.yml b/blueprints/browserless/template.yml
deleted file mode 100644
index a2999ff..0000000
--- a/blueprints/browserless/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  browserless_token: ${password:16}
-
-config:
-  domains:
-    - serviceName: browserless
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - BROWERLESS_HOST=${main_domain}
-    - BROWSERLESS_TOKEN=${browserless_token}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/budibase/template.toml b/blueprints/budibase/template.toml
new file mode 100644
index 0000000..3152554
--- /dev/null
+++ b/blueprints/budibase/template.toml
@@ -0,0 +1,29 @@
+[variables]
+main_domain = "${domain}"
+api_key = "${password:32}"
+encryption_key = "${password:32}"
+jwt_secret = "${password:32}"
+couchdb_password = "${password:32}"
+redis_password = "${password:32}"
+minio_access_key = "${password:32}"
+minio_secret_key = "${password:32}"
+watchtower_password = "${password:32}"
+
+[config]
+env = [
+  "BB_HOST=${main_domain}",
+  "BB_INTERNAL_API_KEY=${api_key}",
+  "BB_API_ENCRYPTION_KEY=${encryption_key}",
+  "BB_JWT_SECRET=${jwt_secret}",
+  "BB_COUCHDB_PASSWORD=${couchdb_password}",
+  "BB_REDIS_PASSWORD=${redis_password}",
+  "BB_WATCHTOWER_PASSWORD=${watchtower_password}",
+  "BB_MINIO_ACCESS_KEY=${minio_access_key}",
+  "BB_MINIO_SECRET_KEY=${minio_secret_key}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "proxy"
+port = 10_000
+host = "${main_domain}"
diff --git a/blueprints/budibase/template.yml b/blueprints/budibase/template.yml
deleted file mode 100644
index 29641fd..0000000
--- a/blueprints/budibase/template.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-variables:
-  main_domain: ${domain}
-  api_key: ${password:32}
-  encryption_key: ${password:32}
-  jwt_secret: ${password:32}
-  couchdb_password: ${password:32}
-  redis_password: ${password:32}
-  minio_access_key: ${password:32}
-  minio_secret_key: ${password:32}
-  watchtower_password: ${password:32}
-
-config:
-  domains:
-    - serviceName: proxy
-      port: 10000
-      host: ${main_domain}
-
-  env:
-    - BB_HOST=${main_domain}
-    - BB_INTERNAL_API_KEY=${api_key}
-    - BB_API_ENCRYPTION_KEY=${encryption_key}
-    - BB_JWT_SECRET=${jwt_secret}
-    - BB_COUCHDB_PASSWORD=${couchdb_password}
-    - BB_REDIS_PASSWORD=${redis_password}
-    - BB_WATCHTOWER_PASSWORD=${watchtower_password}
-    - BB_MINIO_ACCESS_KEY=${minio_access_key}
-    - BB_MINIO_SECRET_KEY=${minio_secret_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/calcom/template.toml b/blueprints/calcom/template.toml
new file mode 100644
index 0000000..a6303ad
--- /dev/null
+++ b/blueprints/calcom/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+calcom_encryption_key = "${base64:32}"
+nextauth_secret = "${base64:32}"
+
+[config]
+env = [
+  "CALCOM_HOST=${main_domain}",
+  "NEXTAUTH_SECRET=${nextauth_secret}",
+  "CALENDSO_ENCRYPTION_KEY=${calcom_encryption_key}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "calcom"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/calcom/template.yml b/blueprints/calcom/template.yml
deleted file mode 100644
index 5ea19af..0000000
--- a/blueprints/calcom/template.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-variables:
-  main_domain: ${domain}
-  calcom_encryption_key: ${base64:32}
-  nextauth_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: calcom
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - CALCOM_HOST=${main_domain}
-    - NEXTAUTH_SECRET=${nextauth_secret}
-    - CALENDSO_ENCRYPTION_KEY=${calcom_encryption_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/chatwoot/template.toml b/blueprints/chatwoot/template.toml
new file mode 100644
index 0000000..1e5cec5
--- /dev/null
+++ b/blueprints/chatwoot/template.toml
@@ -0,0 +1,30 @@
+[variables]
+main_domain = "${domain}"
+secret_key_base = "${base64:64}"
+postgres_password = "${password}"
+
+[config]
+env = [
+  "FRONTEND_URL=http://${main_domain}",
+  "SECRET_KEY_BASE=${secret_key_base}",
+  "RAILS_ENV=production",
+  "NODE_ENV=production",
+  "INSTALLATION_ENV=docker",
+  "RAILS_LOG_TO_STDOUT=true",
+  "LOG_LEVEL=info",
+  "DEFAULT_LOCALE=en",
+  "POSTGRES_HOST=chatwoot-postgres",
+  "POSTGRES_PORT=5432",
+  "POSTGRES_DATABASE=chatwoot",
+  "POSTGRES_USERNAME=postgres",
+  "POSTGRES_PASSWORD=${postgres_password}",
+  "REDIS_URL=redis://chatwoot-redis:6379",
+  "ENABLE_ACCOUNT_SIGNUP=false",
+  "ACTIVE_STORAGE_SERVICE=local",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "chatwoot-rails"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/chatwoot/template.yml b/blueprints/chatwoot/template.yml
deleted file mode 100644
index ac70623..0000000
--- a/blueprints/chatwoot/template.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key_base: ${base64:64}
-  postgres_password: ${password}
-
-config:
-  domains:
-    - serviceName: chatwoot-rails
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - FRONTEND_URL=http://${main_domain}
-    - SECRET_KEY_BASE=${secret_key_base}
-    - RAILS_ENV=production
-    - NODE_ENV=production
-    - INSTALLATION_ENV=docker
-    - RAILS_LOG_TO_STDOUT=true
-    - LOG_LEVEL=info
-    - DEFAULT_LOCALE=en
-    - POSTGRES_HOST=chatwoot-postgres
-    - POSTGRES_PORT=5432
-    - POSTGRES_DATABASE=chatwoot
-    - POSTGRES_USERNAME=postgres
-    - POSTGRES_PASSWORD=${postgres_password}
-    - REDIS_URL=redis://chatwoot-redis:6379
-    - ENABLE_ACCOUNT_SIGNUP=false
-    - ACTIVE_STORAGE_SERVICE=local
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/checkmate/template.toml b/blueprints/checkmate/template.toml
new file mode 100644
index 0000000..2b99313
--- /dev/null
+++ b/blueprints/checkmate/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["DOMAIN=${main_domain}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "client"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/checkmate/template.yml b/blueprints/checkmate/template.yml
deleted file mode 100644
index fb9b720..0000000
--- a/blueprints/checkmate/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: client
-      port: 80
-      host: ${main_domain}
-
-  env:
-    - DOMAIN=${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/cloudflared/template.toml b/blueprints/cloudflared/template.toml
new file mode 100644
index 0000000..242197b
--- /dev/null
+++ b/blueprints/cloudflared/template.toml
@@ -0,0 +1,6 @@
+variables = {}
+
+[config]
+domains = []
+env = ["CLOUDFLARE_TUNNEL_TOKEN=\"<INSERT TOKEN>\""]
+mounts = []
diff --git a/blueprints/cloudflared/template.yml b/blueprints/cloudflared/template.yml
deleted file mode 100644
index 277fe8d..0000000
--- a/blueprints/cloudflared/template.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-variables: {}
-
-config:
-  domains: []
-
-  env:
-    - CLOUDFLARE_TUNNEL_TOKEN="<INSERT TOKEN>"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/coder/template.toml b/blueprints/coder/template.toml
new file mode 100644
index 0000000..a4ac137
--- /dev/null
+++ b/blueprints/coder/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+
+[config]
+env = [
+  "CODER_ACCESS_URL=",
+  "CODER_HTTP_ADDRESS=0.0.0.0:7080",
+  "POSTGRES_DB=coder",
+  "POSTGRES_USER=coder",
+  "POSTGRES_PASSWORD=${postgres_password}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "coder"
+port = 7_080
+host = "${main_domain}"
diff --git a/blueprints/coder/template.yml b/blueprints/coder/template.yml
deleted file mode 100644
index cd230ca..0000000
--- a/blueprints/coder/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-
-config:
-  domains:
-    - serviceName: coder
-      port: 7080
-      host: ${main_domain}
-
-  env:
-    - CODER_ACCESS_URL=
-    - CODER_HTTP_ADDRESS=0.0.0.0:7080
-    - POSTGRES_DB=coder
-    - POSTGRES_USER=coder
-    - POSTGRES_PASSWORD=${postgres_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/conduit/template.toml b/blueprints/conduit/template.toml
new file mode 100644
index 0000000..ab7d20d
--- /dev/null
+++ b/blueprints/conduit/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["MATRIX_SUBDOMAIN=${main_domain}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "homeserver"
+port = 6_167
+host = "${main_domain}"
diff --git a/blueprints/conduit/template.yml b/blueprints/conduit/template.yml
deleted file mode 100644
index c279a0e..0000000
--- a/blueprints/conduit/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: homeserver
-      port: 6167
-      host: ${main_domain}
-
-  env:
-    - MATRIX_SUBDOMAIN=${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/conduwuit/template.toml b/blueprints/conduwuit/template.toml
new file mode 100644
index 0000000..f7bc730
--- /dev/null
+++ b/blueprints/conduwuit/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+registration_token = "${password:20}"
+
+[config]
+env = [
+  "CONDUWUIT_SERVER_NAME=${main_domain}",
+  "CONDUWUIT_REGISTRATION_TOKEN=${registration_token}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "homeserver"
+port = 6_167
+host = "${main_domain}"
diff --git a/blueprints/conduwuit/template.yml b/blueprints/conduwuit/template.yml
deleted file mode 100644
index 96295e8..0000000
--- a/blueprints/conduwuit/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  registration_token: ${password:20}
-
-config:
-  domains:
-    - serviceName: homeserver
-      port: 6167
-      host: ${main_domain}
-
-  env:
-    - CONDUWUIT_SERVER_NAME=${main_domain}
-    - CONDUWUIT_REGISTRATION_TOKEN=${registration_token}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/convex/template.toml b/blueprints/convex/template.toml
new file mode 100644
index 0000000..3b875ae
--- /dev/null
+++ b/blueprints/convex/template.toml
@@ -0,0 +1,27 @@
+[variables]
+dashboard_domain = "${domain}"
+backend_domain = "${domain}"
+actions_domain = "${domain}"
+
+[config]
+env = [
+  "NEXT_PUBLIC_DEPLOYMENT_URL=http://${backend_domain}",
+  "CONVEX_CLOUD_ORIGIN=http://${backend_domain}",
+  "CONVEX_SITE_ORIGIN=http://${actions_domain}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "dashboard"
+port = 6_791
+host = "${dashboard_domain}"
+
+[[config.domains]]
+serviceName = "backend"
+port = 3_210
+host = "${backend_domain}"
+
+[[config.domains]]
+serviceName = "backend"
+port = 3_211
+host = "${actions_domain}"
diff --git a/blueprints/convex/template.yml b/blueprints/convex/template.yml
deleted file mode 100644
index 4f39ce5..0000000
--- a/blueprints/convex/template.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-variables:
-  dashboard_domain: ${domain}
-  backend_domain: ${domain}
-  actions_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: dashboard
-      port: 6791
-      host: ${dashboard_domain}
-    - serviceName: backend
-      port: 3210
-      host: ${backend_domain}
-    - serviceName: backend
-      port: 3211
-      host: ${actions_domain}
-
-  env:
-    - NEXT_PUBLIC_DEPLOYMENT_URL=http://${backend_domain}
-    - CONVEX_CLOUD_ORIGIN=http://${backend_domain}
-    - CONVEX_SITE_ORIGIN=http://${actions_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/couchdb/template.toml b/blueprints/couchdb/template.toml
new file mode 100644
index 0000000..3cf7ec8
--- /dev/null
+++ b/blueprints/couchdb/template.toml
@@ -0,0 +1,13 @@
+[variables]
+main_domain = "${domain}"
+username = "${password:16}"
+password = "${password:32}"
+
+[config]
+env = ["COUCHDB_USER=${username}", "COUCHDB_PASSWORD=${password}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "couchdb"
+port = 5_984
+host = "${main_domain}"
diff --git a/blueprints/couchdb/template.yml b/blueprints/couchdb/template.yml
deleted file mode 100644
index 1e90152..0000000
--- a/blueprints/couchdb/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  username: ${password:16}
-  password: ${password:32}
-
-config:
-  domains:
-    - serviceName: couchdb
-      port: 5984
-      host: ${main_domain}
-
-  env:
-    - COUCHDB_USER=${username}
-    - COUCHDB_PASSWORD=${password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/datalens/template.toml b/blueprints/datalens/template.toml
new file mode 100644
index 0000000..170f633
--- /dev/null
+++ b/blueprints/datalens/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["HC=1"]
+mounts = []
+
+[[config.domains]]
+serviceName = "datalens"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/datalens/template.yml b/blueprints/datalens/template.yml
deleted file mode 100644
index d2d7a8c..0000000
--- a/blueprints/datalens/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: datalens
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - HC=1
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/directus/template.toml b/blueprints/directus/template.toml
new file mode 100644
index 0000000..1073833
--- /dev/null
+++ b/blueprints/directus/template.toml
@@ -0,0 +1,16 @@
+[variables]
+main_domain = "${domain}"
+directus_secret = "${base64:64}"
+database_password = "${password}"
+
+[config]
+env = [
+  "DATABASE_PASSWORD=${database_password}",
+  "DIRECTUS_SECRET=${directus_secret}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "directus"
+port = 8_055
+host = "${main_domain}"
diff --git a/blueprints/directus/template.yml b/blueprints/directus/template.yml
deleted file mode 100644
index 93899ec..0000000
--- a/blueprints/directus/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  directus_secret: ${base64:64}
-  database_password: ${password}
-
-config:
-  domains:
-    - serviceName: directus
-      port: 8055
-      host: ${main_domain}
-
-  env:
-    - DATABASE_PASSWORD=${database_password}
-    - DIRECTUS_SECRET=${directus_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/discord-tickets/template.toml b/blueprints/discord-tickets/template.toml
new file mode 100644
index 0000000..72f02ff
--- /dev/null
+++ b/blueprints/discord-tickets/template.toml
@@ -0,0 +1,27 @@
+[variables]
+main_domain = "${domain}"
+mysql_password = "${password}"
+mysql_root_password = "${password}"
+mysql_user = "tickets"
+mysql_database = "tickets"
+encryption_key = "${password:48}"
+
+[config]
+env = [
+  "TICKETS_HOST=${main_domain}",
+  "MYSQL_DATABASE=${mysql_database}",
+  "MYSQL_PASSWORD=${mysql_password}",
+  "MYSQL_ROOT_PASSWORD=${mysql_root_password}",
+  "MYSQL_USER=${mysql_user}",
+  "ENCRYPTION_KEY=${encryption_key}",
+  "# Follow the guide at: https://discordtickets.app/self-hosting/installation/docker/#creating-the-discord-application",
+  "DISCORD_SECRET=",
+  "DISCORD_TOKEN=",
+  "SUPER_USERS=YOUR_DISCORD_USER_ID",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "tickets-app"
+port = 8_169
+host = "${main_domain}"
diff --git a/blueprints/discord-tickets/template.yml b/blueprints/discord-tickets/template.yml
deleted file mode 100644
index bc5d95c..0000000
--- a/blueprints/discord-tickets/template.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-  main_domain: ${domain}
-  mysql_password: ${password}
-  mysql_root_password: ${password}
-  mysql_user: tickets
-  mysql_database: tickets
-  encryption_key: ${password:48}
-
-config:
-  domains:
-    - serviceName: tickets-app
-      port: 8169
-      host: ${main_domain}
-
-  env:
-    - TICKETS_HOST=${main_domain}
-    - MYSQL_DATABASE=${mysql_database}
-    - MYSQL_PASSWORD=${mysql_password}
-    - MYSQL_ROOT_PASSWORD=${mysql_root_password}
-    - MYSQL_USER=${mysql_user}
-    - ENCRYPTION_KEY=${encryption_key}
-    - "# Follow the guide at: https://discordtickets.app/self-hosting/installation/docker/#creating-the-discord-application"
-    - DISCORD_SECRET=
-    - DISCORD_TOKEN=
-    - SUPER_USERS=YOUR_DISCORD_USER_ID
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/discourse/template.toml b/blueprints/discourse/template.toml
new file mode 100644
index 0000000..c02aa2c
--- /dev/null
+++ b/blueprints/discourse/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+redis_password = "${password}"
+
+[config]
+env = [
+  "DISCOURSE_HOST=${main_domain}",
+  "POSTGRES_PASSWORD=${postgres_password}",
+  "REDIS_PASSWORD=${redis_password}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "discourse-app"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/discourse/template.yml b/blueprints/discourse/template.yml
deleted file mode 100644
index 565b0be..0000000
--- a/blueprints/discourse/template.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  redis_password: ${password}
-
-config:
-  domains:
-    - serviceName: discourse-app
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - DISCOURSE_HOST=${main_domain}
-    - POSTGRES_PASSWORD=${postgres_password}
-    - REDIS_PASSWORD=${redis_password}
-    - # Optional: Configure SMTP for email delivery
-    - # SMTP_HOST=smtp.example.com
-    - # SMTP_PORT=587
-    - # SMTP_USER=your_smtp_user
-    - # SMTP_PASSWORD=your_smtp_password
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/docmost/template.toml b/blueprints/docmost/template.toml
new file mode 100644
index 0000000..834b8cf
--- /dev/null
+++ b/blueprints/docmost/template.toml
@@ -0,0 +1,19 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+app_secret = "${password}"
+
+[config]
+env = [
+  "POSTGRES_DB=docmost",
+  "POSTGRES_USER=docmost",
+  "POSTGRES_PASSWORD=${postgres_password}",
+  "APP_URL=http://${main_domain}:3000",
+  "APP_SECRET=${app_secret}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "docmost"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/docmost/template.yml b/blueprints/docmost/template.yml
deleted file mode 100644
index 5aaebf0..0000000
--- a/blueprints/docmost/template.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  app_secret: ${password}
-
-config:
-  domains:
-    - serviceName: docmost
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - POSTGRES_DB=docmost
-    - POSTGRES_USER=docmost
-    - POSTGRES_PASSWORD=${postgres_password}
-    - APP_URL=http://${main_domain}:3000
-    - APP_SECRET=${app_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/documenso/template.toml b/blueprints/documenso/template.toml
new file mode 100644
index 0000000..c7d6237
--- /dev/null
+++ b/blueprints/documenso/template.toml
@@ -0,0 +1,20 @@
+[variables]
+main_domain = "${domain}"
+nextauth_secret = "${base64:32}"
+encryption_key = "${password:32}"
+secondary_encryption_key = "${password:64}"
+
+[config]
+env = [
+  "DOCUMENSO_HOST=${main_domain}",
+  "DOCUMENSO_PORT=3000",
+  "NEXTAUTH_SECRET=${nextauth_secret}",
+  "NEXT_PRIVATE_ENCRYPTION_KEY=${encryption_key}",
+  "NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY=${secondary_encryption_key}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "documenso"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/documenso/template.yml b/blueprints/documenso/template.yml
deleted file mode 100644
index 7cf744e..0000000
--- a/blueprints/documenso/template.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-variables:
-  main_domain: ${domain}
-  nextauth_secret: ${base64:32}
-  encryption_key: ${password:32}
-  secondary_encryption_key: ${password:64}
-
-config:
-  domains:
-    - serviceName: documenso
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - DOCUMENSO_HOST=${main_domain}
-    - DOCUMENSO_PORT=3000
-    - NEXTAUTH_SECRET=${nextauth_secret}
-    - NEXT_PRIVATE_ENCRYPTION_KEY=${encryption_key}
-    - NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY=${secondary_encryption_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/doublezero/template.toml b/blueprints/doublezero/template.toml
new file mode 100644
index 0000000..8c6a0c3
--- /dev/null
+++ b/blueprints/doublezero/template.toml
@@ -0,0 +1,21 @@
+[variables]
+main_domain = "${domain}"
+secret_key_base = "${base64:64}"
+
+[config]
+env = [
+  "DOUBLEZERO_HOST=${main_domain}",
+  "DOUBLEZERO_PORT=4000",
+  "SECRET_KEY_BASE=${secret_key_base}",
+  "AWS_ACCESS_KEY_ID=your-aws-access-key",
+  "AWS_SECRET_ACCESS_KEY=your-aws-secret-key",
+  "AWS_REGION=your-aws-region",
+  "SQS_URL=your-aws-sqs-url",
+  "SYSTEM_EMAIL=",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "doublezero"
+port = 4_000
+host = "${main_domain}"
diff --git a/blueprints/doublezero/template.yml b/blueprints/doublezero/template.yml
deleted file mode 100644
index c6582de..0000000
--- a/blueprints/doublezero/template.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key_base: ${base64:64}
-
-config:
-  domains:
-    - serviceName: doublezero
-      port: 4000
-      host: ${main_domain}
-
-  env:
-    - DOUBLEZERO_HOST=${main_domain}
-    - DOUBLEZERO_PORT=4000
-    - SECRET_KEY_BASE=${secret_key_base}
-    - AWS_ACCESS_KEY_ID=your-aws-access-key
-    - AWS_SECRET_ACCESS_KEY=your-aws-secret-key
-    - AWS_REGION=your-aws-region
-    - SQS_URL=your-aws-sqs-url
-    - SYSTEM_EMAIL=
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/drawio/template.toml b/blueprints/drawio/template.toml
new file mode 100644
index 0000000..49a6f0e
--- /dev/null
+++ b/blueprints/drawio/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = [
+  "DRAWIO_HOST=${main_domain}",
+  "DRAWIO_BASE_URL=https://${main_domain}",
+  "DRAWIO_SERVER_URL=https://${main_domain}/",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "drawio"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/drawio/template.yml b/blueprints/drawio/template.yml
deleted file mode 100644
index 6ce0ec8..0000000
--- a/blueprints/drawio/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: drawio
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - DRAWIO_HOST=${main_domain}
-    - DRAWIO_BASE_URL=https://${main_domain}
-    - DRAWIO_SERVER_URL=https://${main_domain}/
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/elastic-search/template.toml b/blueprints/elastic-search/template.toml
new file mode 100644
index 0000000..d8037f5
--- /dev/null
+++ b/blueprints/elastic-search/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+api_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "kibana"
+port = 5_601
+host = "${main_domain}"
+
+[[config.domains]]
+serviceName = "elasticsearch"
+port = 9_200
+host = "${api_domain}"
diff --git a/blueprints/elastic-search/template.yml b/blueprints/elastic-search/template.yml
deleted file mode 100644
index c6065a9..0000000
--- a/blueprints/elastic-search/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  api_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: kibana
-      port: 5601
-      host: ${main_domain}
-    - serviceName: elasticsearch
-      port: 9200
-      host: ${api_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/erpnext/template.toml b/blueprints/erpnext/template.toml
new file mode 100644
index 0000000..dcdb287
--- /dev/null
+++ b/blueprints/erpnext/template.toml
@@ -0,0 +1,27 @@
+[variables]
+main_domain = "${domain}"
+db_root_password = "${password:32}"
+admin_password = "${password:32}"
+
+[config]
+env = [
+  "SITE_NAME=${main_domain}",
+  "ADMIN_PASSWORD=${admin_password}",
+  "DB_ROOT_PASSWORD=${db_root_password}",
+  "MIGRATE=1",
+  "ENABLE_DB=1",
+  "DB_HOST=db",
+  "CREATE_SITE=1",
+  "CONFIGURE=1",
+  "REGENERATE_APPS_TXT=1",
+  "INSTALL_APP_ARGS=--install-app erpnext",
+  "IMAGE_NAME=docker.io/frappe/erpnext",
+  "VERSION=version-15",
+  "FRAPPE_SITE_NAME_HEADER=",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "frontend"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/erpnext/template.yml b/blueprints/erpnext/template.yml
deleted file mode 100644
index 61b26eb..0000000
--- a/blueprints/erpnext/template.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_root_password: ${password:32}
-  admin_password: ${password:32}
-
-config:
-  domains:
-    - serviceName: frontend
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - SITE_NAME=${main_domain}
-    - ADMIN_PASSWORD=${admin_password}
-    - DB_ROOT_PASSWORD=${db_root_password}
-    - MIGRATE=1
-    - ENABLE_DB=1
-    - DB_HOST=db
-    - CREATE_SITE=1
-    - CONFIGURE=1
-    - REGENERATE_APPS_TXT=1
-    - INSTALL_APP_ARGS=--install-app erpnext
-    - IMAGE_NAME=docker.io/frappe/erpnext
-    - VERSION=version-15
-    - FRAPPE_SITE_NAME_HEADER=
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/evolutionapi/template.toml b/blueprints/evolutionapi/template.toml
new file mode 100644
index 0000000..c547b9f
--- /dev/null
+++ b/blueprints/evolutionapi/template.toml
@@ -0,0 +1,40 @@
+[variables]
+main_domain = "${domain}"
+api_key = "${base64:64}"
+postgres_password = "${password}"
+
+[config]
+env = [
+  "SERVER_URL=https://${main_domain}",
+  "AUTHENTICATION_TYPE=apikey",
+  "AUTHENTICATION_API_KEY=${api_key}",
+  "AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true",
+  "LANGUAGE=en",
+  "CONFIG_SESSION_PHONE_CLIENT=Evolution API",
+  "CONFIG_SESSION_PHONE_NAME=Chrome",
+  "TELEMETRY=false",
+  "TELEMETRY_URL=",
+  "POSTGRES_DATABASE=evolution",
+  "POSTGRES_USERNAME=postgresql",
+  "POSTGRES_PASSWORD=${postgres_password}",
+  "DATABASE_ENABLED=true",
+  "DATABASE_PROVIDER=postgresql",
+  "DATABASE_CONNECTION_URI=postgres://postgresql:${postgres_password}@evolution-postgres:5432/evolution",
+  "DATABASE_SAVE_DATA_INSTANCE=true",
+  "DATABASE_SAVE_DATA_NEW_MESSAGE=true",
+  "DATABASE_SAVE_MESSAGE_UPDATE=true",
+  "DATABASE_SAVE_DATA_CONTACTS=true",
+  "DATABASE_SAVE_DATA_CHATS=true",
+  "DATABASE_SAVE_DATA_LABELS=true",
+  "DATABASE_SAVE_DATA_HISTORIC=true",
+  "CACHE_REDIS_ENABLED=true",
+  "CACHE_REDIS_URI=redis://evolution-redis:6379",
+  "CACHE_REDIS_PREFIX_KEY=evolution",
+  "CACHE_REDIS_SAVE_INSTANCES=true",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "evolution-api"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/evolutionapi/template.yml b/blueprints/evolutionapi/template.yml
deleted file mode 100644
index fdac9ed..0000000
--- a/blueprints/evolutionapi/template.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-variables:
-  main_domain: ${domain}
-  api_key: ${base64:64}
-  postgres_password: ${password}
-
-config:
-  domains:
-    - serviceName: evolution-api
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - SERVER_URL=https://${main_domain}
-    - AUTHENTICATION_TYPE=apikey
-    - AUTHENTICATION_API_KEY=${api_key}
-    - AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
-    - LANGUAGE=en
-    - CONFIG_SESSION_PHONE_CLIENT=Evolution API
-    - CONFIG_SESSION_PHONE_NAME=Chrome
-    - TELEMETRY=false
-    - TELEMETRY_URL=
-    - POSTGRES_DATABASE=evolution
-    - POSTGRES_USERNAME=postgresql
-    - POSTGRES_PASSWORD=${postgres_password}
-    - DATABASE_ENABLED=true
-    - DATABASE_PROVIDER=postgresql
-    - DATABASE_CONNECTION_URI=postgres://postgresql:${postgres_password}@evolution-postgres:5432/evolution
-    - DATABASE_SAVE_DATA_INSTANCE=true
-    - DATABASE_SAVE_DATA_NEW_MESSAGE=true
-    - DATABASE_SAVE_MESSAGE_UPDATE=true
-    - DATABASE_SAVE_DATA_CONTACTS=true
-    - DATABASE_SAVE_DATA_CHATS=true
-    - DATABASE_SAVE_DATA_LABELS=true
-    - DATABASE_SAVE_DATA_HISTORIC=true
-    - CACHE_REDIS_ENABLED=true
-    - CACHE_REDIS_URI=redis://evolution-redis:6379
-    - CACHE_REDIS_PREFIX_KEY=evolution
-    - CACHE_REDIS_SAVE_INSTANCES=true
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/excalidraw/template.toml b/blueprints/excalidraw/template.toml
new file mode 100644
index 0000000..bfa04a7
--- /dev/null
+++ b/blueprints/excalidraw/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "excalidraw"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/excalidraw/template.yml b/blueprints/excalidraw/template.yml
deleted file mode 100644
index 8648aed..0000000
--- a/blueprints/excalidraw/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: excalidraw
-      port: 80
-      host: ${main_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/filebrowser/template.toml b/blueprints/filebrowser/template.toml
new file mode 100644
index 0000000..4b71d2b
--- /dev/null
+++ b/blueprints/filebrowser/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["FB_BASEURL=/filebrowser"]
+mounts = []
+
+[[config.domains]]
+serviceName = "filebrowser"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/filebrowser/template.yml b/blueprints/filebrowser/template.yml
deleted file mode 100644
index 34e7eb3..0000000
--- a/blueprints/filebrowser/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: filebrowser
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - FB_BASEURL=/filebrowser
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/formbricks/template.toml b/blueprints/formbricks/template.toml
new file mode 100644
index 0000000..6ba34b3
--- /dev/null
+++ b/blueprints/formbricks/template.toml
@@ -0,0 +1,20 @@
+[variables]
+main_domain = "${domain}"
+secret_base = "${base64:64}"
+encryption_key = "${base64:48}"
+cron_secret = "${base64:32}"
+
+[config]
+env = [
+  "WEBAPP_URL=http://${main_domain}",
+  "NEXTAUTH_URL=http://${main_domain}",
+  "NEXTAUTH_SECRET=${secret_base}",
+  "ENCRYPTION_KEY=${encryption_key}",
+  "CRON_SECRET=${cron_secret}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "formbricks"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/formbricks/template.yml b/blueprints/formbricks/template.yml
deleted file mode 100644
index 6572770..0000000
--- a/blueprints/formbricks/template.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_base: ${base64:64}
-  encryption_key: ${base64:48}
-  cron_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: formbricks
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - WEBAPP_URL=http://${main_domain}
-    - NEXTAUTH_URL=http://${main_domain}
-    - NEXTAUTH_SECRET=${secret_base}
-    - ENCRYPTION_KEY=${encryption_key}
-    - CRON_SECRET=${cron_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/frappe-hr/template.toml b/blueprints/frappe-hr/template.toml
new file mode 100644
index 0000000..0143048
--- /dev/null
+++ b/blueprints/frappe-hr/template.toml
@@ -0,0 +1,27 @@
+[variables]
+main_domain = "${domain}"
+db_root_password = "${password:32}"
+admin_password = "${password:32}"
+
+[config]
+env = [
+  "SITE_NAME=${main_domain}",
+  "ADMIN_PASSWORD=${admin_password}",
+  "DB_ROOT_PASSWORD=${db_root_password}",
+  "MIGRATE=1",
+  "ENABLE_DB=1",
+  "DB_HOST=db",
+  "CREATE_SITE=1",
+  "CONFIGURE=1",
+  "REGENERATE_APPS_TXT=1",
+  "INSTALL_APP_ARGS=--install-app hrms",
+  "IMAGE_NAME=ghcr.io/frappe/hrms",
+  "VERSION=version-15",
+  "FRAPPE_SITE_NAME_HEADER=",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "frontend"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/frappe-hr/template.yml b/blueprints/frappe-hr/template.yml
deleted file mode 100644
index b5c8f9d..0000000
--- a/blueprints/frappe-hr/template.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_root_password: ${password:32}
-  admin_password: ${password:32}
-
-config:
-  domains:
-    - serviceName: frontend
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - SITE_NAME=${main_domain}
-    - ADMIN_PASSWORD=${admin_password}
-    - DB_ROOT_PASSWORD=${db_root_password}
-    - MIGRATE=1
-    - ENABLE_DB=1
-    - DB_HOST=db
-    - CREATE_SITE=1
-    - CONFIGURE=1
-    - REGENERATE_APPS_TXT=1
-    - INSTALL_APP_ARGS=--install-app hrms
-    - IMAGE_NAME=ghcr.io/frappe/hrms
-    - VERSION=version-15
-    - FRAPPE_SITE_NAME_HEADER=
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/ghost/template.toml b/blueprints/ghost/template.toml
new file mode 100644
index 0000000..760a12f
--- /dev/null
+++ b/blueprints/ghost/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["GHOST_HOST=${main_domain}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "ghost"
+port = 2_368
+host = "${main_domain}"
diff --git a/blueprints/ghost/template.yml b/blueprints/ghost/template.yml
deleted file mode 100644
index f85f423..0000000
--- a/blueprints/ghost/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: ghost
-      port: 2368
-      host: ${main_domain}
-
-  env:
-    - GHOST_HOST=${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/gitea/template.toml b/blueprints/gitea/template.toml
new file mode 100644
index 0000000..37b3f13
--- /dev/null
+++ b/blueprints/gitea/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = ["USER_UID=1000", "USER_GID=1000"]
+mounts = []
+
+[[config.domains]]
+serviceName = "gitea"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/gitea/template.yml b/blueprints/gitea/template.yml
deleted file mode 100644
index 2a0107e..0000000
--- a/blueprints/gitea/template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: gitea
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - USER_UID=1000
-    - USER_GID=1000
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/glance/template.toml b/blueprints/glance/template.toml
new file mode 100644
index 0000000..dd4def7
--- /dev/null
+++ b/blueprints/glance/template.toml
@@ -0,0 +1,94 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+
+[[config.domains]]
+serviceName = "glance"
+port = 8_080
+host = "${main_domain}"
+
+[[config.mounts]]
+filePath = "/app/config/glance.yml"
+content = """
+branding:
+  hide-footer: true
+  logo-text: P
+
+pages:
+  - name: Home
+    columns:
+      - size: small
+        widgets:
+          - type: calendar
+
+          - type: releases
+            show-source-icon: true
+            repositories:
+              - Dokploy/dokploy
+              - n8n-io/n8n
+              - Budibase/budibase
+              - home-assistant/core
+              - tidbyt/pixlet
+
+          - type: twitch-channels
+            channels:
+              - nmplol
+              - extraemily
+              - qtcinderella
+              - ludwig
+              - timthetatman
+              - mizkif
+
+      - size: full
+        widgets:
+          - type: hacker-news
+
+          - type: videos
+            style: grid-cards
+            channels:
+              - UC3GzdWYwUYI1ACxuP9Nm-eg
+              - UCGbg3DjQdcqWwqOLHpYHXIg
+              - UC24RSoLcjiNZbQcT54j5l7Q
+            limit: 3
+
+          - type: rss
+            limit: 10
+            collapse-after: 3
+            cache: 3h
+            feeds:
+              - url: https://daringfireball.net/feeds/main
+                title: Daring Fireball
+        
+      - size: small
+        widgets:
+          - type: weather
+            location: Gansevoort, New York, United States
+            show-area-name: false
+            units: imperial
+            hour-format: 12h
+
+          - type: markets
+            markets:
+              - symbol: SPY
+                name: S&P 500
+              - symbol: VOO
+                name: Vanguard
+              - symbol: BTC-USD
+                name: Bitcoin
+              - symbol: ETH-USD
+                name: Etherium
+              - symbol: NVDA
+                name: NVIDIA
+              - symbol: AAPL
+                name: Apple
+              - symbol: MSFT
+                name: Microsoft
+              - symbol: GOOGL
+                name: Google
+              - symbol: AMD
+                name: AMD
+              - symbol: TSLA
+                name: Tesla 
+"""
diff --git a/blueprints/glance/template.yml b/blueprints/glance/template.yml
deleted file mode 100644
index e570fe3..0000000
--- a/blueprints/glance/template.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: glance
-      port: 8080
-      host: ${main_domain}
-
-  env: []
-
-  mounts:
-    - filePath: /app/config/glance.yml
-      content: |
-        branding:
-          hide-footer: true
-          logo-text: P
-
-        pages:
-          - name: Home
-            columns:
-              - size: small
-                widgets:
-                  - type: calendar
-
-                  - type: releases
-                    show-source-icon: true
-                    repositories:
-                      - Dokploy/dokploy
-                      - n8n-io/n8n
-                      - Budibase/budibase
-                      - home-assistant/core
-                      - tidbyt/pixlet
-
-                  - type: twitch-channels
-                    channels:
-                      - nmplol
-                      - extraemily
-                      - qtcinderella
-                      - ludwig
-                      - timthetatman
-                      - mizkif
-
-              - size: full
-                widgets:
-                  - type: hacker-news
-
-                  - type: videos
-                    style: grid-cards
-                    channels:
-                      - UC3GzdWYwUYI1ACxuP9Nm-eg
-                      - UCGbg3DjQdcqWwqOLHpYHXIg
-                      - UC24RSoLcjiNZbQcT54j5l7Q
-                    limit: 3
-
-                  - type: rss
-                    limit: 10
-                    collapse-after: 3
-                    cache: 3h
-                    feeds:
-                      - url: https://daringfireball.net/feeds/main
-                        title: Daring Fireball
-                
-              - size: small
-                widgets:
-                  - type: weather
-                    location: Gansevoort, New York, United States
-                    show-area-name: false
-                    units: imperial
-                    hour-format: 12h
-
-                  - type: markets
-                    markets:
-                      - symbol: SPY
-                        name: S&P 500
-                      - symbol: VOO
-                        name: Vanguard
-                      - symbol: BTC-USD
-                        name: Bitcoin
-                      - symbol: ETH-USD
-                        name: Etherium
-                      - symbol: NVDA
-                        name: NVIDIA
-                      - symbol: AAPL
-                        name: Apple
-                      - symbol: MSFT
-                        name: Microsoft
-                      - symbol: GOOGL
-                        name: Google
-                      - symbol: AMD
-                        name: AMD
-                      - symbol: TSLA
-                        name: Tesla 
\ No newline at end of file
diff --git a/blueprints/glitchtip/template.toml b/blueprints/glitchtip/template.toml
new file mode 100644
index 0000000..c5b7a46
--- /dev/null
+++ b/blueprints/glitchtip/template.toml
@@ -0,0 +1,16 @@
+[variables]
+main_domain = "${domain}"
+secret_key = "${base64:32}"
+
+[config]
+env = [
+  "GLITCHTIP_HOST=${main_domain}",
+  "GLITCHTIP_PORT=8000",
+  "SECRET_KEY=${secret_key}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "web"
+port = 8_000
+host = "${main_domain}"
diff --git a/blueprints/glitchtip/template.yml b/blueprints/glitchtip/template.yml
deleted file mode 100644
index 5a6a280..0000000
--- a/blueprints/glitchtip/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key: ${base64:32}
-
-config:
-  domains:
-    - serviceName: web
-      port: 8000
-      host: ${main_domain}
-
-  env:
-    - GLITCHTIP_HOST=${main_domain}
-    - GLITCHTIP_PORT=8000
-    - SECRET_KEY=${secret_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/glpi/template.toml b/blueprints/glpi/template.toml
new file mode 100644
index 0000000..2b37e86
--- /dev/null
+++ b/blueprints/glpi/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "glpi-web"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/glpi/template.yml b/blueprints/glpi/template.yml
deleted file mode 100644
index 0891e99..0000000
--- a/blueprints/glpi/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: glpi-web
-      port: 80
-      host: ${main_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/gotenberg/template.toml b/blueprints/gotenberg/template.toml
new file mode 100644
index 0000000..8a62979
--- /dev/null
+++ b/blueprints/gotenberg/template.toml
@@ -0,0 +1,16 @@
+[variables]
+main_domain = "${domain}"
+username = "gotenberg"
+password = "changethis"
+
+[config]
+env = [
+  "GOTENBERG_API_BASIC_AUTH_USERNAME=${username}",
+  "GOTENBERG_API_BASIC_AUTH_PASSWORD=${password}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "gotenberg"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/gotenberg/template.yml b/blueprints/gotenberg/template.yml
deleted file mode 100644
index d94c03f..0000000
--- a/blueprints/gotenberg/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  username: gotenberg
-  password: changethis
-
-config:
-  domains:
-    - serviceName: gotenberg
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - GOTENBERG_API_BASIC_AUTH_USERNAME=${username}
-    - GOTENBERG_API_BASIC_AUTH_PASSWORD=${password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/grafana/template.toml b/blueprints/grafana/template.toml
new file mode 100644
index 0000000..2f5a91a
--- /dev/null
+++ b/blueprints/grafana/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "grafana"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/grafana/template.yml b/blueprints/grafana/template.yml
deleted file mode 100644
index 0fa704f..0000000
--- a/blueprints/grafana/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: grafana
-      port: 3000
-      host: ${main_domain}
-
-  env: []
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/heyform/template.toml b/blueprints/heyform/template.toml
new file mode 100644
index 0000000..0f778d8
--- /dev/null
+++ b/blueprints/heyform/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+session_key = "${base64:64}"
+form_encryption_key = "${base64:64}"
+
+[config]
+env = [
+  "APP_HOMEPAGE_URL=http://${main_domain}",
+  "SESSION_KEY=${session_key}",
+  "FORM_ENCRYPTION_KEY=${form_encryption_key}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "heyform"
+port = 8_000
+host = "${main_domain}"
diff --git a/blueprints/heyform/template.yml b/blueprints/heyform/template.yml
deleted file mode 100644
index ae34719..0000000
--- a/blueprints/heyform/template.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-variables:
-  main_domain: ${domain}
-  session_key: ${base64:64}
-  form_encryption_key: ${base64:64}
-
-config:
-  domains:
-    - serviceName: heyform
-      port: 8000
-      host: ${main_domain}
-
-  env:
-    - APP_HOMEPAGE_URL=http://${main_domain}
-    - SESSION_KEY=${session_key}
-    - FORM_ENCRYPTION_KEY=${form_encryption_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/hi-events/template.toml b/blueprints/hi-events/template.toml
new file mode 100644
index 0000000..4fea86c
--- /dev/null
+++ b/blueprints/hi-events/template.toml
@@ -0,0 +1,27 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+jwt_secret = "${password}"
+app_key = "${password}"
+
+[config]
+env = [
+  "DOMAIN=${main_domain}",
+  "POSTGRES_DB=hievents",
+  "POSTGRES_USER=hievents",
+  "POSTGRES_PASSWORD=${postgres_password}",
+  "VITE_STRIPE_PUBLISHABLE_KEY=",
+  "APP_KEY=${app_key}",
+  "JWT_SECRET=${jwt_secret}",
+  "MAIL_MAILER=",
+  "MAIL_HOST=",
+  "MAIL_PORT=",
+  "MAIL_FROM_ADDRESS=",
+  "MAIL_FROM_NAME=",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "all-in-one"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/hi-events/template.yml b/blueprints/hi-events/template.yml
deleted file mode 100644
index 7ae0c87..0000000
--- a/blueprints/hi-events/template.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  jwt_secret: ${password}
-  app_key: ${password}
-
-config:
-  domains:
-    - serviceName: all-in-one
-      port: 80
-      host: ${main_domain}
-
-  env:
-    - DOMAIN=${main_domain}
-    - POSTGRES_DB=hievents
-    - POSTGRES_USER=hievents
-    - POSTGRES_PASSWORD=${postgres_password}
-    - VITE_STRIPE_PUBLISHABLE_KEY=
-    - APP_KEY=${app_key}
-    - JWT_SECRET=${jwt_secret}
-    - MAIL_MAILER=
-    - MAIL_HOST=
-    - MAIL_PORT=
-    - MAIL_FROM_ADDRESS=
-    - MAIL_FROM_NAME=
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/hoarder/template.toml b/blueprints/hoarder/template.toml
new file mode 100644
index 0000000..2f5b6d6
--- /dev/null
+++ b/blueprints/hoarder/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+next_secret = "${base64:32}"
+meili_master_key = "${base64:32}"
+
+[config]
+env = [
+  "NEXTAUTH_SECRET=${next_secret}",
+  "MEILI_MASTER_KEY=${meili_master_key}",
+  "NEXTAUTH_URL=http://${main_domain}",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "web"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/hoarder/template.yml b/blueprints/hoarder/template.yml
deleted file mode 100644
index 0773245..0000000
--- a/blueprints/hoarder/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  next_secret: ${base64:32}
-  meili_master_key: ${base64:32}
-
-config:
-  domains:
-    - serviceName: web
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    - NEXTAUTH_SECRET=${next_secret}
-    - MEILI_MASTER_KEY=${meili_master_key}
-    - NEXTAUTH_URL=http://${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/homarr/template.toml b/blueprints/homarr/template.toml
new file mode 100644
index 0000000..d73be94
--- /dev/null
+++ b/blueprints/homarr/template.toml
@@ -0,0 +1,12 @@
+[variables]
+main_domain = "${domain}"
+secret_key = "${password:64}"
+
+[config]
+env = ["SECRET_ENCRYPTION_KEY=${secret_key}"]
+mounts = []
+
+[[config.domains]]
+serviceName = "homarr"
+port = 7_575
+host = "${main_domain}"
diff --git a/blueprints/homarr/template.yml b/blueprints/homarr/template.yml
deleted file mode 100644
index edbfb1d..0000000
--- a/blueprints/homarr/template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key: ${password:64}
-
-config:
-  domains:
-    - serviceName: homarr
-      port: 7575
-      host: ${main_domain}
-
-  env:
-    - SECRET_ENCRYPTION_KEY=${secret_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/huly/template.toml b/blueprints/huly/template.toml
new file mode 100644
index 0000000..c0c8bc9
--- /dev/null
+++ b/blueprints/huly/template.toml
@@ -0,0 +1,106 @@
+[variables]
+main_domain = "${domain}"
+huly_secret = "${base64:64}"
+
+[config]
+env = [
+  "HULY_VERSION=v0.6.468",
+  "DOCKER_NAME=huly",
+  "HOST_ADDRESS=${main_domain}",
+  "SECURE=",
+  "HTTP_PORT=80",
+  "HTTP_BIND=",
+  "TITLE=Huly",
+  "DEFAULT_LANGUAGE=en",
+  "LAST_NAME_FIRST=true",
+  "SECRET=${huly_secret}",
+]
+
+[[config.domains]]
+serviceName = "nginx"
+port = 80
+host = "${main_domain}"
+
+[[config.mounts]]
+filePath = "/volumes/nginx/.huly.nginx"
+content = """
+server {
+    listen 80;
+    server_name _;
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://front:8080;
+    }
+
+    location /_accounts {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        rewrite ^/_accounts(/.*)$ $1 break;
+        proxy_pass http://account:3000/;
+    }
+
+    location /_collaborator {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        rewrite ^/_collaborator(/.*)$ $1 break;
+        proxy_pass http://collaborator:3078/;
+    }
+
+    location /_transactor {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        rewrite ^/_transactor(/.*)$ $1 break;
+        proxy_pass http://transactor:3333/;
+    }
+
+    location ~ ^/eyJ {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_pass http://transactor:3333;
+    }
+
+    location /_rekoni {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        rewrite ^/_rekoni(/.*)$ $1 break;
+        proxy_pass http://rekoni:4004/;
+    }
+
+    location /_stats {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        rewrite ^/_stats(/.*)$ $1 break;
+        proxy_pass http://stats:4900/;
+    }
+} 
+"""
diff --git a/blueprints/huly/template.yml b/blueprints/huly/template.yml
deleted file mode 100644
index 94e50b0..0000000
--- a/blueprints/huly/template.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-variables:
-  main_domain: ${domain}
-  huly_secret: ${base64:64}
-
-config:
-  domains:
-    - serviceName: nginx
-      port: 80
-      host: ${main_domain}
-
-  env:
-    - HULY_VERSION=v0.6.468
-    - DOCKER_NAME=huly
-    - HOST_ADDRESS=${main_domain}
-    - SECURE=
-    - HTTP_PORT=80
-    - HTTP_BIND=
-    - TITLE=Huly
-    - DEFAULT_LANGUAGE=en
-    - LAST_NAME_FIRST=true
-    - SECRET=${huly_secret}
-
-  mounts:
-    - filePath: /volumes/nginx/.huly.nginx
-      content: |
-        server {
-            listen 80;
-            server_name _;
-            location / {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                proxy_pass http://front:8080;
-            }
-
-            location /_accounts {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-
-                rewrite ^/_accounts(/.*)$ $1 break;
-                proxy_pass http://account:3000/;
-            }
-
-            location /_collaborator {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-                rewrite ^/_collaborator(/.*)$ $1 break;
-                proxy_pass http://collaborator:3078/;
-            }
-
-            location /_transactor {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-                rewrite ^/_transactor(/.*)$ $1 break;
-                proxy_pass http://transactor:3333/;
-            }
-
-            location ~ ^/eyJ {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-                proxy_pass http://transactor:3333;
-            }
-
-            location /_rekoni {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-
-                rewrite ^/_rekoni(/.*)$ $1 break;
-                proxy_pass http://rekoni:4004/;
-            }
-
-            location /_stats {
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-
-                rewrite ^/_stats(/.*)$ $1 break;
-                proxy_pass http://stats:4900/;
-            }
-        } 
diff --git a/blueprints/immich/template.toml b/blueprints/immich/template.toml
new file mode 100644
index 0000000..f2b910e
--- /dev/null
+++ b/blueprints/immich/template.toml
@@ -0,0 +1,26 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_user = "immich"
+
+[config]
+env = [
+  "IMMICH_HOST=${main_domain}",
+  "SERVER_URL=https://${main_domain}",
+  "FRONT_BASE_URL=https://${main_domain}",
+  "DB_HOSTNAME=immich-database",
+  "DB_PORT=5432",
+  "DB_USERNAME=${db_user}",
+  "DB_PASSWORD=${db_password}",
+  "DB_DATABASE_NAME=immich",
+  "REDIS_HOSTNAME=immich-redis",
+  "REDIS_PORT=6379",
+  "REDIS_DBINDEX=0",
+  "TZ=UTC",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "immich-server"
+port = 2_283
+host = "${main_domain}"
diff --git a/blueprints/immich/template.yml b/blueprints/immich/template.yml
deleted file mode 100644
index 8490dbd..0000000
--- a/blueprints/immich/template.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_user: immich
-
-config:
-  domains:
-    - serviceName: immich-server
-      port: 2283
-      host: ${main_domain}
-
-  env:
-    - IMMICH_HOST=${main_domain}
-    - SERVER_URL=https://${main_domain}
-    - FRONT_BASE_URL=https://${main_domain}
-    - DB_HOSTNAME=immich-database
-    - DB_PORT=5432
-    - DB_USERNAME=${db_user}
-    - DB_PASSWORD=${db_password}
-    - DB_DATABASE_NAME=immich
-    - REDIS_HOSTNAME=immich-redis
-    - REDIS_PORT=6379
-    - REDIS_DBINDEX=0
-    - TZ=UTC
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/infisical/template.toml b/blueprints/infisical/template.toml
new file mode 100644
index 0000000..a96bfb6
--- /dev/null
+++ b/blueprints/infisical/template.toml
@@ -0,0 +1,58 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+postgres_user = "infisical"
+postgres_db = "infisical"
+
+[config]
+env = [
+  "ENCRYPTION_KEY=6c1fe4e407b8911c104518103505b218",
+  "AUTH_SECRET=5lrMXKKWCVocS/uerPsl7V+TX/aaUaI7iDkgl3tSmLE=",
+  "POSTGRES_PASSWORD=${postgres_password}",
+  "POSTGRES_USER=${postgres_user}",
+  "POSTGRES_DB=${postgres_db}",
+  "SITE_URL=http://${main_domain}:8080",
+  "SMTP_HOST=",
+  "SMTP_PORT=",
+  "SMTP_NAME=",
+  "SMTP_USERNAME=",
+  "SMTP_PASSWORD=",
+  "CLIENT_ID_HEROKU=",
+  "CLIENT_ID_VERCEL=",
+  "CLIENT_ID_NETLIFY=",
+  "CLIENT_ID_GITHUB=",
+  "CLIENT_ID_GITHUB_APP=",
+  "CLIENT_SLUG_GITHUB_APP=",
+  "CLIENT_ID_GITLAB=",
+  "CLIENT_ID_BITBUCKET=",
+  "CLIENT_SECRET_HEROKU=",
+  "CLIENT_SECRET_VERCEL=",
+  "CLIENT_SECRET_NETLIFY=",
+  "CLIENT_SECRET_GITHUB=",
+  "CLIENT_SECRET_GITHUB_APP=",
+  "CLIENT_SECRET_GITLAB=",
+  "CLIENT_SECRET_BITBUCKET=",
+  "CLIENT_SLUG_VERCEL=",
+  "CLIENT_PRIVATE_KEY_GITHUB_APP=",
+  "CLIENT_APP_ID_GITHUB_APP=",
+  "SENTRY_DSN=",
+  "POSTHOG_HOST=",
+  "POSTHOG_PROJECT_API_KEY=",
+  "CLIENT_ID_GOOGLE_LOGIN=",
+  "CLIENT_SECRET_GOOGLE_LOGIN=",
+  "CLIENT_ID_GITHUB_LOGIN=",
+  "CLIENT_SECRET_GITHUB_LOGIN=",
+  "CLIENT_ID_GITLAB_LOGIN=",
+  "CLIENT_SECRET_GITLAB_LOGIN=",
+  "CAPTCHA_SECRET=",
+  "NEXT_PUBLIC_CAPTCHA_SITE_KEY=",
+  "PLAIN_API_KEY=",
+  "PLAIN_WISH_LABEL_IDS=",
+  "SSL_CLIENT_CERTIFICATE_HEADER_KEY=",
+]
+mounts = []
+
+[[config.domains]]
+serviceName = "backend"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/infisical/template.yml b/blueprints/infisical/template.yml
deleted file mode 100644
index 79513b0..0000000
--- a/blueprints/infisical/template.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  postgres_user: infisical
-  postgres_db: infisical
-
-config:
-  domains:
-    - serviceName: backend
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    - ENCRYPTION_KEY=6c1fe4e407b8911c104518103505b218  # Sample key, not for production
-    - AUTH_SECRET=5lrMXKKWCVocS/uerPsl7V+TX/aaUaI7iDkgl3tSmLE=  # Sample key, not for production
-    - POSTGRES_PASSWORD=${postgres_password}
-    - POSTGRES_USER=${postgres_user}
-    - POSTGRES_DB=${postgres_db}
-    - SITE_URL=http://${main_domain}:8080
-    - SMTP_HOST=
-    - SMTP_PORT=
-    - SMTP_NAME=
-    - SMTP_USERNAME=
-    - SMTP_PASSWORD=
-    - CLIENT_ID_HEROKU=
-    - CLIENT_ID_VERCEL=
-    - CLIENT_ID_NETLIFY=
-    - CLIENT_ID_GITHUB=
-    - CLIENT_ID_GITHUB_APP=
-    - CLIENT_SLUG_GITHUB_APP=
-    - CLIENT_ID_GITLAB=
-    - CLIENT_ID_BITBUCKET=
-    - CLIENT_SECRET_HEROKU=
-    - CLIENT_SECRET_VERCEL=
-    - CLIENT_SECRET_NETLIFY=
-    - CLIENT_SECRET_GITHUB=
-    - CLIENT_SECRET_GITHUB_APP=
-    - CLIENT_SECRET_GITLAB=
-    - CLIENT_SECRET_BITBUCKET=
-    - CLIENT_SLUG_VERCEL=
-    - CLIENT_PRIVATE_KEY_GITHUB_APP=
-    - CLIENT_APP_ID_GITHUB_APP=
-    - SENTRY_DSN=
-    - POSTHOG_HOST=
-    - POSTHOG_PROJECT_API_KEY=
-    - CLIENT_ID_GOOGLE_LOGIN=
-    - CLIENT_SECRET_GOOGLE_LOGIN=
-    - CLIENT_ID_GITHUB_LOGIN=
-    - CLIENT_SECRET_GITHUB_LOGIN=
-    - CLIENT_ID_GITLAB_LOGIN=
-    - CLIENT_SECRET_GITLAB_LOGIN=
-    - CAPTCHA_SECRET=
-    - NEXT_PUBLIC_CAPTCHA_SITE_KEY=
-    - PLAIN_API_KEY=
-    - PLAIN_WISH_LABEL_IDS=
-    - SSL_CLIENT_CERTIFICATE_HEADER_KEY=
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/influxdb/template.toml b/blueprints/influxdb/template.toml
new file mode 100644
index 0000000..5961284
--- /dev/null
+++ b/blueprints/influxdb/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "influxdb"
+port = 8_086
+host = "${main_domain}"
diff --git a/blueprints/influxdb/template.yml b/blueprints/influxdb/template.yml
deleted file mode 100644
index 4d32a70..0000000
--- a/blueprints/influxdb/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: influxdb
-      port: 8086
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/invoiceshelf/template.toml b/blueprints/invoiceshelf/template.toml
new file mode 100644
index 0000000..eab1336
--- /dev/null
+++ b/blueprints/invoiceshelf/template.toml
@@ -0,0 +1,19 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_username = "invoiceshelf"
+db_database = "invoiceshelf"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "invoiceshelf-app"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+INVOICESHELF_HOST = "${main_domain}"
+DB_PASSWORD = "${db_password}"
+DB_USERNAME = "${db_username}"
+DB_DATABASE = "${db_database}"
diff --git a/blueprints/invoiceshelf/template.yml b/blueprints/invoiceshelf/template.yml
deleted file mode 100644
index 63ef33c..0000000
--- a/blueprints/invoiceshelf/template.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_username: "invoiceshelf"
-  db_database: "invoiceshelf"
-
-config:
-  domains:
-    - serviceName: invoiceshelf-app
-      port: 80
-      host: ${main_domain}
-
-  env:
-    INVOICESHELF_HOST: ${main_domain}
-    DB_PASSWORD: ${db_password}
-    DB_USERNAME: ${db_username}
-    DB_DATABASE: ${db_database}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/it-tools/template.toml b/blueprints/it-tools/template.toml
new file mode 100644
index 0000000..2b53587
--- /dev/null
+++ b/blueprints/it-tools/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "it-tools"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/it-tools/template.yml b/blueprints/it-tools/template.yml
deleted file mode 100644
index b7ff312..0000000
--- a/blueprints/it-tools/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: it-tools
-      port: 80
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/jellyfin/template.toml b/blueprints/jellyfin/template.toml
new file mode 100644
index 0000000..7dd63ce
--- /dev/null
+++ b/blueprints/jellyfin/template.toml
@@ -0,0 +1,13 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "jellyfin"
+port = 8_096
+host = "${main_domain}"
+
+[config.env]
+JELLYFIN_HOST = "${main_domain}"
diff --git a/blueprints/jellyfin/template.yml b/blueprints/jellyfin/template.yml
deleted file mode 100644
index f8c5c8a..0000000
--- a/blueprints/jellyfin/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: jellyfin
-      port: 8096
-      host: ${main_domain}
-
-  env:
-    JELLYFIN_HOST: ${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/kimai/template.toml b/blueprints/kimai/template.toml
new file mode 100644
index 0000000..2967c09
--- /dev/null
+++ b/blueprints/kimai/template.toml
@@ -0,0 +1,22 @@
+[variables]
+main_domain = "${domain}"
+admin_password = "${password:32}"
+mysql_password = "${password:32}"
+mysql_root_password = "${password:32}"
+app_secret = "${password:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "app"
+port = 8_001
+host = "${main_domain}"
+
+[config.env]
+KI_HOST = "${main_domain}"
+KI_ADMINMAIL = "admin@kimai.local"
+KI_ADMINPASS = "${admin_password}"
+KI_MYSQL_ROOT_PASSWORD = "${mysql_root_password}"
+KI_MYSQL_PASSWORD = "${mysql_password}"
+KI_APP_SECRET = "${app_secret}"
diff --git a/blueprints/kimai/template.yml b/blueprints/kimai/template.yml
deleted file mode 100644
index 53852e2..0000000
--- a/blueprints/kimai/template.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-variables:
-  main_domain: ${domain}
-  admin_password: ${password:32}
-  mysql_password: ${password:32}
-  mysql_root_password: ${password:32}
-  app_secret: ${password:32}
-
-config:
-  domains:
-    - serviceName: app
-      port: 8001
-      host: ${main_domain}
-
-  env:
-    KI_HOST: ${main_domain}
-    KI_ADMINMAIL: "admin@kimai.local"
-    KI_ADMINPASS: ${admin_password}
-    KI_MYSQL_ROOT_PASSWORD: ${mysql_root_password}
-    KI_MYSQL_PASSWORD: ${mysql_password}
-    KI_APP_SECRET: ${app_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/langflow/template.toml b/blueprints/langflow/template.toml
new file mode 100644
index 0000000..66a9364
--- /dev/null
+++ b/blueprints/langflow/template.toml
@@ -0,0 +1,16 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_username = "langflow"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "langflow"
+port = 7_860
+host = "${main_domain}"
+
+[config.env]
+DB_PASSWORD = "${db_password}"
+DB_USERNAME = "${db_username}"
diff --git a/blueprints/langflow/template.yml b/blueprints/langflow/template.yml
deleted file mode 100644
index 73b61ea..0000000
--- a/blueprints/langflow/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_username: "langflow"
-
-config:
-  domains:
-    - serviceName: langflow
-      port: 7860
-      host: ${main_domain}
-
-  env:
-    DB_PASSWORD: ${db_password}
-    DB_USERNAME: ${db_username}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/linkwarden/template.toml b/blueprints/linkwarden/template.toml
new file mode 100644
index 0000000..5b70488
--- /dev/null
+++ b/blueprints/linkwarden/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+next_secret = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "linkwarden"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+POSTGRES_PASSWORD = "${postgres_password}"
+NEXTAUTH_SECRET = "${next_secret}"
+NEXTAUTH_URL = "http://${main_domain}/api/v1/auth"
diff --git a/blueprints/linkwarden/template.yml b/blueprints/linkwarden/template.yml
deleted file mode 100644
index a3930a4..0000000
--- a/blueprints/linkwarden/template.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  next_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: linkwarden
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    POSTGRES_PASSWORD: ${postgres_password}
-    NEXTAUTH_SECRET: ${next_secret}
-    NEXTAUTH_URL: http://${main_domain}/api/v1/auth
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/listmonk/template.toml b/blueprints/listmonk/template.toml
new file mode 100644
index 0000000..633341b
--- /dev/null
+++ b/blueprints/listmonk/template.toml
@@ -0,0 +1,29 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+[[config.domains]]
+serviceName = "app"
+port = 9_000
+host = "${main_domain}"
+
+[[config.mounts]]
+filePath = "config.toml"
+content = """
+[app]
+address = "0.0.0.0:9000"
+
+[db]
+host = "db"
+port = 5432
+user = "listmonk"
+password = "listmonk"
+database = "listmonk"
+
+ssl_mode = "disable"
+max_open = 25
+max_idle = 25
+max_lifetime = "300s"
+
+params = "" 
+"""
diff --git a/blueprints/listmonk/template.yml b/blueprints/listmonk/template.yml
deleted file mode 100644
index b0664be..0000000
--- a/blueprints/listmonk/template.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: app
-      port: 9000
-      host: ${main_domain}
-
-  env:
-    # visit the page to setup your super admin user
-    # check config.toml in Advanced / Volumes for more options
-
-  mounts:
-    - filePath: config.toml
-      content: |
-        [app]
-        address = "0.0.0.0:9000"
-
-        [db]
-        host = "db"
-        port = 5432
-        user = "listmonk"
-        password = "listmonk"
-        database = "listmonk"
-
-        ssl_mode = "disable"
-        max_open = 25
-        max_idle = 25
-        max_lifetime = "300s"
-
-        params = "" 
\ No newline at end of file
diff --git a/blueprints/lobe-chat/template.toml b/blueprints/lobe-chat/template.toml
new file mode 100644
index 0000000..c4da570
--- /dev/null
+++ b/blueprints/lobe-chat/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "lobe-chat"
+port = 3_210
+host = "${main_domain}"
diff --git a/blueprints/lobe-chat/template.yml b/blueprints/lobe-chat/template.yml
deleted file mode 100644
index b75d0d9..0000000
--- a/blueprints/lobe-chat/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: lobe-chat
-      port: 3210
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/logto/template.toml b/blueprints/logto/template.toml
new file mode 100644
index 0000000..896a5d3
--- /dev/null
+++ b/blueprints/logto/template.toml
@@ -0,0 +1,22 @@
+[variables]
+main_domain = "${domain}"
+admin_domain = "${domain}"
+postgres_password = "${password}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "app"
+port = 3_001
+host = "${main_domain}"
+
+[[config.domains]]
+serviceName = "app"
+port = 3_002
+host = "${admin_domain}"
+
+[config.env]
+LOGTO_ENDPOINT = "http://${admin_domain}"
+LOGTO_ADMIN_ENDPOINT = "http://${admin_domain}"
+LOGTO_POSTGRES_PASSWORD = "${postgres_password}"
diff --git a/blueprints/logto/template.yml b/blueprints/logto/template.yml
deleted file mode 100644
index 7fe7f99..0000000
--- a/blueprints/logto/template.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-variables:
-  main_domain: ${domain}
-  admin_domain: ${domain}
-  postgres_password: ${password}
-
-config:
-  domains:
-    - serviceName: app
-      port: 3001
-      host: ${main_domain}
-    - serviceName: app
-      port: 3002
-      host: ${admin_domain}
-
-  env:
-    LOGTO_ENDPOINT: http://${admin_domain}
-    LOGTO_ADMIN_ENDPOINT: http://${admin_domain}
-    LOGTO_POSTGRES_PASSWORD: ${postgres_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/lowcoder/template.toml b/blueprints/lowcoder/template.toml
new file mode 100644
index 0000000..be1cc7a
--- /dev/null
+++ b/blueprints/lowcoder/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+encryption_password = "${password:32}"
+encryption_salt = "${password:32}"
+api_secret = "${password:32}"
+
+[config]
+[config.domains]
+serviceName = "lowcoder-api-service"
+port = 3000
+host = "${main_domain}"
+
+[config.env]
+ENABLE_USER_SIGN_UP = false
+ENCRYPTION_PASSWORD = "${encryption_password}"
+ENCRYPTION_SALT = "${encryption_salt}"
+CORS_ALLOWED_DOMAINS = "*"
+LOWCODER_API_KEY_SECRET = "${api_secret}"
diff --git a/blueprints/lowcoder/template.yml b/blueprints/lowcoder/template.yml
deleted file mode 100644
index a669bae..0000000
--- a/blueprints/lowcoder/template.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-variables:
-  main_domain: ${domain}
-  encryption_password: ${password:32}
-  encryption_salt: ${password:32}
-  api_secret: ${password:32}
-
-config:
-  domains:
-    - serviceName: lowcoder-api-service
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    ENABLE_USER_SIGN_UP: "false"
-    ENCRYPTION_PASSWORD: ${encryption_password}
-    ENCRYPTION_SALT: ${encryption_salt}
-    CORS_ALLOWED_DOMAINS: "*"
-    LOWCODER_API_KEY_SECRET: ${api_secret}
-
-  mounts: [] 
diff --git a/blueprints/macos/template.toml b/blueprints/macos/template.toml
new file mode 100644
index 0000000..4cdea16
--- /dev/null
+++ b/blueprints/macos/template.toml
@@ -0,0 +1,16 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "macos"
+port = 8_006
+host = "${main_domain}"
+
+[config.env]
+VERSION = "15"
+DISK_SIZE = "64G"
+RAM_SIZE = "4G"
+CPU_CORES = "2"
diff --git a/blueprints/macos/template.yml b/blueprints/macos/template.yml
deleted file mode 100644
index 41693be..0000000
--- a/blueprints/macos/template.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: macos
-      port: 8006
-      host: ${main_domain}
-
-  env:
-    # https://github.com/dockur/macos?tab=readme-ov-file#how-do-i-select-the-macos-version
-    VERSION: "15"
-
-    # Uncomment this if your PC/VM or etc does not support virtualization technology
-    # KVM: "N"
-
-    DISK_SIZE: "64G"
-    RAM_SIZE: "4G"
-    CPU_CORES: "2"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/mailpit/template.toml b/blueprints/mailpit/template.toml
new file mode 100644
index 0000000..4c7b4d5
--- /dev/null
+++ b/blueprints/mailpit/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+default_password = "${password}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "mailpit"
+port = 8_025
+host = "${main_domain}"
diff --git a/blueprints/mailpit/template.yml b/blueprints/mailpit/template.yml
deleted file mode 100644
index 6e95205..0000000
--- a/blueprints/mailpit/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  default_password: ${password}
-
-config:
-  domains:
-    - serviceName: mailpit
-      port: 8025
-      host: ${main_domain}
-
-    # Uncomment below if you want basic auth on UI and SMTP
-    #MP_UI_AUTH: mailpit:${default_password}
-    #MP_SMTP_AUTH: mailpit:${default_password}
-
-  mounts: [] 
diff --git a/blueprints/maybe/template.toml b/blueprints/maybe/template.toml
new file mode 100644
index 0000000..05ffc3f
--- /dev/null
+++ b/blueprints/maybe/template.toml
@@ -0,0 +1,21 @@
+[variables]
+main_domain = "${domain}"
+secret_key_base = "${base64:64}"
+synth_api_key = "${base64:32}"
+
+[[config.domains]]
+serviceName = "app"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+SECRET_KEY_BASE = "${secret_key_base}"
+SELF_HOSTED = "true"
+SYNTH_API_KEY = "${synth_api_key}"
+RAILS_FORCE_SSL = "false"
+RAILS_ASSUME_SSL = "false"
+GOOD_JOB_EXECUTION_MODE = "async"
+
+[[config.mounts]]
+filePath = "./uploads"
+content = "This is where user uploads will be stored"
diff --git a/blueprints/maybe/template.yml b/blueprints/maybe/template.yml
deleted file mode 100644
index ab9648a..0000000
--- a/blueprints/maybe/template.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key_base: ${base64:64}
-  synth_api_key: ${base64:32}
-
-config:
-  domains:
-    - serviceName: app
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    SECRET_KEY_BASE: ${secret_key_base}
-    SELF_HOSTED: "true"
-    SYNTH_API_KEY: ${synth_api_key}
-    RAILS_FORCE_SSL: "false"
-    RAILS_ASSUME_SSL: "false"
-    GOOD_JOB_EXECUTION_MODE: "async"
-
-  mounts:
-    - filePath: ./uploads
-      content: "This is where user uploads will be stored" 
\ No newline at end of file
diff --git a/blueprints/meilisearch/template.toml b/blueprints/meilisearch/template.toml
new file mode 100644
index 0000000..b1bdb5f
--- /dev/null
+++ b/blueprints/meilisearch/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+master_key = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "meilisearch"
+port = 7_700
+host = "${main_domain}"
+
+[config.env]
+MEILI_ENV = "development"
+MEILI_MASTER_KEY = "${master_key}"
diff --git a/blueprints/meilisearch/template.yml b/blueprints/meilisearch/template.yml
deleted file mode 100644
index eb7dac7..0000000
--- a/blueprints/meilisearch/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  master_key: ${base64:32}
-
-config:
-  domains:
-    - serviceName: meilisearch
-      port: 7700
-      host: ${main_domain}
-
-  env:
-    MEILI_ENV: "development"
-    MEILI_MASTER_KEY: ${master_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/metabase/template.toml b/blueprints/metabase/template.toml
new file mode 100644
index 0000000..f8600d7
--- /dev/null
+++ b/blueprints/metabase/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "metabase"
+port = 3_000
+host = "${main_domain}"
diff --git a/blueprints/metabase/template.yml b/blueprints/metabase/template.yml
deleted file mode 100644
index 34f1848..0000000
--- a/blueprints/metabase/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: metabase
-      port: 3000
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/minio/template.toml b/blueprints/minio/template.toml
new file mode 100644
index 0000000..6c3367d
--- /dev/null
+++ b/blueprints/minio/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+api_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "minio"
+port = 9_001
+host = "${main_domain}"
+
+[[config.domains]]
+serviceName = "minio"
+port = 9_000
+host = "${api_domain}"
diff --git a/blueprints/minio/template.yml b/blueprints/minio/template.yml
deleted file mode 100644
index c508d8f..0000000
--- a/blueprints/minio/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  api_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: minio
-      port: 9001
-      host: ${main_domain}
-    - serviceName: minio
-      port: 9000
-      host: ${api_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/n8n/template.toml b/blueprints/n8n/template.toml
new file mode 100644
index 0000000..257bffb
--- /dev/null
+++ b/blueprints/n8n/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "n8n"
+port = 5_678
+host = "${main_domain}"
+
+[config.env]
+N8N_HOST = "${main_domain}"
+N8N_PORT = "5678"
+GENERIC_TIMEZONE = "Europe/Berlin"
diff --git a/blueprints/n8n/template.yml b/blueprints/n8n/template.yml
deleted file mode 100644
index f1e19c9..0000000
--- a/blueprints/n8n/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: n8n
-      port: 5678
-      host: ${main_domain}
-
-  env:
-    N8N_HOST: ${main_domain}
-    N8N_PORT: "5678"
-    GENERIC_TIMEZONE: "Europe/Berlin"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/nextcloud-aio/template.toml b/blueprints/nextcloud-aio/template.toml
new file mode 100644
index 0000000..30be77a
--- /dev/null
+++ b/blueprints/nextcloud-aio/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_root_password = "${password}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "nextcloud"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+NEXTCLOUD_DOMAIN = "${main_domain}"
+MYSQL_SECRET_PASSWORD = "${db_password}"
+MYSQL_SECRET_PASSWORD_ROOT = "${db_root_password}"
diff --git a/blueprints/nextcloud-aio/template.yml b/blueprints/nextcloud-aio/template.yml
deleted file mode 100644
index 4666a85..0000000
--- a/blueprints/nextcloud-aio/template.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_root_password: ${password}
-
-config:
-  domains:
-    - serviceName: nextcloud
-      port: 80
-      host: ${main_domain}
-
-  env:
-    NEXTCLOUD_DOMAIN: ${main_domain}
-    MYSQL_SECRET_PASSWORD: ${db_password}
-    MYSQL_SECRET_PASSWORD_ROOT: ${db_root_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/nocodb/template.toml b/blueprints/nocodb/template.toml
new file mode 100644
index 0000000..36d19d8
--- /dev/null
+++ b/blueprints/nocodb/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+jwt_secret = "${base64:64}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "nocodb"
+port = 8_000
+host = "${main_domain}"
+
+[config.env]
+NOCODB_PORT = "8000"
+NC_AUTH_JWT_SECRET = "${jwt_secret}"
diff --git a/blueprints/nocodb/template.yml b/blueprints/nocodb/template.yml
deleted file mode 100644
index 39b8d88..0000000
--- a/blueprints/nocodb/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  jwt_secret: ${base64:64}
-
-config:
-  domains:
-    - serviceName: nocodb
-      port: 8000
-      host: ${main_domain}
-
-  env:
-    NOCODB_PORT: "8000"
-    NC_AUTH_JWT_SECRET: ${jwt_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/odoo/template.toml b/blueprints/odoo/template.toml
new file mode 100644
index 0000000..8860829
--- /dev/null
+++ b/blueprints/odoo/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "web"
+port = 8_069
+host = "${main_domain}"
diff --git a/blueprints/odoo/template.yml b/blueprints/odoo/template.yml
deleted file mode 100644
index 969a2f9..0000000
--- a/blueprints/odoo/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: web
-      port: 8069
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/onedev/template.toml b/blueprints/onedev/template.toml
new file mode 100644
index 0000000..5960e0e
--- /dev/null
+++ b/blueprints/onedev/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "onedev"
+port = 6_610
+host = "${main_domain}"
diff --git a/blueprints/onedev/template.yml b/blueprints/onedev/template.yml
deleted file mode 100644
index 722495b..0000000
--- a/blueprints/onedev/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: onedev
-      port: 6610
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/ontime/template.toml b/blueprints/ontime/template.toml
new file mode 100644
index 0000000..02255c0
--- /dev/null
+++ b/blueprints/ontime/template.toml
@@ -0,0 +1,13 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "ontime"
+port = 4_001
+host = "${main_domain}"
+
+[config.env]
+TZ = "UTC"
diff --git a/blueprints/ontime/template.yml b/blueprints/ontime/template.yml
deleted file mode 100644
index fccde7c..0000000
--- a/blueprints/ontime/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: ontime
-      port: 4001
-      host: ${main_domain}
-
-  env:
-    TZ: "UTC"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/open-webui/template.toml b/blueprints/open-webui/template.toml
new file mode 100644
index 0000000..2386301
--- /dev/null
+++ b/blueprints/open-webui/template.toml
@@ -0,0 +1,14 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "open-webui"
+port = 8_080
+host = "${main_domain}"
+
+[config.env]
+OLLAMA_DOCKER_TAG = "0.1.47"
+WEBUI_DOCKER_TAG = "0.3.7"
diff --git a/blueprints/open-webui/template.yml b/blueprints/open-webui/template.yml
deleted file mode 100644
index 0a66d50..0000000
--- a/blueprints/open-webui/template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: open-webui
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    OLLAMA_DOCKER_TAG: "0.1.47"
-    WEBUI_DOCKER_TAG: "0.3.7"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/otterwiki/template.toml b/blueprints/otterwiki/template.toml
new file mode 100644
index 0000000..6c5af55
--- /dev/null
+++ b/blueprints/otterwiki/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "otterwiki"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/otterwiki/template.yml b/blueprints/otterwiki/template.yml
deleted file mode 100644
index 095f0cb..0000000
--- a/blueprints/otterwiki/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: otterwiki
-      port: 80
-      host: ${main_domain}
-  
-  env: []
-  
-  mounts: []
diff --git a/blueprints/outline/template.toml b/blueprints/outline/template.toml
new file mode 100644
index 0000000..8c7c9f8
--- /dev/null
+++ b/blueprints/outline/template.toml
@@ -0,0 +1,66 @@
+[variables]
+main_domain = "${domain}"
+dex_domain = "${domain}"
+secret_key = "${base64:32}"
+utils_secret = "${base64:32}"
+client_secret = "${base64:32}"
+postgres_password = "${password}"
+
+[[config.domains]]
+serviceName = "outline"
+port = 3_000
+host = "${main_domain}"
+
+[[config.domains]]
+serviceName = "dex"
+port = 5_556
+host = "${dex_domain}"
+
+[config.env]
+URL = "http://${main_domain}"
+DEX_URL = "http://${dex_domain}"
+DOMAIN_NAME = "${main_domain}"
+POSTGRES_PASSWORD = "${postgres_password}"
+SECRET_KEY = "${secret_key}"
+UTILS_SECRET = "${utils_secret}"
+CLIENT_SECRET = "${client_secret}"
+
+[[config.mounts]]
+filePath = "/etc/dex/config.yaml"
+content = """
+issuer: http://${dex_domain}
+
+web:
+  http: 0.0.0.0:5556
+
+storage:
+  type: memory
+
+enablePasswordDB: true
+
+frontend:
+   issuer: Outline
+
+logger:
+  level: debug
+
+staticPasswords:
+  - email: "admin@example.com"
+    # bcrypt hash of the string "password": $(echo password | htpasswd -BinC 10 admin | cut -d: -f2)
+    hash: "$2y$10$jsRWHw54uxTUIfhjgUrB9u8HSzPk7TUuQri9sXZrKzRXcScvwYor."
+    username: "admin"
+    userID: "1"
+
+
+oauth2:
+  skipApprovalScreen: true
+  alwaysShowLoginScreen: false
+  passwordConnector: local
+
+staticClients:
+  - id: "outline"
+    redirectURIs:
+      - http://${main_domain}/auth/oidc.callback
+    name: "Outline"
+    secret: "${client_secret}" 
+"""
diff --git a/blueprints/outline/template.yml b/blueprints/outline/template.yml
deleted file mode 100644
index f0c2409..0000000
--- a/blueprints/outline/template.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-variables:
-  main_domain: ${domain}
-  dex_domain: ${domain}
-  secret_key: ${base64:32}
-  utils_secret: ${base64:32}
-  client_secret: ${base64:32}
-  postgres_password: ${password}
-
-config:
-  domains:
-    - serviceName: outline
-      port: 3000
-      host: ${main_domain}
-    - serviceName: dex
-      port: 5556
-      host: ${dex_domain}
-
-  env:
-    URL: http://${main_domain}
-    DEX_URL: http://${dex_domain}
-    DOMAIN_NAME: ${main_domain}
-    POSTGRES_PASSWORD: ${postgres_password}
-    SECRET_KEY: ${secret_key}
-    UTILS_SECRET: ${utils_secret}
-    CLIENT_SECRET: ${client_secret}
-
-  mounts:
-    - filePath: /etc/dex/config.yaml
-      content: |
-        issuer: http://${dex_domain}
-
-        web:
-          http: 0.0.0.0:5556
-
-        storage:
-          type: memory
-
-        enablePasswordDB: true
-
-        frontend:
-           issuer: Outline
-
-        logger:
-          level: debug
-
-        staticPasswords:
-          - email: "admin@example.com"
-            # bcrypt hash of the string "password": $(echo password | htpasswd -BinC 10 admin | cut -d: -f2)
-            hash: "$2y$10$jsRWHw54uxTUIfhjgUrB9u8HSzPk7TUuQri9sXZrKzRXcScvwYor."
-            username: "admin"
-            userID: "1"
-
-
-        oauth2:
-          skipApprovalScreen: true
-          alwaysShowLoginScreen: false
-          passwordConnector: local
-
-        staticClients:
-          - id: "outline"
-            redirectURIs:
-              - http://${main_domain}/auth/oidc.callback
-            name: "Outline"
-            secret: "${client_secret}" 
\ No newline at end of file
diff --git a/blueprints/penpot/template.toml b/blueprints/penpot/template.toml
new file mode 100644
index 0000000..84711b0
--- /dev/null
+++ b/blueprints/penpot/template.toml
@@ -0,0 +1,13 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "penpot-frontend"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+DOMAIN_NAME = "${main_domain}"
diff --git a/blueprints/penpot/template.yml b/blueprints/penpot/template.yml
deleted file mode 100644
index 54f16e1..0000000
--- a/blueprints/penpot/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: penpot-frontend
-      port: 80
-      host: ${main_domain}
-
-  env:
-    DOMAIN_NAME: ${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/peppermint/template.toml b/blueprints/peppermint/template.toml
new file mode 100644
index 0000000..eebb814
--- /dev/null
+++ b/blueprints/peppermint/template.toml
@@ -0,0 +1,24 @@
+[variables]
+main_domain = "${domain}"
+api_domain = "${domain}"
+postgres_password = "${password}"
+secret = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "peppermint-app"
+port = 3_000
+host = "${main_domain}"
+
+[[config.domains]]
+serviceName = "peppermint-app"
+port = 5_003
+host = "${api_domain}"
+
+[config.env]
+MAIN_DOMAIN = "${main_domain}"
+API_DOMAIN = "${api_domain}"
+POSTGRES_PASSWORD = "${postgres_password}"
+SECRET = "${secret}"
diff --git a/blueprints/peppermint/template.yml b/blueprints/peppermint/template.yml
deleted file mode 100644
index 8766589..0000000
--- a/blueprints/peppermint/template.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-variables:
-  main_domain: ${domain}
-  api_domain: ${domain}
-  postgres_password: ${password}
-  secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: peppermint-app
-      port: 3000
-      host: ${main_domain}
-    - serviceName: peppermint-app
-      port: 5003
-      host: ${api_domain}
-
-  env:
-    MAIN_DOMAIN: ${main_domain}
-    API_DOMAIN: ${api_domain}
-    POSTGRES_PASSWORD: ${postgres_password}
-    SECRET: ${secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/photoprism/template.toml b/blueprints/photoprism/template.toml
new file mode 100644
index 0000000..15ec5fa
--- /dev/null
+++ b/blueprints/photoprism/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+admin_password = "${password}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "photoprism"
+port = 2_342
+host = "${main_domain}"
+
+[config.env]
+BASE_URL = "http://${main_domain}"
+ADMIN_PASSWORD = "${admin_password}"
diff --git a/blueprints/photoprism/template.yml b/blueprints/photoprism/template.yml
deleted file mode 100644
index 8a1a26a..0000000
--- a/blueprints/photoprism/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  admin_password: ${password}
-
-config:
-  domains:
-    - serviceName: photoprism
-      port: 2342
-      host: ${main_domain}
-
-  env:
-    BASE_URL: http://${main_domain}
-    ADMIN_PASSWORD: ${admin_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/phpmyadmin/template.toml b/blueprints/phpmyadmin/template.toml
new file mode 100644
index 0000000..39c5384
--- /dev/null
+++ b/blueprints/phpmyadmin/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+root_password = "${password:32}"
+user_password = "${password:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "phpmyadmin"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+MYSQL_ROOT_PASSWORD = "${root_password}"
+MYSQL_DATABASE = "mysql"
+MYSQL_USER = "phpmyadmin"
+MYSQL_PASSWORD = "${user_password}"
diff --git a/blueprints/phpmyadmin/template.yml b/blueprints/phpmyadmin/template.yml
deleted file mode 100644
index ccbc1bf..0000000
--- a/blueprints/phpmyadmin/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  root_password: ${password:32}
-  user_password: ${password:32}
-
-config:
-  domains:
-    - serviceName: phpmyadmin
-      port: 80
-      host: ${main_domain}
-
-  env:
-    MYSQL_ROOT_PASSWORD: ${root_password}
-    MYSQL_DATABASE: "mysql"
-    MYSQL_USER: "phpmyadmin"
-    MYSQL_PASSWORD: ${user_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/plausible/template.toml b/blueprints/plausible/template.toml
new file mode 100644
index 0000000..58c234f
--- /dev/null
+++ b/blueprints/plausible/template.toml
@@ -0,0 +1,48 @@
+[variables]
+main_domain = "${domain}"
+secret_base = "${base64:64}"
+totp_key = "${base64:32}"
+
+[[config.domains]]
+serviceName = "plausible"
+port = 8_000
+host = "${main_domain}"
+
+[config.env]
+BASE_URL = "http://${main_domain}"
+SECRET_KEY_BASE = "${secret_base}"
+TOTP_VAULT_KEY = "${totp_key}"
+
+[[config.mounts]]
+filePath = "/clickhouse/clickhouse-config.xml"
+content = """
+<clickhouse>
+  <logger>
+    <level>warning</level>
+    <console>true</console>
+  </logger>
+
+  <!-- Stop all the unnecessary logging -->
+  <query_thread_log remove="remove"/>
+  <query_log remove="remove"/>
+  <text_log remove="remove"/>
+  <trace_log remove="remove"/>
+  <metric_log remove="remove"/>
+  <asynchronous_metric_log remove="remove"/>
+  <session_log remove="remove"/>
+  <part_log remove="remove"/>
+</clickhouse>
+"""
+
+[[config.mounts]]
+filePath = "/clickhouse/clickhouse-user-config.xml"
+content = """
+<clickhouse>
+  <profiles>
+    <default>
+      <log_queries>0</log_queries>
+      <log_query_threads>0</log_query_threads>
+    </default>
+  </profiles>
+</clickhouse>
+"""
diff --git a/blueprints/plausible/template.yml b/blueprints/plausible/template.yml
deleted file mode 100644
index d0f3948..0000000
--- a/blueprints/plausible/template.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_base: ${base64:64}
-  totp_key: ${base64:32}
-
-config:
-  domains:
-    - serviceName: plausible
-      port: 8000
-      host: ${main_domain}
-
-  env:
-    BASE_URL: http://${main_domain}
-    SECRET_KEY_BASE: ${secret_base}
-    TOTP_VAULT_KEY: ${totp_key}
-
-  mounts:
-    - filePath: /clickhouse/clickhouse-config.xml
-      content: |
-        <clickhouse>
-          <logger>
-            <level>warning</level>
-            <console>true</console>
-          </logger>
-
-          <!-- Stop all the unnecessary logging -->
-          <query_thread_log remove="remove"/>
-          <query_log remove="remove"/>
-          <text_log remove="remove"/>
-          <trace_log remove="remove"/>
-          <metric_log remove="remove"/>
-          <asynchronous_metric_log remove="remove"/>
-          <session_log remove="remove"/>
-          <part_log remove="remove"/>
-        </clickhouse>
-
-    - filePath: /clickhouse/clickhouse-user-config.xml
-      content: |
-        <clickhouse>
-          <profiles>
-            <default>
-              <log_queries>0</log_queries>
-              <log_query_threads>0</log_query_threads>
-            </default>
-          </profiles>
-        </clickhouse>
diff --git a/blueprints/pocket-id/template.toml b/blueprints/pocket-id/template.toml
new file mode 100644
index 0000000..5cb4715
--- /dev/null
+++ b/blueprints/pocket-id/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "pocket-id"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+PUBLIC_UI_CONFIG_DISABLED = "false"
+PUBLIC_APP_URL = "http://${main_domain}"
+TRUST_PROXY = "true"
diff --git a/blueprints/pocket-id/template.yml b/blueprints/pocket-id/template.yml
deleted file mode 100644
index b3af91a..0000000
--- a/blueprints/pocket-id/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: pocket-id
-      port: 80
-      host: ${main_domain}
-
-  env:
-    PUBLIC_UI_CONFIG_DISABLED: "false"
-    PUBLIC_APP_URL: http://${main_domain}
-    TRUST_PROXY: "true"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/pocketbase/template.toml b/blueprints/pocketbase/template.toml
new file mode 100644
index 0000000..45f5798
--- /dev/null
+++ b/blueprints/pocketbase/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "pocketbase"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/pocketbase/template.yml b/blueprints/pocketbase/template.yml
deleted file mode 100644
index 82b6f61..0000000
--- a/blueprints/pocketbase/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: pocketbase
-      port: 80
-      host: ${main_domain}
-
-  env: {} 
-
-  mounts: [] 
diff --git a/blueprints/portainer/template.toml b/blueprints/portainer/template.toml
new file mode 100644
index 0000000..39a6f3f
--- /dev/null
+++ b/blueprints/portainer/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "portainer"
+port = 9_000
+host = "${main_domain}"
diff --git a/blueprints/portainer/template.yml b/blueprints/portainer/template.yml
deleted file mode 100644
index 908f9c8..0000000
--- a/blueprints/portainer/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: portainer
-      port: 9000
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/postiz/template.toml b/blueprints/postiz/template.toml
new file mode 100644
index 0000000..260b77a
--- /dev/null
+++ b/blueprints/postiz/template.toml
@@ -0,0 +1,21 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_user = "postiz"
+db_name = "postiz"
+jwt_secret = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "postiz-app"
+port = 5_000
+host = "${main_domain}"
+
+[config.env]
+POSTIZ_HOST = "${main_domain}"
+DB_PASSWORD = "${db_password}"
+DB_USER = "${db_user}"
+DB_NAME = "${db_name}"
+JWT_SECRET = "${jwt_secret}"
diff --git a/blueprints/postiz/template.yml b/blueprints/postiz/template.yml
deleted file mode 100644
index 1ebddc7..0000000
--- a/blueprints/postiz/template.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_user: "postiz"
-  db_name: "postiz"
-  jwt_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: postiz-app
-      port: 5000
-      host: ${main_domain}
-
-  env:
-    POSTIZ_HOST: ${main_domain}
-    DB_PASSWORD: ${db_password}
-    DB_USER: ${db_user}
-    DB_NAME: ${db_name}
-    JWT_SECRET: ${jwt_secret}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/registry/template.toml b/blueprints/registry/template.toml
new file mode 100644
index 0000000..a61ca40
--- /dev/null
+++ b/blueprints/registry/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+registry_http_secret = "${password:30}"
+
+[[config.domains]]
+serviceName = "registry"
+port = 5_000
+host = "${main_domain}"
+
+[config.env]
+REGISTRY_HTTP_SECRET = "${registry_http_secret}"
+
+[[config.mounts]]
+filePath = "/auth/registry.password"
+content = """
+# from: docker run --rm --entrypoint htpasswd httpd:2 -Bbn docker password
+docker:$2y$10$qWZoWev/u5PV7WneFoRAMuoGpRcAQOgUuIIdLnU7pJXogrBSY23/2 
+"""
diff --git a/blueprints/registry/template.yml b/blueprints/registry/template.yml
deleted file mode 100644
index 44bea68..0000000
--- a/blueprints/registry/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  registry_http_secret: ${password:30}
-
-config:
-  domains:
-    - serviceName: registry
-      port: 5000
-      host: ${main_domain}
-
-  env:
-    REGISTRY_HTTP_SECRET: ${registry_http_secret}
-
-  mounts:
-    - filePath: /auth/registry.password
-      content: |
-        # from: docker run --rm --entrypoint htpasswd httpd:2 -Bbn docker password
-        docker:$2y$10$qWZoWev/u5PV7WneFoRAMuoGpRcAQOgUuIIdLnU7pJXogrBSY23/2 
\ No newline at end of file
diff --git a/blueprints/rocketchat/template.toml b/blueprints/rocketchat/template.toml
new file mode 100644
index 0000000..e0eb16e
--- /dev/null
+++ b/blueprints/rocketchat/template.toml
@@ -0,0 +1,14 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "rocketchat"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+ROCKETCHAT_HOST = "${main_domain}"
+ROCKETCHAT_PORT = "3000"
diff --git a/blueprints/rocketchat/template.yml b/blueprints/rocketchat/template.yml
deleted file mode 100644
index ca684d5..0000000
--- a/blueprints/rocketchat/template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: rocketchat
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    ROCKETCHAT_HOST: ${main_domain}
-    ROCKETCHAT_PORT: "3000"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/roundcube/template.toml b/blueprints/roundcube/template.toml
new file mode 100644
index 0000000..1974264
--- /dev/null
+++ b/blueprints/roundcube/template.toml
@@ -0,0 +1,14 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "roundcubemail"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+DEFAULT_HOST = "tls://mail.example.com"
+SMTP_SERVER = "tls://mail.example.com"
diff --git a/blueprints/roundcube/template.yml b/blueprints/roundcube/template.yml
deleted file mode 100644
index c3874dd..0000000
--- a/blueprints/roundcube/template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: roundcubemail
-      port: 80
-      host: ${main_domain}
-
-  env:
-    DEFAULT_HOST: "tls://mail.example.com"
-    SMTP_SERVER: "tls://mail.example.com"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/ryot/template.toml b/blueprints/ryot/template.toml
new file mode 100644
index 0000000..6abfe98
--- /dev/null
+++ b/blueprints/ryot/template.toml
@@ -0,0 +1,16 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+admin_access_token = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "ryot-app"
+port = 8_000
+host = "${main_domain}"
+
+[config.env]
+POSTGRES_PASSWORD = "${postgres_password}"
+ADMIN_ACCESS_TOKEN = "${admin_access_token}"
diff --git a/blueprints/ryot/template.yml b/blueprints/ryot/template.yml
deleted file mode 100644
index 50d3142..0000000
--- a/blueprints/ryot/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-  admin_access_token: ${base64:32}
-
-config:
-  domains:
-    - serviceName: ryot-app
-      port: 8000
-      host: ${main_domain}
-
-  env:
-    POSTGRES_PASSWORD: ${postgres_password}
-    ADMIN_ACCESS_TOKEN: ${admin_access_token}
-    # Optional: Uncomment and set your pro key if you have one
-    # SERVER_PRO_KEY: "your_pro_key_here"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/shlink/template.toml b/blueprints/shlink/template.toml
new file mode 100644
index 0000000..8091163
--- /dev/null
+++ b/blueprints/shlink/template.toml
@@ -0,0 +1,20 @@
+[variables]
+main_domain = "${domain}"
+initial_api_key = "${password:30}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "shlink-web"
+port = 8_080
+host = "web-${main_domain}"
+
+[[config.domains]]
+serviceName = "shlink"
+port = 8_080
+host = "${main_domain}"
+
+[config.env]
+INITIAL_API_KEY = "${initial_api_key}"
+DEFAULT_DOMAIN = "${main_domain}"
diff --git a/blueprints/shlink/template.yml b/blueprints/shlink/template.yml
deleted file mode 100644
index 1ab9f5f..0000000
--- a/blueprints/shlink/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  initial_api_key: ${password:30}
-
-config:
-  domains:
-    - serviceName: shlink-web
-      port: 8080
-      host: web-${main_domain}
-    - serviceName: shlink
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    INITIAL_API_KEY: ${initial_api_key}
-    DEFAULT_DOMAIN: ${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/slash/template.toml b/blueprints/slash/template.toml
new file mode 100644
index 0000000..211dedc
--- /dev/null
+++ b/blueprints/slash/template.toml
@@ -0,0 +1,18 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_user = "slash"
+db_name = "slash"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "slash-app"
+port = 5_231
+host = "${main_domain}"
+
+[config.env]
+DB_USER = "${db_user}"
+DB_PASSWORD = "${db_password}"
+DB_NAME = "${db_name}"
diff --git a/blueprints/slash/template.yml b/blueprints/slash/template.yml
deleted file mode 100644
index 6257885..0000000
--- a/blueprints/slash/template.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_user: "slash"
-  db_name: "slash"
-
-config:
-  domains:
-    - serviceName: slash-app
-      port: 5231
-      host: ${main_domain}
-
-  env:
-    DB_USER: ${db_user}
-    DB_PASSWORD: ${db_password}
-    DB_NAME: ${db_name}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/soketi/template.toml b/blueprints/soketi/template.toml
new file mode 100644
index 0000000..9834be4
--- /dev/null
+++ b/blueprints/soketi/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+metrics_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "soketi"
+port = 6_001
+host = "${main_domain}"
+
+[[config.domains]]
+serviceName = "soketi"
+port = 9_601
+host = "${metrics_domain}"
diff --git a/blueprints/soketi/template.yml b/blueprints/soketi/template.yml
deleted file mode 100644
index 58064a7..0000000
--- a/blueprints/soketi/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-  metrics_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: soketi
-      port: 6001
-      host: ${main_domain}
-    - serviceName: soketi
-      port: 9601
-      host: ${metrics_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/spacedrive/template.toml b/blueprints/spacedrive/template.toml
new file mode 100644
index 0000000..f9ef3e8
--- /dev/null
+++ b/blueprints/spacedrive/template.toml
@@ -0,0 +1,15 @@
+[variables]
+main_domain = "${domain}"
+secret_key = "${password}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "server"
+port = 8_080
+host = "${main_domain}"
+
+[config.env]
+SD_USERNAME = "admin"
+SD_PASSWORD = "${secret_key}"
diff --git a/blueprints/spacedrive/template.yml b/blueprints/spacedrive/template.yml
deleted file mode 100644
index b5aca28..0000000
--- a/blueprints/spacedrive/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key: ${password}
-
-config:
-  domains:
-    - serviceName: server
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    SD_USERNAME: "admin"
-    SD_PASSWORD: ${secret_key}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/stirling/template.toml b/blueprints/stirling/template.toml
new file mode 100644
index 0000000..10bb444
--- /dev/null
+++ b/blueprints/stirling/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "stirling-pdf"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/stirling/template.yml b/blueprints/stirling/template.yml
deleted file mode 100644
index e8f2d18..0000000
--- a/blueprints/stirling/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: stirling-pdf
-      port: 8080
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/supabase/template.toml b/blueprints/supabase/template.toml
new file mode 100644
index 0000000..c003e81
--- /dev/null
+++ b/blueprints/supabase/template.toml
@@ -0,0 +1,921 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password:32}"
+jwt_secret = "${base64:32}"
+dashboard_password = "${password:32}"
+logflare_api_key = "${password:32}"
+anon_key = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICJyb2xlIjogImFub24iLAogICJpc3MiOiAic3VwYWJhc2UiLAogICJpYXQiOiAxNzQxNTAwMDAwLAogICJleHAiOiAxODk5MjY2NDAwCn0.muKe0Nrvkf5bMyLoFqAuFypRu3jHAcTYU08SYKrgRQo"
+service_role_key = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICJyb2xlIjogInNlcnZpY2Vfcm9sZSIsCiAgImlzcyI6ICJzdXBhYmFzZSIsCiAgImlhdCI6IDE3NDE1MDAwMDAsCiAgImV4cCI6IDE4OTkyNjY0MDAKfQ.1KoSiJVueKJNkF59uc84BLqk7h8VdAoVp6Gozqr_vGc"
+
+[[config.domains]]
+serviceName = "kong"
+port = 8_000
+host = "${main_domain}"
+
+[config.env]
+SUPABASE_HOST = "${main_domain}"
+POSTGRES_PASSWORD = "${postgres_password}"
+JWT_SECRET = "${jwt_secret}"
+ANON_KEY = "${anon_key}"
+SERVICE_ROLE_KEY = "${service_role_key}"
+DASHBOARD_USERNAME = "supabase"
+DASHBOARD_PASSWORD = "${dashboard_password}"
+POSTGRES_HOSTNAME = "db"
+POSTGRES_DB = "postgres"
+POSTGRES_PORT = "5432"
+KONG_HTTP_PORT = "8000"
+KONG_HTTPS_PORT = "8443"
+PGRST_DB_SCHEMAS = "public,storage,graphql_public"
+ADDITIONAL_REDIRECT_URLS = ""
+JWT_EXPIRY = "3600"
+DISABLE_SIGNUP = "false"
+MAILER_URLPATHS_CONFIRMATION = '"/auth/v1/verify"'
+MAILER_URLPATHS_INVITE = '"/auth/v1/verify"'
+MAILER_URLPATHS_RECOVERY = '"/auth/v1/verify"'
+MAILER_URLPATHS_EMAIL_CHANGE = '"/auth/v1/verify"'
+ENABLE_EMAIL_SIGNUP = "true"
+ENABLE_EMAIL_AUTOCONFIRM = "false"
+SMTP_ADMIN_EMAIL = "admin@example.com"
+SMTP_HOSTNAME = "supabase-mail"
+SMTP_PORT = "2500"
+SMTP_USER = "fake_mail_user"
+SMTP_PASS = "fake_mail_password"
+SMTP_SENDER_NAME = "fake_sender"
+ENABLE_ANONYMOUS_USERS = "false"
+ENABLE_PHONE_SIGNUP = "true"
+ENABLE_PHONE_AUTOCONFIRM = "true"
+STUDIO_DEFAULT_ORGANIZATION = "Default Organization"
+STUDIO_DEFAULT_PROJECT = "Default Project"
+STUDIO_PORT = "3000"
+IMGPROXY_ENABLE_WEBP_DETECTION = "true"
+FUNCTIONS_VERIFY_JWT = "false"
+LOGFLARE_LOGGER_BACKEND_API_KEY = "${logflare_api_key}"
+LOGFLARE_API_KEY = "${logflare_api_key}"
+DOCKER_SOCKET_LOCATION = "/var/run/docker.sock"
+GOOGLE_PROJECT_ID = "GOOGLE_PROJECT_ID"
+GOOGLE_PROJECT_NUMBER = "GOOGLE_PROJECT_NUMBER"
+
+[[config.mounts]]
+filePath = "/volumes/api/kong.yml"
+content = """
+_format_version: '2.1'
+_transform: true
+
+###
+### Consumers / Users
+###
+consumers:
+  - username: DASHBOARD
+  - username: anon
+    keyauth_credentials:
+      - key: $SUPABASE_ANON_KEY
+  - username: service_role
+    keyauth_credentials:
+      - key: $SUPABASE_SERVICE_KEY
+
+###
+### Access Control List
+###
+acls:
+  - consumer: anon
+    group: anon
+  - consumer: service_role
+    group: admin
+
+###
+### Dashboard credentials
+###
+basicauth_credentials:
+  - consumer: DASHBOARD
+    username: $DASHBOARD_USERNAME
+    password: $DASHBOARD_PASSWORD
+
+###
+### API Routes
+###
+services:
+  ## Open Auth routes
+  - name: auth-v1-open
+    url: http://auth:9999/verify
+    routes:
+      - name: auth-v1-open
+        strip_path: true
+        paths:
+          - /auth/v1/verify
+    plugins:
+      - name: cors
+  - name: auth-v1-open-callback
+    url: http://auth:9999/callback
+    routes:
+      - name: auth-v1-open-callback
+        strip_path: true
+        paths:
+          - /auth/v1/callback
+    plugins:
+      - name: cors
+  - name: auth-v1-open-authorize
+    url: http://auth:9999/authorize
+    routes:
+      - name: auth-v1-open-authorize
+        strip_path: true
+        paths:
+          - /auth/v1/authorize
+    plugins:
+      - name: cors
+
+  ## Secure Auth routes
+  - name: auth-v1
+    _comment: 'GoTrue: /auth/v1/* -> http://auth:9999/*'
+    url: http://auth:9999/
+    routes:
+      - name: auth-v1-all
+        strip_path: true
+        paths:
+          - /auth/v1/
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+
+  ## Secure REST routes
+  - name: rest-v1
+    _comment: 'PostgREST: /rest/v1/* -> http://rest:3000/*'
+    url: http://rest:3000/
+    routes:
+      - name: rest-v1-all
+        strip_path: true
+        paths:
+          - /rest/v1/
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: true
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+
+  ## Secure GraphQL routes
+  - name: graphql-v1
+    _comment: 'PostgREST: /graphql/v1/* -> http://rest:3000/rpc/graphql'
+    url: http://rest:3000/rpc/graphql
+    routes:
+      - name: graphql-v1-all
+        strip_path: true
+        paths:
+          - /graphql/v1
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: true
+      - name: request-transformer
+        config:
+          add:
+            headers:
+              - Content-Profile:graphql_public
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+
+  ## Secure Realtime routes
+  - name: realtime-v1-ws
+    _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*'
+    url: http://realtime-dev.supabase-realtime:4000/socket
+    protocol: ws
+    routes:
+      - name: realtime-v1-ws
+        strip_path: true
+        paths:
+          - /realtime/v1/
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+  - name: realtime-v1-rest
+    _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*'
+    url: http://realtime-dev.supabase-realtime:4000/api
+    protocol: http
+    routes:
+      - name: realtime-v1-rest
+        strip_path: true
+        paths:
+          - /realtime/v1/api
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+  ## Storage routes: the storage server manages its own auth
+  - name: storage-v1
+    _comment: 'Storage: /storage/v1/* -> http://storage:5000/*'
+    url: http://storage:5000/
+    routes:
+      - name: storage-v1-all
+        strip_path: true
+        paths:
+          - /storage/v1/
+    plugins:
+      - name: cors
+
+  ## Edge Functions routes
+  - name: functions-v1
+    _comment: 'Edge Functions: /functions/v1/* -> http://functions:9000/*'
+    url: http://functions:9000/
+    routes:
+      - name: functions-v1-all
+        strip_path: true
+        paths:
+          - /functions/v1/
+    plugins:
+      - name: cors
+
+  ## Analytics routes
+  - name: analytics-v1
+    _comment: 'Analytics: /analytics/v1/* -> http://logflare:4000/*'
+    url: http://analytics:4000/
+    routes:
+      - name: analytics-v1-all
+        strip_path: true
+        paths:
+          - /analytics/v1/
+
+  ## Secure Database routes
+  - name: meta
+    _comment: 'pg-meta: /pg/* -> http://pg-meta:8080/*'
+    url: http://meta:8080/
+    routes:
+      - name: meta-all
+        strip_path: true
+        paths:
+          - /pg/
+    plugins:
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+
+  ## Protected Dashboard - catch all remaining routes
+  - name: dashboard
+    _comment: 'Studio: /* -> http://studio:3000/*'
+    url: http://studio:3000/
+    routes:
+      - name: dashboard-all
+        strip_path: true
+        paths:
+          - /
+    plugins:
+      - name: cors
+      - name: basic-auth
+        config:
+          hide_credentials: true 
+"""
+
+[[config.mounts]]
+filePath = "/volumes/db/init/data.sql"
+content = ""
+
+[[config.mounts]]
+filePath = "/volumes/db/jwt.sql"
+content = """
+\\set jwt_secret `echo "$JWT_SECRET"`
+\\set jwt_exp `echo "$JWT_EXP"`
+
+ALTER DATABASE postgres SET "app.settings.jwt_secret" TO :'jwt_secret';
+ALTER DATABASE postgres SET "app.settings.jwt_exp" TO :'jwt_exp';
+"""
+
+[[config.mounts]]
+filePath = "/volumes/db/logs.sql"
+content = """
+\\set pguser `echo "$POSTGRES_USER"`
+
+create schema if not exists _analytics;
+alter schema _analytics owner to :pguser;
+"""
+
+[[config.mounts]]
+filePath = "/volumes/db/realtime.sql"
+content = """
+\\set pguser `echo "$POSTGRES_USER"`
+
+create schema if not exists _realtime;
+alter schema _realtime owner to :pguser;
+"""
+
+[[config.mounts]]
+filePath = "/volumes/db/roles.sql"
+content = """
+-- NOTE: change to your own passwords for production environments
+\\set pgpass `echo "$POSTGRES_PASSWORD"`
+
+ALTER USER authenticator WITH PASSWORD :'pgpass';
+ALTER USER pgbouncer WITH PASSWORD :'pgpass';
+ALTER USER supabase_auth_admin WITH PASSWORD :'pgpass';
+ALTER USER supabase_functions_admin WITH PASSWORD :'pgpass';
+ALTER USER supabase_storage_admin WITH PASSWORD :'pgpass';
+"""
+
+[[config.mounts]]
+filePath = "/volumes/db/webhooks.sql"
+content = """
+BEGIN;
+  -- Create pg_net extension
+  CREATE EXTENSION IF NOT EXISTS pg_net SCHEMA extensions;
+  -- Create supabase_functions schema
+  CREATE SCHEMA supabase_functions AUTHORIZATION supabase_admin;
+  GRANT USAGE ON SCHEMA supabase_functions TO postgres, anon, authenticated, service_role;
+  ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON TABLES TO postgres, anon, authenticated, service_role;
+  ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON FUNCTIONS TO postgres, anon, authenticated, service_role;
+  ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON SEQUENCES TO postgres, anon, authenticated, service_role;
+  -- supabase_functions.migrations definition
+  CREATE TABLE supabase_functions.migrations (
+    version text PRIMARY KEY,
+    inserted_at timestamptz NOT NULL DEFAULT NOW()
+  );
+  -- Initial supabase_functions migration
+  INSERT INTO supabase_functions.migrations (version) VALUES ('initial');
+  -- supabase_functions.hooks definition
+  CREATE TABLE supabase_functions.hooks (
+    id bigserial PRIMARY KEY,
+    hook_table_id integer NOT NULL,
+    hook_name text NOT NULL,
+    created_at timestamptz NOT NULL DEFAULT NOW(),
+    request_id bigint
+  );
+  CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id);
+  CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name);
+  COMMENT ON TABLE supabase_functions.hooks IS 'Supabase Functions Hooks: Audit trail for triggered hooks.';
+  CREATE FUNCTION supabase_functions.http_request()
+    RETURNS trigger
+    LANGUAGE plpgsql
+    AS $function$
+    DECLARE
+      request_id bigint;
+      payload jsonb;
+      url text := TG_ARGV[0]::text;
+      method text := TG_ARGV[1]::text;
+      headers jsonb DEFAULT '{}'::jsonb;
+      params jsonb DEFAULT '{}'::jsonb;
+      timeout_ms integer DEFAULT 1000;
+    BEGIN
+      IF url IS NULL OR url = 'null' THEN
+        RAISE EXCEPTION 'url argument is missing';
+      END IF;
+
+      IF method IS NULL OR method = 'null' THEN
+        RAISE EXCEPTION 'method argument is missing';
+      END IF;
+
+      IF TG_ARGV[2] IS NULL OR TG_ARGV[2] = 'null' THEN
+        headers = '{"Content-Type": "application/json"}'::jsonb;
+      ELSE
+        headers = TG_ARGV[2]::jsonb;
+      END IF;
+
+      IF TG_ARGV[3] IS NULL OR TG_ARGV[3] = 'null' THEN
+        params = '{}'::jsonb;
+      ELSE
+        params = TG_ARGV[3]::jsonb;
+      END IF;
+
+      IF TG_ARGV[4] IS NULL OR TG_ARGV[4] = 'null' THEN
+        timeout_ms = 1000;
+      ELSE
+        timeout_ms = TG_ARGV[4]::integer;
+      END IF;
+
+      CASE
+        WHEN method = 'GET' THEN
+          SELECT http_get INTO request_id FROM net.http_get(
+            url,
+            params,
+            headers,
+            timeout_ms
+          );
+        WHEN method = 'POST' THEN
+          payload = jsonb_build_object(
+            'old_record', OLD,
+            'record', NEW,
+            'type', TG_OP,
+            'table', TG_TABLE_NAME,
+            'schema', TG_TABLE_SCHEMA
+          );
+
+          SELECT http_post INTO request_id FROM net.http_post(
+            url,
+            payload,
+            params,
+            headers,
+            timeout_ms
+          );
+        ELSE
+          RAISE EXCEPTION 'method argument % is invalid', method;
+      END CASE;
+
+      INSERT INTO supabase_functions.hooks
+        (hook_table_id, hook_name, request_id)
+      VALUES
+        (TG_RELID, TG_NAME, request_id);
+
+      RETURN NEW;
+    END
+  $function$;
+  -- Supabase super admin
+  DO
+  $$
+  BEGIN
+    IF NOT EXISTS (
+      SELECT 1
+      FROM pg_roles
+      WHERE rolname = 'supabase_functions_admin'
+    )
+    THEN
+      CREATE USER supabase_functions_admin NOINHERIT CREATEROLE LOGIN NOREPLICATION;
+    END IF;
+  END
+  $$;
+  GRANT ALL PRIVILEGES ON SCHEMA supabase_functions TO supabase_functions_admin;
+  GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA supabase_functions TO supabase_functions_admin;
+  GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA supabase_functions TO supabase_functions_admin;
+  ALTER USER supabase_functions_admin SET search_path = "supabase_functions";
+  ALTER table "supabase_functions".migrations OWNER TO supabase_functions_admin;
+  ALTER table "supabase_functions".hooks OWNER TO supabase_functions_admin;
+  ALTER function "supabase_functions".http_request() OWNER TO supabase_functions_admin;
+  GRANT supabase_functions_admin TO postgres;
+  -- Remove unused supabase_pg_net_admin role
+  DO
+  $$
+  BEGIN
+    IF EXISTS (
+      SELECT 1
+      FROM pg_roles
+      WHERE rolname = 'supabase_pg_net_admin'
+    )
+    THEN
+      REASSIGN OWNED BY supabase_pg_net_admin TO supabase_admin;
+      DROP OWNED BY supabase_pg_net_admin;
+      DROP ROLE supabase_pg_net_admin;
+    END IF;
+  END
+  $$;
+  -- pg_net grants when extension is already enabled
+  DO
+  $$
+  BEGIN
+    IF EXISTS (
+      SELECT 1
+      FROM pg_extension
+      WHERE extname = 'pg_net'
+    )
+    THEN
+      GRANT USAGE ON SCHEMA net TO supabase_functions_admin, postgres, anon, authenticated, service_role;
+      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
+      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
+      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
+      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
+      REVOKE ALL ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
+      REVOKE ALL ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
+      GRANT EXECUTE ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
+      GRANT EXECUTE ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
+    END IF;
+  END
+  $$;
+  -- Event trigger for pg_net
+  CREATE OR REPLACE FUNCTION extensions.grant_pg_net_access()
+  RETURNS event_trigger
+  LANGUAGE plpgsql
+  AS $$
+  BEGIN
+    IF EXISTS (
+      SELECT 1
+      FROM pg_event_trigger_ddl_commands() AS ev
+      JOIN pg_extension AS ext
+      ON ev.objid = ext.oid
+      WHERE ext.extname = 'pg_net'
+    )
+    THEN
+      GRANT USAGE ON SCHEMA net TO supabase_functions_admin, postgres, anon, authenticated, service_role;
+      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
+      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
+      ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
+      ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
+      REVOKE ALL ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
+      REVOKE ALL ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
+      GRANT EXECUTE ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
+      GRANT EXECUTE ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
+    END IF;
+  END;
+  $$;
+  COMMENT ON FUNCTION extensions.grant_pg_net_access IS 'Grants access to pg_net';
+  DO
+  $$
+  BEGIN
+    IF NOT EXISTS (
+      SELECT 1
+      FROM pg_event_trigger
+      WHERE evtname = 'issue_pg_net_access'
+    ) THEN
+      CREATE EVENT TRIGGER issue_pg_net_access ON ddl_command_end WHEN TAG IN ('CREATE EXTENSION')
+      EXECUTE PROCEDURE extensions.grant_pg_net_access();
+    END IF;
+  END
+  $$;
+  INSERT INTO supabase_functions.migrations (version) VALUES ('20210809183423_update_grants');
+  ALTER function supabase_functions.http_request() SECURITY DEFINER;
+  ALTER function supabase_functions.http_request() SET search_path = supabase_functions;
+  REVOKE ALL ON FUNCTION supabase_functions.http_request() FROM PUBLIC;
+  GRANT EXECUTE ON FUNCTION supabase_functions.http_request() TO postgres, anon, authenticated, service_role;
+COMMIT;
+"""
+
+[[config.mounts]]
+filePath = "/volumes/functions/hello/index.ts"
+content = """
+// Follow this setup guide to integrate the Deno language server with your editor:
+// https://deno.land/manual/getting_started/setup_your_environment
+// This enables autocomplete, go to definition, etc.
+
+import { serve } from "https://deno.land/std@0.177.1/http/server.ts"
+
+serve(async () => {
+  return new Response(
+    `"Hello from Edge Functions!"`,
+    { headers: { "Content-Type": "application/json" } }
+  )
+})
+
+// To invoke:
+// curl 'http://localhost:<KONG_HTTP_PORT>/functions/v1/hello' \\
+//   --header 'Authorization: Bearer <anon/service_role API key>'
+"""
+
+[[config.mounts]]
+filePath = "/volumes/functions/main/index.ts"
+content = """
+import { serve } from 'https://deno.land/std@0.131.0/http/server.ts'
+import * as jose from 'https://deno.land/x/jose@v4.14.4/index.ts'
+
+console.log('main function started')
+
+const JWT_SECRET = Deno.env.get('JWT_SECRET')
+const VERIFY_JWT = Deno.env.get('VERIFY_JWT') === 'true'
+
+function getAuthToken(req: Request) {
+  const authHeader = req.headers.get('authorization')
+  if (!authHeader) {
+    throw new Error('Missing authorization header')
+  }
+  const [bearer, token] = authHeader.split(' ')
+  if (bearer !== 'Bearer') {
+    throw new Error(`Auth header is not 'Bearer {token}'`)
+  }
+  return token
+}
+
+async function verifyJWT(jwt: string): Promise<boolean> {
+  const encoder = new TextEncoder()
+  const secretKey = encoder.encode(JWT_SECRET)
+  try {
+    await jose.jwtVerify(jwt, secretKey)
+  } catch (err) {
+    console.error(err)
+    return false
+  }
+  return true
+}
+
+serve(async (req: Request) => {
+  if (req.method !== 'OPTIONS' && VERIFY_JWT) {
+    try {
+      const token = getAuthToken(req)
+      const isValidJWT = await verifyJWT(token)
+
+      if (!isValidJWT) {
+        return new Response(JSON.stringify({ msg: 'Invalid JWT' }), {
+          status: 401,
+          headers: { 'Content-Type': 'application/json' },
+        })
+      }
+    } catch (e) {
+      console.error(e)
+      return new Response(JSON.stringify({ msg: e.toString() }), {
+        status: 401,
+        headers: { 'Content-Type': 'application/json' },
+      })
+    }
+  }
+
+  const url = new URL(req.url)
+  const { pathname } = url
+  const path_parts = pathname.split('/')
+  const service_name = path_parts[1]
+
+  if (!service_name || service_name === '') {
+    const error = { msg: 'missing function name in request' }
+    return new Response(JSON.stringify(error), {
+      status: 400,
+      headers: { 'Content-Type': 'application/json' },
+    })
+  }
+
+  const servicePath = `/home/deno/functions/${service_name}`
+  console.error(`serving the request with ${servicePath}`)
+
+  const memoryLimitMb = 150
+  const workerTimeoutMs = 1 * 60 * 1000
+  const noModuleCache = false
+  const importMapPath = null
+  const envVarsObj = Deno.env.toObject()
+  const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]])
+
+  try {
+    const worker = await EdgeRuntime.userWorkers.create({
+      servicePath,
+      memoryLimitMb,
+      workerTimeoutMs,
+      noModuleCache,
+      importMapPath,
+      envVars,
+    })
+    return await worker.fetch(req)
+  } catch (e) {
+    const error = { msg: e.toString() }
+    return new Response(JSON.stringify(error), {
+      status: 500,
+      headers: { 'Content-Type': 'application/json' },
+    })
+  }
+})
+"""
+
+[[config.mounts]]
+filePath = "/volumes/logs/vector.yml"
+content = """
+
+api:
+  enabled: true
+  address: 0.0.0.0:9001
+
+sources:
+  docker_host:
+    type: docker_logs
+    exclude_containers:
+      - supabase-vector
+
+transforms:
+  project_logs:
+    type: remap
+    inputs:
+      - docker_host
+    source: |-
+      .project = "default"
+      .event_message = del(.message)
+      .appname = del(.container_name)
+      del(.container_created_at)
+      del(.container_id)
+      del(.source_type)
+      del(.stream)
+      del(.label)
+      del(.image)
+      del(.host)
+      del(.stream)
+  router:
+    type: route
+    inputs:
+      - project_logs
+    route:
+      kong: '.appname == "supabase-kong"'
+      auth: '.appname == "supabase-auth"'
+      rest: '.appname == "supabase-rest"'
+      realtime: '.appname == "supabase-realtime"'
+      storage: '.appname == "supabase-storage"'
+      functions: '.appname == "supabase-functions"'
+      db: '.appname == "supabase-db"'
+  # Ignores non nginx errors since they are related with kong booting up
+  kong_logs:
+    type: remap
+    inputs:
+      - router.kong
+    source: |-
+      req, err = parse_nginx_log(.event_message, "combined")
+      if err == null {
+          .timestamp = req.timestamp
+          .metadata.request.headers.referer = req.referer
+          .metadata.request.headers.user_agent = req.agent
+          .metadata.request.headers.cf_connecting_ip = req.client
+          .metadata.request.method = req.method
+          .metadata.request.path = req.path
+          .metadata.request.protocol = req.protocol
+          .metadata.response.status_code = req.status
+      }
+      if err != null {
+        abort
+      }
+  # Ignores non nginx errors since they are related with kong booting up
+  kong_err:
+    type: remap
+    inputs:
+      - router.kong
+    source: |-
+      .metadata.request.method = "GET"
+      .metadata.response.status_code = 200
+      parsed, err = parse_nginx_log(.event_message, "error")
+      if err == null {
+          .timestamp = parsed.timestamp
+          .severity = parsed.severity
+          .metadata.request.host = parsed.host
+          .metadata.request.headers.cf_connecting_ip = parsed.client
+          url, err = split(parsed.request, " ")
+          if err == null {
+              .metadata.request.method = url[0]
+              .metadata.request.path = url[1]
+              .metadata.request.protocol = url[2]
+          }
+      }
+      if err != null {
+        abort
+      }
+  # Gotrue logs are structured json strings which frontend parses directly. But we keep metadata for consistency.
+  auth_logs:
+    type: remap
+    inputs:
+      - router.auth
+    source: |-
+      parsed, err = parse_json(.event_message)
+      if err == null {
+          .metadata.timestamp = parsed.time
+          .metadata = merge!(.metadata, parsed)
+      }
+  # PostgREST logs are structured so we separate timestamp from message using regex
+  rest_logs:
+    type: remap
+    inputs:
+      - router.rest
+    source: |-
+      parsed, err = parse_regex(.event_message, r'^(?P<time>.*): (?P<msg>.*)$')
+      if err == null {
+          .event_message = parsed.msg
+          .timestamp = to_timestamp!(parsed.time)
+          .metadata.host = .project
+      }
+  # Realtime logs are structured so we parse the severity level using regex (ignore time because it has no date)
+  realtime_logs:
+    type: remap
+    inputs:
+      - router.realtime
+    source: |-
+      .metadata.project = del(.project)
+      .metadata.external_id = .metadata.project
+      parsed, err = parse_regex(.event_message, r'^(?P<time>\\d+:\\d+:\\d+\\.\\d+) \\[(?P<level>\\w+)\\] (?P<msg>.*)$')
+      if err == null {
+          .event_message = parsed.msg
+          .metadata.level = parsed.level
+      }
+  # Storage logs may contain json objects so we parse them for completeness
+  storage_logs:
+    type: remap
+    inputs:
+      - router.storage
+    source: |-
+      .metadata.project = del(.project)
+      .metadata.tenantId = .metadata.project
+      parsed, err = parse_json(.event_message)
+      if err == null {
+          .event_message = parsed.msg
+          .metadata.level = parsed.level
+          .metadata.timestamp = parsed.time
+          .metadata.context[0].host = parsed.hostname
+          .metadata.context[0].pid = parsed.pid
+      }
+  # Postgres logs some messages to stderr which we map to warning severity level
+  db_logs:
+    type: remap
+    inputs:
+      - router.db
+    source: |-
+      .metadata.host = "db-default"
+      .metadata.parsed.timestamp = .timestamp
+
+      parsed, err = parse_regex(.event_message, r'.*(?P<level>INFO|NOTICE|WARNING|ERROR|LOG|FATAL|PANIC?):.*', numeric_groups: true)
+
+      if err != null || parsed == null {
+        .metadata.parsed.error_severity = "info"
+      }
+      if parsed != null {
+      .metadata.parsed.error_severity = parsed.level
+      }
+      if .metadata.parsed.error_severity == "info" {
+          .metadata.parsed.error_severity = "log"
+      }
+      .metadata.parsed.error_severity = upcase!(.metadata.parsed.error_severity)
+
+sinks:
+  logflare_auth:
+    type: 'http'
+    inputs:
+      - auth_logs
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    uri: 'http://analytics:4000/api/logs?source_name=gotrue.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+  logflare_realtime:
+    type: 'http'
+    inputs:
+      - realtime_logs
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    uri: 'http://analytics:4000/api/logs?source_name=realtime.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+  logflare_rest:
+    type: 'http'
+    inputs:
+      - rest_logs
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    uri: 'http://analytics:4000/api/logs?source_name=postgREST.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+  logflare_db:
+    type: 'http'
+    inputs:
+      - db_logs
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    # We must route the sink through kong because ingesting logs before logflare is fully initialised will
+    # lead to broken queries from studio. This works by the assumption that containers are started in the
+    # following order: vector > db > logflare > kong
+    uri: 'http://kong:8000/analytics/v1/api/logs?source_name=postgres.logs&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+  logflare_functions:
+    type: 'http'
+    inputs:
+      - router.functions
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    uri: 'http://analytics:4000/api/logs?source_name=deno-relay-logs&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+  logflare_storage:
+    type: 'http'
+    inputs:
+      - storage_logs
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    uri: 'http://analytics:4000/api/logs?source_name=storage.logs.prod.2&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+  logflare_kong:
+    type: 'http'
+    inputs:
+      - kong_logs
+      - kong_err
+    encoding:
+      codec: 'json'
+    method: 'post'
+    request:
+      retry_max_duration_secs: 10
+    uri: 'http://analytics:4000/api/logs?source_name=cloudflare.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
+    
+
+ 
+"""
diff --git a/blueprints/supabase/template.yml b/blueprints/supabase/template.yml
deleted file mode 100644
index 802dec8..0000000
--- a/blueprints/supabase/template.yml
+++ /dev/null
@@ -1,896 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password:32}
-  jwt_secret: ${base64:32}
-  dashboard_password: ${password:32}
-  logflare_api_key: ${password:32}
-  anon_key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICJyb2xlIjogImFub24iLAogICJpc3MiOiAic3VwYWJhc2UiLAogICJpYXQiOiAxNzQxNTAwMDAwLAogICJleHAiOiAxODk5MjY2NDAwCn0.muKe0Nrvkf5bMyLoFqAuFypRu3jHAcTYU08SYKrgRQo
-  service_role_key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICJyb2xlIjogInNlcnZpY2Vfcm9sZSIsCiAgImlzcyI6ICJzdXBhYmFzZSIsCiAgImlhdCI6IDE3NDE1MDAwMDAsCiAgImV4cCI6IDE4OTkyNjY0MDAKfQ.1KoSiJVueKJNkF59uc84BLqk7h8VdAoVp6Gozqr_vGc
-
-config:
-  domains:
-    - serviceName: kong
-      port: 8000
-      host: ${main_domain}
-
-  env:
-    SUPABASE_HOST: ${main_domain}
-    POSTGRES_PASSWORD: ${postgres_password}
-    JWT_SECRET: ${jwt_secret}
-    ANON_KEY: ${anon_key}
-    SERVICE_ROLE_KEY: ${service_role_key}
-    DASHBOARD_USERNAME: "supabase"
-    DASHBOARD_PASSWORD: ${dashboard_password}
-    POSTGRES_HOSTNAME: "db"
-    POSTGRES_DB: "postgres"
-    POSTGRES_PORT: "5432"
-    KONG_HTTP_PORT: "8000"
-    KONG_HTTPS_PORT: "8443"
-    PGRST_DB_SCHEMAS: "public,storage,graphql_public"
-    ADDITIONAL_REDIRECT_URLS: ""
-    JWT_EXPIRY: "3600"
-    DISABLE_SIGNUP: "false"
-    MAILER_URLPATHS_CONFIRMATION: "\"/auth/v1/verify\""
-    MAILER_URLPATHS_INVITE: "\"/auth/v1/verify\""
-    MAILER_URLPATHS_RECOVERY: "\"/auth/v1/verify\""
-    MAILER_URLPATHS_EMAIL_CHANGE: "\"/auth/v1/verify\""
-    ENABLE_EMAIL_SIGNUP: "true"
-    ENABLE_EMAIL_AUTOCONFIRM: "false"
-    SMTP_ADMIN_EMAIL: "admin@example.com"
-    SMTP_HOSTNAME: "supabase-mail"
-    SMTP_PORT: "2500"
-    SMTP_USER: "fake_mail_user"
-    SMTP_PASS: "fake_mail_password"
-    SMTP_SENDER_NAME: "fake_sender"
-    ENABLE_ANONYMOUS_USERS: "false"
-    ENABLE_PHONE_SIGNUP: "true"
-    ENABLE_PHONE_AUTOCONFIRM: "true"
-    STUDIO_DEFAULT_ORGANIZATION: "Default Organization"
-    STUDIO_DEFAULT_PROJECT: "Default Project"
-    STUDIO_PORT: "3000"
-    IMGPROXY_ENABLE_WEBP_DETECTION: "true"
-    FUNCTIONS_VERIFY_JWT: "false"
-    LOGFLARE_LOGGER_BACKEND_API_KEY: ${logflare_api_key}
-    LOGFLARE_API_KEY: ${logflare_api_key}
-    DOCKER_SOCKET_LOCATION: "/var/run/docker.sock"
-    GOOGLE_PROJECT_ID: "GOOGLE_PROJECT_ID"
-    GOOGLE_PROJECT_NUMBER: "GOOGLE_PROJECT_NUMBER"
-
-  mounts:
-    - filePath: /volumes/api/kong.yml
-      content: |
-        _format_version: '2.1'
-        _transform: true
-
-        ###
-        ### Consumers / Users
-        ###
-        consumers:
-          - username: DASHBOARD
-          - username: anon
-            keyauth_credentials:
-              - key: $SUPABASE_ANON_KEY
-          - username: service_role
-            keyauth_credentials:
-              - key: $SUPABASE_SERVICE_KEY
-
-        ###
-        ### Access Control List
-        ###
-        acls:
-          - consumer: anon
-            group: anon
-          - consumer: service_role
-            group: admin
-
-        ###
-        ### Dashboard credentials
-        ###
-        basicauth_credentials:
-          - consumer: DASHBOARD
-            username: $DASHBOARD_USERNAME
-            password: $DASHBOARD_PASSWORD
-
-        ###
-        ### API Routes
-        ###
-        services:
-          ## Open Auth routes
-          - name: auth-v1-open
-            url: http://auth:9999/verify
-            routes:
-              - name: auth-v1-open
-                strip_path: true
-                paths:
-                  - /auth/v1/verify
-            plugins:
-              - name: cors
-          - name: auth-v1-open-callback
-            url: http://auth:9999/callback
-            routes:
-              - name: auth-v1-open-callback
-                strip_path: true
-                paths:
-                  - /auth/v1/callback
-            plugins:
-              - name: cors
-          - name: auth-v1-open-authorize
-            url: http://auth:9999/authorize
-            routes:
-              - name: auth-v1-open-authorize
-                strip_path: true
-                paths:
-                  - /auth/v1/authorize
-            plugins:
-              - name: cors
-
-          ## Secure Auth routes
-          - name: auth-v1
-            _comment: 'GoTrue: /auth/v1/* -> http://auth:9999/*'
-            url: http://auth:9999/
-            routes:
-              - name: auth-v1-all
-                strip_path: true
-                paths:
-                  - /auth/v1/
-            plugins:
-              - name: cors
-              - name: key-auth
-                config:
-                  hide_credentials: false
-              - name: acl
-                config:
-                  hide_groups_header: true
-                  allow:
-                    - admin
-                    - anon
-
-          ## Secure REST routes
-          - name: rest-v1
-            _comment: 'PostgREST: /rest/v1/* -> http://rest:3000/*'
-            url: http://rest:3000/
-            routes:
-              - name: rest-v1-all
-                strip_path: true
-                paths:
-                  - /rest/v1/
-            plugins:
-              - name: cors
-              - name: key-auth
-                config:
-                  hide_credentials: true
-              - name: acl
-                config:
-                  hide_groups_header: true
-                  allow:
-                    - admin
-                    - anon
-
-          ## Secure GraphQL routes
-          - name: graphql-v1
-            _comment: 'PostgREST: /graphql/v1/* -> http://rest:3000/rpc/graphql'
-            url: http://rest:3000/rpc/graphql
-            routes:
-              - name: graphql-v1-all
-                strip_path: true
-                paths:
-                  - /graphql/v1
-            plugins:
-              - name: cors
-              - name: key-auth
-                config:
-                  hide_credentials: true
-              - name: request-transformer
-                config:
-                  add:
-                    headers:
-                      - Content-Profile:graphql_public
-              - name: acl
-                config:
-                  hide_groups_header: true
-                  allow:
-                    - admin
-                    - anon
-
-          ## Secure Realtime routes
-          - name: realtime-v1-ws
-            _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*'
-            url: http://realtime-dev.supabase-realtime:4000/socket
-            protocol: ws
-            routes:
-              - name: realtime-v1-ws
-                strip_path: true
-                paths:
-                  - /realtime/v1/
-            plugins:
-              - name: cors
-              - name: key-auth
-                config:
-                  hide_credentials: false
-              - name: acl
-                config:
-                  hide_groups_header: true
-                  allow:
-                    - admin
-                    - anon
-          - name: realtime-v1-rest
-            _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*'
-            url: http://realtime-dev.supabase-realtime:4000/api
-            protocol: http
-            routes:
-              - name: realtime-v1-rest
-                strip_path: true
-                paths:
-                  - /realtime/v1/api
-            plugins:
-              - name: cors
-              - name: key-auth
-                config:
-                  hide_credentials: false
-              - name: acl
-                config:
-                  hide_groups_header: true
-                  allow:
-                    - admin
-                    - anon
-          ## Storage routes: the storage server manages its own auth
-          - name: storage-v1
-            _comment: 'Storage: /storage/v1/* -> http://storage:5000/*'
-            url: http://storage:5000/
-            routes:
-              - name: storage-v1-all
-                strip_path: true
-                paths:
-                  - /storage/v1/
-            plugins:
-              - name: cors
-
-          ## Edge Functions routes
-          - name: functions-v1
-            _comment: 'Edge Functions: /functions/v1/* -> http://functions:9000/*'
-            url: http://functions:9000/
-            routes:
-              - name: functions-v1-all
-                strip_path: true
-                paths:
-                  - /functions/v1/
-            plugins:
-              - name: cors
-
-          ## Analytics routes
-          - name: analytics-v1
-            _comment: 'Analytics: /analytics/v1/* -> http://logflare:4000/*'
-            url: http://analytics:4000/
-            routes:
-              - name: analytics-v1-all
-                strip_path: true
-                paths:
-                  - /analytics/v1/
-
-          ## Secure Database routes
-          - name: meta
-            _comment: 'pg-meta: /pg/* -> http://pg-meta:8080/*'
-            url: http://meta:8080/
-            routes:
-              - name: meta-all
-                strip_path: true
-                paths:
-                  - /pg/
-            plugins:
-              - name: key-auth
-                config:
-                  hide_credentials: false
-              - name: acl
-                config:
-                  hide_groups_header: true
-                  allow:
-                    - admin
-
-          ## Protected Dashboard - catch all remaining routes
-          - name: dashboard
-            _comment: 'Studio: /* -> http://studio:3000/*'
-            url: http://studio:3000/
-            routes:
-              - name: dashboard-all
-                strip_path: true
-                paths:
-                  - /
-            plugins:
-              - name: cors
-              - name: basic-auth
-                config:
-                  hide_credentials: true 
-    - filePath: /volumes/db/init/data.sql
-      content: |
-        
-    - filePath: /volumes/db/jwt.sql
-      content: |
-        \set jwt_secret `echo "$JWT_SECRET"`
-        \set jwt_exp `echo "$JWT_EXP"`
-
-        ALTER DATABASE postgres SET "app.settings.jwt_secret" TO :'jwt_secret';
-        ALTER DATABASE postgres SET "app.settings.jwt_exp" TO :'jwt_exp';
-    - filePath: /volumes/db/logs.sql
-      content: |
-        \set pguser `echo "$POSTGRES_USER"`
-
-        create schema if not exists _analytics;
-        alter schema _analytics owner to :pguser;
-    - filePath: /volumes/db/realtime.sql
-      content: |
-        \set pguser `echo "$POSTGRES_USER"`
-
-        create schema if not exists _realtime;
-        alter schema _realtime owner to :pguser;
-    - filePath: /volumes/db/roles.sql
-      content: |
-        -- NOTE: change to your own passwords for production environments
-        \set pgpass `echo "$POSTGRES_PASSWORD"`
-
-        ALTER USER authenticator WITH PASSWORD :'pgpass';
-        ALTER USER pgbouncer WITH PASSWORD :'pgpass';
-        ALTER USER supabase_auth_admin WITH PASSWORD :'pgpass';
-        ALTER USER supabase_functions_admin WITH PASSWORD :'pgpass';
-        ALTER USER supabase_storage_admin WITH PASSWORD :'pgpass';
-    - filePath: /volumes/db/webhooks.sql
-      content: |
-        BEGIN;
-          -- Create pg_net extension
-          CREATE EXTENSION IF NOT EXISTS pg_net SCHEMA extensions;
-          -- Create supabase_functions schema
-          CREATE SCHEMA supabase_functions AUTHORIZATION supabase_admin;
-          GRANT USAGE ON SCHEMA supabase_functions TO postgres, anon, authenticated, service_role;
-          ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON TABLES TO postgres, anon, authenticated, service_role;
-          ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON FUNCTIONS TO postgres, anon, authenticated, service_role;
-          ALTER DEFAULT PRIVILEGES IN SCHEMA supabase_functions GRANT ALL ON SEQUENCES TO postgres, anon, authenticated, service_role;
-          -- supabase_functions.migrations definition
-          CREATE TABLE supabase_functions.migrations (
-            version text PRIMARY KEY,
-            inserted_at timestamptz NOT NULL DEFAULT NOW()
-          );
-          -- Initial supabase_functions migration
-          INSERT INTO supabase_functions.migrations (version) VALUES ('initial');
-          -- supabase_functions.hooks definition
-          CREATE TABLE supabase_functions.hooks (
-            id bigserial PRIMARY KEY,
-            hook_table_id integer NOT NULL,
-            hook_name text NOT NULL,
-            created_at timestamptz NOT NULL DEFAULT NOW(),
-            request_id bigint
-          );
-          CREATE INDEX supabase_functions_hooks_request_id_idx ON supabase_functions.hooks USING btree (request_id);
-          CREATE INDEX supabase_functions_hooks_h_table_id_h_name_idx ON supabase_functions.hooks USING btree (hook_table_id, hook_name);
-          COMMENT ON TABLE supabase_functions.hooks IS 'Supabase Functions Hooks: Audit trail for triggered hooks.';
-          CREATE FUNCTION supabase_functions.http_request()
-            RETURNS trigger
-            LANGUAGE plpgsql
-            AS $function$
-            DECLARE
-              request_id bigint;
-              payload jsonb;
-              url text := TG_ARGV[0]::text;
-              method text := TG_ARGV[1]::text;
-              headers jsonb DEFAULT '{}'::jsonb;
-              params jsonb DEFAULT '{}'::jsonb;
-              timeout_ms integer DEFAULT 1000;
-            BEGIN
-              IF url IS NULL OR url = 'null' THEN
-                RAISE EXCEPTION 'url argument is missing';
-              END IF;
-
-              IF method IS NULL OR method = 'null' THEN
-                RAISE EXCEPTION 'method argument is missing';
-              END IF;
-
-              IF TG_ARGV[2] IS NULL OR TG_ARGV[2] = 'null' THEN
-                headers = '{"Content-Type": "application/json"}'::jsonb;
-              ELSE
-                headers = TG_ARGV[2]::jsonb;
-              END IF;
-
-              IF TG_ARGV[3] IS NULL OR TG_ARGV[3] = 'null' THEN
-                params = '{}'::jsonb;
-              ELSE
-                params = TG_ARGV[3]::jsonb;
-              END IF;
-
-              IF TG_ARGV[4] IS NULL OR TG_ARGV[4] = 'null' THEN
-                timeout_ms = 1000;
-              ELSE
-                timeout_ms = TG_ARGV[4]::integer;
-              END IF;
-
-              CASE
-                WHEN method = 'GET' THEN
-                  SELECT http_get INTO request_id FROM net.http_get(
-                    url,
-                    params,
-                    headers,
-                    timeout_ms
-                  );
-                WHEN method = 'POST' THEN
-                  payload = jsonb_build_object(
-                    'old_record', OLD,
-                    'record', NEW,
-                    'type', TG_OP,
-                    'table', TG_TABLE_NAME,
-                    'schema', TG_TABLE_SCHEMA
-                  );
-
-                  SELECT http_post INTO request_id FROM net.http_post(
-                    url,
-                    payload,
-                    params,
-                    headers,
-                    timeout_ms
-                  );
-                ELSE
-                  RAISE EXCEPTION 'method argument % is invalid', method;
-              END CASE;
-
-              INSERT INTO supabase_functions.hooks
-                (hook_table_id, hook_name, request_id)
-              VALUES
-                (TG_RELID, TG_NAME, request_id);
-
-              RETURN NEW;
-            END
-          $function$;
-          -- Supabase super admin
-          DO
-          $$
-          BEGIN
-            IF NOT EXISTS (
-              SELECT 1
-              FROM pg_roles
-              WHERE rolname = 'supabase_functions_admin'
-            )
-            THEN
-              CREATE USER supabase_functions_admin NOINHERIT CREATEROLE LOGIN NOREPLICATION;
-            END IF;
-          END
-          $$;
-          GRANT ALL PRIVILEGES ON SCHEMA supabase_functions TO supabase_functions_admin;
-          GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA supabase_functions TO supabase_functions_admin;
-          GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA supabase_functions TO supabase_functions_admin;
-          ALTER USER supabase_functions_admin SET search_path = "supabase_functions";
-          ALTER table "supabase_functions".migrations OWNER TO supabase_functions_admin;
-          ALTER table "supabase_functions".hooks OWNER TO supabase_functions_admin;
-          ALTER function "supabase_functions".http_request() OWNER TO supabase_functions_admin;
-          GRANT supabase_functions_admin TO postgres;
-          -- Remove unused supabase_pg_net_admin role
-          DO
-          $$
-          BEGIN
-            IF EXISTS (
-              SELECT 1
-              FROM pg_roles
-              WHERE rolname = 'supabase_pg_net_admin'
-            )
-            THEN
-              REASSIGN OWNED BY supabase_pg_net_admin TO supabase_admin;
-              DROP OWNED BY supabase_pg_net_admin;
-              DROP ROLE supabase_pg_net_admin;
-            END IF;
-          END
-          $$;
-          -- pg_net grants when extension is already enabled
-          DO
-          $$
-          BEGIN
-            IF EXISTS (
-              SELECT 1
-              FROM pg_extension
-              WHERE extname = 'pg_net'
-            )
-            THEN
-              GRANT USAGE ON SCHEMA net TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-              ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-              ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-              ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-              ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-              REVOKE ALL ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-              REVOKE ALL ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-              GRANT EXECUTE ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-              GRANT EXECUTE ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-            END IF;
-          END
-          $$;
-          -- Event trigger for pg_net
-          CREATE OR REPLACE FUNCTION extensions.grant_pg_net_access()
-          RETURNS event_trigger
-          LANGUAGE plpgsql
-          AS $$
-          BEGIN
-            IF EXISTS (
-              SELECT 1
-              FROM pg_event_trigger_ddl_commands() AS ev
-              JOIN pg_extension AS ext
-              ON ev.objid = ext.oid
-              WHERE ext.extname = 'pg_net'
-            )
-            THEN
-              GRANT USAGE ON SCHEMA net TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-              ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-              ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SECURITY DEFINER;
-              ALTER function net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-              ALTER function net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) SET search_path = net;
-              REVOKE ALL ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-              REVOKE ALL ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) FROM PUBLIC;
-              GRANT EXECUTE ON FUNCTION net.http_get(url text, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-              GRANT EXECUTE ON FUNCTION net.http_post(url text, body jsonb, params jsonb, headers jsonb, timeout_milliseconds integer) TO supabase_functions_admin, postgres, anon, authenticated, service_role;
-            END IF;
-          END;
-          $$;
-          COMMENT ON FUNCTION extensions.grant_pg_net_access IS 'Grants access to pg_net';
-          DO
-          $$
-          BEGIN
-            IF NOT EXISTS (
-              SELECT 1
-              FROM pg_event_trigger
-              WHERE evtname = 'issue_pg_net_access'
-            ) THEN
-              CREATE EVENT TRIGGER issue_pg_net_access ON ddl_command_end WHEN TAG IN ('CREATE EXTENSION')
-              EXECUTE PROCEDURE extensions.grant_pg_net_access();
-            END IF;
-          END
-          $$;
-          INSERT INTO supabase_functions.migrations (version) VALUES ('20210809183423_update_grants');
-          ALTER function supabase_functions.http_request() SECURITY DEFINER;
-          ALTER function supabase_functions.http_request() SET search_path = supabase_functions;
-          REVOKE ALL ON FUNCTION supabase_functions.http_request() FROM PUBLIC;
-          GRANT EXECUTE ON FUNCTION supabase_functions.http_request() TO postgres, anon, authenticated, service_role;
-        COMMIT;
-    - filePath: /volumes/functions/hello/index.ts
-      content: |
-        // Follow this setup guide to integrate the Deno language server with your editor:
-        // https://deno.land/manual/getting_started/setup_your_environment
-        // This enables autocomplete, go to definition, etc.
-
-        import { serve } from "https://deno.land/std@0.177.1/http/server.ts"
-
-        serve(async () => {
-          return new Response(
-            `"Hello from Edge Functions!"`,
-            { headers: { "Content-Type": "application/json" } }
-          )
-        })
-
-        // To invoke:
-        // curl 'http://localhost:<KONG_HTTP_PORT>/functions/v1/hello' \
-        //   --header 'Authorization: Bearer <anon/service_role API key>'
-    - filePath: /volumes/functions/main/index.ts
-      content: |
-        import { serve } from 'https://deno.land/std@0.131.0/http/server.ts'
-        import * as jose from 'https://deno.land/x/jose@v4.14.4/index.ts'
-
-        console.log('main function started')
-
-        const JWT_SECRET = Deno.env.get('JWT_SECRET')
-        const VERIFY_JWT = Deno.env.get('VERIFY_JWT') === 'true'
-
-        function getAuthToken(req: Request) {
-          const authHeader = req.headers.get('authorization')
-          if (!authHeader) {
-            throw new Error('Missing authorization header')
-          }
-          const [bearer, token] = authHeader.split(' ')
-          if (bearer !== 'Bearer') {
-            throw new Error(`Auth header is not 'Bearer {token}'`)
-          }
-          return token
-        }
-
-        async function verifyJWT(jwt: string): Promise<boolean> {
-          const encoder = new TextEncoder()
-          const secretKey = encoder.encode(JWT_SECRET)
-          try {
-            await jose.jwtVerify(jwt, secretKey)
-          } catch (err) {
-            console.error(err)
-            return false
-          }
-          return true
-        }
-
-        serve(async (req: Request) => {
-          if (req.method !== 'OPTIONS' && VERIFY_JWT) {
-            try {
-              const token = getAuthToken(req)
-              const isValidJWT = await verifyJWT(token)
-
-              if (!isValidJWT) {
-                return new Response(JSON.stringify({ msg: 'Invalid JWT' }), {
-                  status: 401,
-                  headers: { 'Content-Type': 'application/json' },
-                })
-              }
-            } catch (e) {
-              console.error(e)
-              return new Response(JSON.stringify({ msg: e.toString() }), {
-                status: 401,
-                headers: { 'Content-Type': 'application/json' },
-              })
-            }
-          }
-
-          const url = new URL(req.url)
-          const { pathname } = url
-          const path_parts = pathname.split('/')
-          const service_name = path_parts[1]
-
-          if (!service_name || service_name === '') {
-            const error = { msg: 'missing function name in request' }
-            return new Response(JSON.stringify(error), {
-              status: 400,
-              headers: { 'Content-Type': 'application/json' },
-            })
-          }
-
-          const servicePath = `/home/deno/functions/${service_name}`
-          console.error(`serving the request with ${servicePath}`)
-
-          const memoryLimitMb = 150
-          const workerTimeoutMs = 1 * 60 * 1000
-          const noModuleCache = false
-          const importMapPath = null
-          const envVarsObj = Deno.env.toObject()
-          const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]])
-
-          try {
-            const worker = await EdgeRuntime.userWorkers.create({
-              servicePath,
-              memoryLimitMb,
-              workerTimeoutMs,
-              noModuleCache,
-              importMapPath,
-              envVars,
-            })
-            return await worker.fetch(req)
-          } catch (e) {
-            const error = { msg: e.toString() }
-            return new Response(JSON.stringify(error), {
-              status: 500,
-              headers: { 'Content-Type': 'application/json' },
-            })
-          }
-        })
-    - filePath: /volumes/logs/vector.yml
-      content: |
-        
-        api:
-          enabled: true
-          address: 0.0.0.0:9001
-
-        sources:
-          docker_host:
-            type: docker_logs
-            exclude_containers:
-              - supabase-vector
-
-        transforms:
-          project_logs:
-            type: remap
-            inputs:
-              - docker_host
-            source: |-
-              .project = "default"
-              .event_message = del(.message)
-              .appname = del(.container_name)
-              del(.container_created_at)
-              del(.container_id)
-              del(.source_type)
-              del(.stream)
-              del(.label)
-              del(.image)
-              del(.host)
-              del(.stream)
-          router:
-            type: route
-            inputs:
-              - project_logs
-            route:
-              kong: '.appname == "supabase-kong"'
-              auth: '.appname == "supabase-auth"'
-              rest: '.appname == "supabase-rest"'
-              realtime: '.appname == "supabase-realtime"'
-              storage: '.appname == "supabase-storage"'
-              functions: '.appname == "supabase-functions"'
-              db: '.appname == "supabase-db"'
-          # Ignores non nginx errors since they are related with kong booting up
-          kong_logs:
-            type: remap
-            inputs:
-              - router.kong
-            source: |-
-              req, err = parse_nginx_log(.event_message, "combined")
-              if err == null {
-                  .timestamp = req.timestamp
-                  .metadata.request.headers.referer = req.referer
-                  .metadata.request.headers.user_agent = req.agent
-                  .metadata.request.headers.cf_connecting_ip = req.client
-                  .metadata.request.method = req.method
-                  .metadata.request.path = req.path
-                  .metadata.request.protocol = req.protocol
-                  .metadata.response.status_code = req.status
-              }
-              if err != null {
-                abort
-              }
-          # Ignores non nginx errors since they are related with kong booting up
-          kong_err:
-            type: remap
-            inputs:
-              - router.kong
-            source: |-
-              .metadata.request.method = "GET"
-              .metadata.response.status_code = 200
-              parsed, err = parse_nginx_log(.event_message, "error")
-              if err == null {
-                  .timestamp = parsed.timestamp
-                  .severity = parsed.severity
-                  .metadata.request.host = parsed.host
-                  .metadata.request.headers.cf_connecting_ip = parsed.client
-                  url, err = split(parsed.request, " ")
-                  if err == null {
-                      .metadata.request.method = url[0]
-                      .metadata.request.path = url[1]
-                      .metadata.request.protocol = url[2]
-                  }
-              }
-              if err != null {
-                abort
-              }
-          # Gotrue logs are structured json strings which frontend parses directly. But we keep metadata for consistency.
-          auth_logs:
-            type: remap
-            inputs:
-              - router.auth
-            source: |-
-              parsed, err = parse_json(.event_message)
-              if err == null {
-                  .metadata.timestamp = parsed.time
-                  .metadata = merge!(.metadata, parsed)
-              }
-          # PostgREST logs are structured so we separate timestamp from message using regex
-          rest_logs:
-            type: remap
-            inputs:
-              - router.rest
-            source: |-
-              parsed, err = parse_regex(.event_message, r'^(?P<time>.*): (?P<msg>.*)$')
-              if err == null {
-                  .event_message = parsed.msg
-                  .timestamp = to_timestamp!(parsed.time)
-                  .metadata.host = .project
-              }
-          # Realtime logs are structured so we parse the severity level using regex (ignore time because it has no date)
-          realtime_logs:
-            type: remap
-            inputs:
-              - router.realtime
-            source: |-
-              .metadata.project = del(.project)
-              .metadata.external_id = .metadata.project
-              parsed, err = parse_regex(.event_message, r'^(?P<time>\d+:\d+:\d+\.\d+) \[(?P<level>\w+)\] (?P<msg>.*)$')
-              if err == null {
-                  .event_message = parsed.msg
-                  .metadata.level = parsed.level
-              }
-          # Storage logs may contain json objects so we parse them for completeness
-          storage_logs:
-            type: remap
-            inputs:
-              - router.storage
-            source: |-
-              .metadata.project = del(.project)
-              .metadata.tenantId = .metadata.project
-              parsed, err = parse_json(.event_message)
-              if err == null {
-                  .event_message = parsed.msg
-                  .metadata.level = parsed.level
-                  .metadata.timestamp = parsed.time
-                  .metadata.context[0].host = parsed.hostname
-                  .metadata.context[0].pid = parsed.pid
-              }
-          # Postgres logs some messages to stderr which we map to warning severity level
-          db_logs:
-            type: remap
-            inputs:
-              - router.db
-            source: |-
-              .metadata.host = "db-default"
-              .metadata.parsed.timestamp = .timestamp
-
-              parsed, err = parse_regex(.event_message, r'.*(?P<level>INFO|NOTICE|WARNING|ERROR|LOG|FATAL|PANIC?):.*', numeric_groups: true)
-
-              if err != null || parsed == null {
-                .metadata.parsed.error_severity = "info"
-              }
-              if parsed != null {
-              .metadata.parsed.error_severity = parsed.level
-              }
-              if .metadata.parsed.error_severity == "info" {
-                  .metadata.parsed.error_severity = "log"
-              }
-              .metadata.parsed.error_severity = upcase!(.metadata.parsed.error_severity)
-
-        sinks:
-          logflare_auth:
-            type: 'http'
-            inputs:
-              - auth_logs
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            uri: 'http://analytics:4000/api/logs?source_name=gotrue.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-          logflare_realtime:
-            type: 'http'
-            inputs:
-              - realtime_logs
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            uri: 'http://analytics:4000/api/logs?source_name=realtime.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-          logflare_rest:
-            type: 'http'
-            inputs:
-              - rest_logs
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            uri: 'http://analytics:4000/api/logs?source_name=postgREST.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-          logflare_db:
-            type: 'http'
-            inputs:
-              - db_logs
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            # We must route the sink through kong because ingesting logs before logflare is fully initialised will
-            # lead to broken queries from studio. This works by the assumption that containers are started in the
-            # following order: vector > db > logflare > kong
-            uri: 'http://kong:8000/analytics/v1/api/logs?source_name=postgres.logs&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-          logflare_functions:
-            type: 'http'
-            inputs:
-              - router.functions
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            uri: 'http://analytics:4000/api/logs?source_name=deno-relay-logs&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-          logflare_storage:
-            type: 'http'
-            inputs:
-              - storage_logs
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            uri: 'http://analytics:4000/api/logs?source_name=storage.logs.prod.2&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-          logflare_kong:
-            type: 'http'
-            inputs:
-              - kong_logs
-              - kong_err
-            encoding:
-              codec: 'json'
-            method: 'post'
-            request:
-              retry_max_duration_secs: 10
-            uri: 'http://analytics:4000/api/logs?source_name=cloudflare.logs.prod&api_key=${LOGFLARE_API_KEY?LOGFLARE_API_KEY is required}'
-            
-        
-         
diff --git a/blueprints/superset/template.toml b/blueprints/superset/template.toml
new file mode 100644
index 0000000..ec4535f
--- /dev/null
+++ b/blueprints/superset/template.toml
@@ -0,0 +1,54 @@
+[variables]
+main_domain = "${domain}"
+secret_key = "${password:30}"
+postgres_password = "${password:30}"
+redis_password = "${password:30}"
+mapbox_api_key = ""
+
+[[config.domains]]
+serviceName = "superset"
+port = 8_088
+host = "${main_domain}"
+
+[config.env]
+SECRET_KEY = "${secret_key}"
+MAPBOX_API_KEY = "${mapbox_api_key}"
+POSTGRES_DB = "superset"
+POSTGRES_USER = "superset"
+POSTGRES_PASSWORD = "${postgres_password}"
+REDIS_PASSWORD = "${redis_password}"
+
+[[config.mounts]]
+filePath = "./superset/superset_config.py"
+content = """
+\"""
+For more configuration options, see:
+- https://superset.apache.org/docs/configuration/configuring-superset
+\"""
+
+import os
+
+SECRET_KEY = os.getenv("SECRET_KEY")
+MAPBOX_API_KEY = os.getenv("MAPBOX_API_KEY", "")
+
+CACHE_CONFIG = {
+  "CACHE_TYPE": "RedisCache",
+  "CACHE_DEFAULT_TIMEOUT": 300,
+  "CACHE_KEY_PREFIX": "superset_",
+  "CACHE_REDIS_HOST": "redis",
+  "CACHE_REDIS_PORT": 6379,
+  "CACHE_REDIS_DB": 1,
+  "CACHE_REDIS_URL": f"redis://:{os.getenv('REDIS_PASSWORD')}@{os.getenv('REDIS_HOST')}:6379/1",
+}
+
+FILTER_STATE_CACHE_CONFIG = {**CACHE_CONFIG, "CACHE_KEY_PREFIX": "superset_filter_"}
+EXPLORE_FORM_DATA_CACHE_CONFIG = {**CACHE_CONFIG, "CACHE_KEY_PREFIX": "superset_explore_form_"}
+
+SQLALCHEMY_TRACK_MODIFICATIONS = True
+SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{os.getenv('POSTGRES_USER')}:{os.getenv('POSTGRES_PASSWORD')}@{os.getenv('POSTGRES_HOST')}:5432/{os.getenv('POSTGRES_DB')}"
+
+# Uncomment if you want to load example data (using "superset load_examples") at the
+# same location as your metadata postgresql instance. Otherwise, the default sqlite
+# will be used, which will not persist in volume when restarting superset by default.
+#SQLALCHEMY_EXAMPLES_URI = SQLALCHEMY_DATABASE_URI 
+"""
diff --git a/blueprints/superset/template.yml b/blueprints/superset/template.yml
deleted file mode 100644
index d06519f..0000000
--- a/blueprints/superset/template.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_key: ${password:30}
-  postgres_password: ${password:30}
-  redis_password: ${password:30}
-  mapbox_api_key: ""
-
-config:
-  domains:
-    - serviceName: superset
-      port: 8088
-      host: ${main_domain}
-
-  env:
-    SECRET_KEY: ${secret_key}
-    MAPBOX_API_KEY: ${mapbox_api_key}
-    POSTGRES_DB: "superset"
-    POSTGRES_USER: "superset"
-    POSTGRES_PASSWORD: ${postgres_password}
-    REDIS_PASSWORD: ${redis_password}
-
-  mounts:
-    - filePath: ./superset/superset_config.py
-      content: |
-        """
-        For more configuration options, see:
-        - https://superset.apache.org/docs/configuration/configuring-superset
-        """
-
-        import os
-
-        SECRET_KEY = os.getenv("SECRET_KEY")
-        MAPBOX_API_KEY = os.getenv("MAPBOX_API_KEY", "")
-
-        CACHE_CONFIG = {
-          "CACHE_TYPE": "RedisCache",
-          "CACHE_DEFAULT_TIMEOUT": 300,
-          "CACHE_KEY_PREFIX": "superset_",
-          "CACHE_REDIS_HOST": "redis",
-          "CACHE_REDIS_PORT": 6379,
-          "CACHE_REDIS_DB": 1,
-          "CACHE_REDIS_URL": f"redis://:{os.getenv('REDIS_PASSWORD')}@{os.getenv('REDIS_HOST')}:6379/1",
-        }
-
-        FILTER_STATE_CACHE_CONFIG = {**CACHE_CONFIG, "CACHE_KEY_PREFIX": "superset_filter_"}
-        EXPLORE_FORM_DATA_CACHE_CONFIG = {**CACHE_CONFIG, "CACHE_KEY_PREFIX": "superset_explore_form_"}
-
-        SQLALCHEMY_TRACK_MODIFICATIONS = True
-        SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{os.getenv('POSTGRES_USER')}:{os.getenv('POSTGRES_PASSWORD')}@{os.getenv('POSTGRES_HOST')}:5432/{os.getenv('POSTGRES_DB')}"
-
-        # Uncomment if you want to load example data (using "superset load_examples") at the
-        # same location as your metadata postgresql instance. Otherwise, the default sqlite
-        # will be used, which will not persist in volume when restarting superset by default.
-        #SQLALCHEMY_EXAMPLES_URI = SQLALCHEMY_DATABASE_URI 
\ No newline at end of file
diff --git a/blueprints/teable/template.toml b/blueprints/teable/template.toml
new file mode 100644
index 0000000..c4cc9be
--- /dev/null
+++ b/blueprints/teable/template.toml
@@ -0,0 +1,25 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+public_db_port = "${randomPort}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "teable"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+TEABLE_HOST = "${main_domain}"
+TEABLE_DB_PORT = "${public_db_port}"
+TIMEZONE = "UTC"
+POSTGRES_HOST = "teable-db"
+POSTGRES_PORT = "5432"
+POSTGRES_DB = "teable"
+POSTGRES_USER = "teable"
+POSTGRES_PASSWORD = "${db_password}"
+PUBLIC_ORIGIN = "https://${main_domain}"
+PRISMA_DATABASE_URL = "postgresql://teable:${db_password}@teable-db:5432/teable"
+PUBLIC_DATABASE_PROXY = "${TEABLE_HOST}:${TEABLE_DB_PORT}"
diff --git a/blueprints/teable/template.yml b/blueprints/teable/template.yml
deleted file mode 100644
index 834f4cc..0000000
--- a/blueprints/teable/template.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  public_db_port: ${randomPort}
-
-config:
-  domains:
-    - serviceName: teable
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    TEABLE_HOST: ${main_domain}
-    TEABLE_DB_PORT: ${public_db_port}
-    TIMEZONE: "UTC"
-    # Postgres
-    POSTGRES_HOST: "teable-db"
-    POSTGRES_PORT: "5432"
-    POSTGRES_DB: "teable"
-    POSTGRES_USER: "teable"
-    POSTGRES_PASSWORD: ${db_password}
-    # App
-    PUBLIC_ORIGIN: https://${main_domain}
-    PRISMA_DATABASE_URL: postgresql://teable:${db_password}@teable-db:5432/teable
-    PUBLIC_DATABASE_PROXY: ${TEABLE_HOST}:${TEABLE_DB_PORT}
-    # Need to support sending emails to enable the following configurations
-    # You need to modify the configuration according to the actual situation, otherwise it will not be able to send emails correctly.
-    #BACKEND_MAIL_HOST: "smtp.teable.io"
-    #BACKEND_MAIL_PORT: "465"
-    #BACKEND_MAIL_SECURE: "true"
-    #BACKEND_MAIL_SENDER: "noreply.teable.io"
-    #BACKEND_MAIL_SENDER_NAME: "Teable"
-    #BACKEND_MAIL_AUTH_USER: "username"
-    #BACKEND_MAIL_AUTH_PASS: "password"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/tolgee/template.toml b/blueprints/tolgee/template.toml
new file mode 100644
index 0000000..0256434
--- /dev/null
+++ b/blueprints/tolgee/template.toml
@@ -0,0 +1,26 @@
+[variables]
+main_domain = "${domain}"
+jwt_secret = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "app"
+port = 8_080
+host = "${main_domain}"
+
+[config.env]
+TOLGEE_HOST = "${main_domain}"
+TOLGEE_AUTHENTICATION_ENABLED = "true"
+TOLGEE_AUTHENTICATION_INITIAL_PASSWORD = "admin"
+TOLGEE_AUTHENTICATION_INITIAL_USERNAME = "admin"
+TOLGEE_AUTHENTICATION_JWT_SECRET = "${jwt_secret}"
+TOLGEE_MACHINE_TRANSLATION_GOOGLE_API_KEY = "my_google_api_key"
+TOLGEE_SMTP_AUTH = "true"
+TOLGEE_SMTP_FROM = "Tolgee <no-reply@mydomain.com>"
+TOLGEE_SMTPHOST = "email-smtp.regional-region.amazonaws.com"
+TOLGEE_SMTP_PASSWORD = "omg/my/password"
+TOLGEE_SMTP_PORT = "465"
+TOLGEE_SMTP_SSL_ENABLED = "true"
+TOLGEE_SMTP_USERNAME = "user@company.com"
diff --git a/blueprints/tolgee/template.yml b/blueprints/tolgee/template.yml
deleted file mode 100644
index 60d5e26..0000000
--- a/blueprints/tolgee/template.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-variables:
-  main_domain: ${domain}
-  jwt_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: app
-      port: 8080
-      host: ${main_domain}
-
-  env:
-    TOLGEE_HOST: ${main_domain}
-    TOLGEE_AUTHENTICATION_ENABLED: "true"
-    TOLGEE_AUTHENTICATION_INITIAL_PASSWORD: "admin"
-    TOLGEE_AUTHENTICATION_INITIAL_USERNAME: "admin"
-    TOLGEE_AUTHENTICATION_JWT_SECRET: ${jwt_secret}
-    TOLGEE_MACHINE_TRANSLATION_GOOGLE_API_KEY: "my_google_api_key"
-    TOLGEE_SMTP_AUTH: "true"
-    TOLGEE_SMTP_FROM: "Tolgee <no-reply@mydomain.com>"
-    TOLGEE_SMTPHOST: "email-smtp.regional-region.amazonaws.com"
-    TOLGEE_SMTP_PASSWORD: "omg/my/password"
-    TOLGEE_SMTP_PORT: "465"
-    TOLGEE_SMTP_SSL_ENABLED: "true"
-    TOLGEE_SMTP_USERNAME: "user@company.com"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/triggerdotdev/template.toml b/blueprints/triggerdotdev/template.toml
new file mode 100644
index 0000000..e917a31
--- /dev/null
+++ b/blueprints/triggerdotdev/template.toml
@@ -0,0 +1,45 @@
+[variables]
+main_domain = "${domain}"
+magic_link_secret = "${base64:16}"
+session_secret = "${base64:16}"
+encryption_key = "${base64:32}"
+provider_secret = "${base64:32}"
+coordinator_secret = "${base64:32}"
+db_password = "${base64:24}"
+db_user = "triggeruser"
+db_name = "triggerdb"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "webapp"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+NODE_ENV = "production"
+RUNTIME_PLATFORM = "docker-compose"
+V3_ENABLED = "true"
+TRIGGER_DOMAIN = "${main_domain}"
+TRIGGER_PROTOCOL = "http"
+POSTGRES_USER = "${db_user}"
+POSTGRES_PASSWORD = "${db_password}"
+POSTGRES_DB = "${db_name}"
+DATABASE_URL = "postgresql://${db_user}:${db_password}@postgres:5432/${db_name}"
+MAGIC_LINK_SECRET = "${magic_link_secret}"
+SESSION_SECRET = "${session_secret}"
+ENCRYPTION_KEY = "${encryption_key}"
+PROVIDER_SECRET = "${provider_secret}"
+COORDINATOR_SECRET = "${coordinator_secret}"
+INTERNAL_OTEL_TRACE_DISABLED = "1"
+INTERNAL_OTEL_TRACE_LOGGING_ENABLED = "0"
+DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT = "300"
+DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT = "100"
+DIRECT_URL = "${DATABASE_URL}"
+REDIS_HOST = "redis"
+REDIS_PORT = "6379"
+REDIS_TLS_DISABLED = "true"
+HTTP_SERVER_PORT = "9020"
+COORDINATOR_HOST = "127.0.0.1"
+COORDINATOR_PORT = "${HTTP_SERVER_PORT}"
diff --git a/blueprints/triggerdotdev/template.yml b/blueprints/triggerdotdev/template.yml
deleted file mode 100644
index 34cc8b1..0000000
--- a/blueprints/triggerdotdev/template.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-variables:
-  main_domain: ${domain}
-  magic_link_secret: ${base64:16}
-  session_secret: ${base64:16}
-  encryption_key: ${base64:32}
-  provider_secret: ${base64:32}
-  coordinator_secret: ${base64:32}
-  db_password: ${base64:24}
-  db_user: "triggeruser"
-  db_name: "triggerdb"
-
-config:
-  domains:
-    - serviceName: webapp
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    NODE_ENV: "production"
-    RUNTIME_PLATFORM: "docker-compose"
-    V3_ENABLED: "true"
-
-    # Domain configuration
-    TRIGGER_DOMAIN: ${main_domain}
-    TRIGGER_PROTOCOL: "http"
-
-    # Database configuration with secure credentials
-    POSTGRES_USER: ${db_user}
-    POSTGRES_PASSWORD: ${db_password}
-    POSTGRES_DB: ${db_name}
-    DATABASE_URL: postgresql://${db_user}:${db_password}@postgres:5432/${db_name}
-
-    # Secrets
-    MAGIC_LINK_SECRET: ${magic_link_secret}
-    SESSION_SECRET: ${session_secret}
-    ENCRYPTION_KEY: ${encryption_key}
-    PROVIDER_SECRET: ${provider_secret}
-    COORDINATOR_SECRET: ${coordinator_secret}
-
-    # TRIGGER_TELEMETRY_DISABLED: "1"
-    INTERNAL_OTEL_TRACE_DISABLED: "1"
-    INTERNAL_OTEL_TRACE_LOGGING_ENABLED: "0"
-
-    DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: "300"
-    DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: "100"
-
-    DIRECT_URL: ${DATABASE_URL}
-    REDIS_HOST: "redis"
-    REDIS_PORT: "6379"
-    REDIS_TLS_DISABLED: "true"
-
-    # If this is set, emails that are not specified won't be able to log in
-    # WHITELISTED_EMAILS: "authorized@yahoo.com|authorized@gmail.com"
-    # Accounts with these emails will become admins when signing up and get access to the admin panel
-    # ADMIN_EMAILS: "admin@example.com|another-admin@example.com"
-
-    # If this is set, your users will be able to log in via GitHub
-    # AUTH_GITHUB_CLIENT_ID: ""
-    # AUTH_GITHUB_CLIENT_SECRET: ""
-
-    # E-mail settings
-    # Ensure the FROM_EMAIL matches what you setup with Resend.com
-    # If these are not set, emails will be printed to the console
-    # FROM_EMAIL: ""
-    # REPLY_TO_EMAIL: ""
-    # RESEND_API_KEY: ""
-
-    # Worker settings
-    HTTP_SERVER_PORT: "9020"
-    COORDINATOR_HOST: "127.0.0.1"
-    COORDINATOR_PORT: ${HTTP_SERVER_PORT}
-    # REGISTRY_HOST: ${DEPLOY_REGISTRY_HOST}
-    # REGISTRY_NAMESPACE: ${DEPLOY_REGISTRY_NAMESPACE}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/trilium/template.toml b/blueprints/trilium/template.toml
new file mode 100644
index 0000000..cae12fa
--- /dev/null
+++ b/blueprints/trilium/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "trilium"
+port = 8_080
+host = "${main_domain}"
diff --git a/blueprints/trilium/template.yml b/blueprints/trilium/template.yml
deleted file mode 100644
index 1d8406b..0000000
--- a/blueprints/trilium/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: trilium
-      port: 8080
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/twenty/template.toml b/blueprints/twenty/template.toml
new file mode 100644
index 0000000..cac39a5
--- /dev/null
+++ b/blueprints/twenty/template.toml
@@ -0,0 +1,19 @@
+[variables]
+main_domain = "${domain}"
+db_password = "${password}"
+db_user = "twenty"
+app_secret = "${base64:32}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "twenty-server"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+TWENTY_HOST = "${main_domain}"
+DB_USER = "${db_user}"
+DB_PASSWORD = "${db_password}"
+APP_SECRET = "${app_secret}"
diff --git a/blueprints/twenty/template.yml b/blueprints/twenty/template.yml
deleted file mode 100644
index 387a55c..0000000
--- a/blueprints/twenty/template.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-variables:
-  main_domain: ${domain}
-  db_password: ${password}
-  db_user: "twenty"
-  app_secret: ${base64:32}
-
-config:
-  domains:
-    - serviceName: twenty-server
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    TWENTY_HOST: ${main_domain}
-    DB_USER: ${db_user}
-    DB_PASSWORD: ${db_password}
-    APP_SECRET: ${app_secret}
-    # Optional: Configure storage path
-    # STORAGE_LOCAL_PATH: ".local-storage"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/typebot/template.toml b/blueprints/typebot/template.toml
new file mode 100644
index 0000000..9f9dfe6
--- /dev/null
+++ b/blueprints/typebot/template.toml
@@ -0,0 +1,29 @@
+[variables]
+builder_domain = "${domain}"
+viewer_domain = "${domain}"
+encryption_secret = "${base64:24}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "typebot-builder"
+port = 3_000
+host = "${builder_domain}"
+
+[[config.domains]]
+serviceName = "typebot-viewer"
+port = 3_000
+host = "${viewer_domain}"
+
+[config.env]
+ENCRYPTION_SECRET = "${encryption_secret}"
+NEXTAUTH_URL = "http://${builder_domain}"
+NEXT_PUBLIC_VIEWER_URL = "http://${viewer_domain}"
+ADMIN_EMAIL = "typebot@example.com"
+SMTP_HOST = "'Fill'"
+SMTP_PORT = "25"
+SMTP_USERNAME = "'Fill'"
+SMTP_PASSWORD = "'Fill'"
+NEXT_PUBLIC_SMTP_FROM = "typebot@example.com"
+DEFAULT_WORKSPACE_PLAN = "UNLIMITED"
diff --git a/blueprints/typebot/template.yml b/blueprints/typebot/template.yml
deleted file mode 100644
index 400ffff..0000000
--- a/blueprints/typebot/template.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-  builder_domain: ${domain}
-  viewer_domain: ${domain}
-  encryption_secret: ${base64:24}
-
-config:
-  domains:
-    - serviceName: typebot-builder
-      port: 3000
-      host: ${builder_domain}
-    - serviceName: typebot-viewer
-      port: 3000
-      host: ${viewer_domain}
-
-  env:
-    ENCRYPTION_SECRET: ${encryption_secret}
-    NEXTAUTH_URL: http://${builder_domain}
-    NEXT_PUBLIC_VIEWER_URL: http://${viewer_domain}
-    ADMIN_EMAIL: "typebot@example.com"
-    SMTP_HOST: "'Fill'"
-    SMTP_PORT: "25"
-    SMTP_USERNAME: "'Fill'"
-    SMTP_PASSWORD: "'Fill'"
-    NEXT_PUBLIC_SMTP_FROM: "typebot@example.com"
-    DEFAULT_WORKSPACE_PLAN: "UNLIMITED"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/umami/template.toml b/blueprints/umami/template.toml
new file mode 100644
index 0000000..a8f079f
--- /dev/null
+++ b/blueprints/umami/template.toml
@@ -0,0 +1,13 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "umami"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+APP_SECRET = "${base64:64}"
diff --git a/blueprints/umami/template.yml b/blueprints/umami/template.yml
deleted file mode 100644
index d0b7234..0000000
--- a/blueprints/umami/template.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: umami
-      port: 3000
-      host: ${main_domain}
-
-  env:  
-    APP_SECRET: ${base64:64}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/unifi/template.toml b/blueprints/unifi/template.toml
new file mode 100644
index 0000000..c09a107
--- /dev/null
+++ b/blueprints/unifi/template.toml
@@ -0,0 +1,22 @@
+variables = {}
+
+[config]
+domains = []
+env = {}
+
+[[config.mounts]]
+filePath = "init-mongo.sh"
+content = """
+#!/bin/bash
+mongo <<EOF
+use unifi
+db.createUser({
+user: "unifi",
+pwd: "unifi_password",
+roles: [
+    { db: "unifi", role: "dbOwner" },
+    { db: "unifi_stat", role: "dbOwner" }
+]
+})
+EOF 
+"""
diff --git a/blueprints/unifi/template.yml b/blueprints/unifi/template.yml
deleted file mode 100644
index cf3d978..0000000
--- a/blueprints/unifi/template.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-variables: {}
-
-config:
-  domains: []
-
-  env: {}
-
-  mounts:
-    - filePath: init-mongo.sh
-      content: |
-        #!/bin/bash
-        mongo <<EOF
-        use unifi
-        db.createUser({
-        user: "unifi",
-        pwd: "unifi_password",
-        roles: [
-            { db: "unifi", role: "dbOwner" },
-            { db: "unifi_stat", role: "dbOwner" }
-        ]
-        })
-        EOF 
\ No newline at end of file
diff --git a/blueprints/unsend/template.toml b/blueprints/unsend/template.toml
new file mode 100644
index 0000000..40d7cc4
--- /dev/null
+++ b/blueprints/unsend/template.toml
@@ -0,0 +1,28 @@
+[variables]
+main_domain = "${domain}"
+secret_base = "${base64:64}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "unsend"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+REDIS_URL = "redis://unsend-redis-prod:6379"
+POSTGRES_USER = "postgres"
+POSTGRES_PASSWORD = "postgres"
+POSTGRES_DB = "unsend"
+DATABASE_URL = "postgresql://postgres:postgres@unsend-db-prod:5432/unsend"
+NEXTAUTH_URL = "http://localhost:3000"
+NEXTAUTH_SECRET = "${secret_base}"
+GITHUB_ID = "'Fill'"
+GITHUB_SECRET = "'Fill'"
+AWS_DEFAULT_REGION = "us-east-1"
+AWS_SECRET_KEY = "'Fill'"
+AWS_ACCESS_KEY = "'Fill'"
+DOCKER_OUTPUT = "1"
+API_RATE_LIMIT = "1"
+DISCORD_WEBHOOK_URL = ""
diff --git a/blueprints/unsend/template.yml b/blueprints/unsend/template.yml
deleted file mode 100644
index a996d19..0000000
--- a/blueprints/unsend/template.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_base: ${base64:64}
-
-config:
-  domains:
-    - serviceName: unsend
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    REDIS_URL: "redis://unsend-redis-prod:6379"
-    POSTGRES_USER: "postgres"
-    POSTGRES_PASSWORD: "postgres"
-    POSTGRES_DB: "unsend"
-    DATABASE_URL: "postgresql://postgres:postgres@unsend-db-prod:5432/unsend"
-    NEXTAUTH_URL: "http://localhost:3000"
-    NEXTAUTH_SECRET: ${secret_base}
-    GITHUB_ID: "'Fill'"
-    GITHUB_SECRET: "'Fill'"
-    AWS_DEFAULT_REGION: "us-east-1"
-    AWS_SECRET_KEY: "'Fill'"
-    AWS_ACCESS_KEY: "'Fill'"
-    DOCKER_OUTPUT: "1"
-    API_RATE_LIMIT: "1"
-    DISCORD_WEBHOOK_URL: ""
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/uptime-kuma/template.toml b/blueprints/uptime-kuma/template.toml
new file mode 100644
index 0000000..d3e6e19
--- /dev/null
+++ b/blueprints/uptime-kuma/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "uptime-kuma"
+port = 3_001
+host = "${main_domain}"
diff --git a/blueprints/uptime-kuma/template.yml b/blueprints/uptime-kuma/template.yml
deleted file mode 100644
index f6aa5e3..0000000
--- a/blueprints/uptime-kuma/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: uptime-kuma
-      port: 3001
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/vaultwarden/template.toml b/blueprints/vaultwarden/template.toml
new file mode 100644
index 0000000..dc47fbd
--- /dev/null
+++ b/blueprints/vaultwarden/template.toml
@@ -0,0 +1,14 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "vaultwarden"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+SIGNUPS_ALLOWED = "true"
+DOMAIN = "https://${main_domain}"
diff --git a/blueprints/vaultwarden/template.yml b/blueprints/vaultwarden/template.yml
deleted file mode 100644
index 596b1cf..0000000
--- a/blueprints/vaultwarden/template.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: vaultwarden
-      port: 80
-      host: ${main_domain}
-
-  env:
-    # Deactivate this with 'false' after you have created your account so that no strangers can register
-    SIGNUPS_ALLOWED: "true"
-    # required when using a reverse proxy; your domain; vaultwarden needs to know it's https to work properly with attachments
-    DOMAIN: https://${main_domain}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/wikijs/template.toml b/blueprints/wikijs/template.toml
new file mode 100644
index 0000000..b91d5a9
--- /dev/null
+++ b/blueprints/wikijs/template.toml
@@ -0,0 +1,21 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "wiki"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+POSTGRES_USER = "wikijs"
+POSTGRES_PASSWORD = "wikijsrocks"
+POSTGRES_DB = "wiki"
+DB_TYPE = "postgres"
+DB_HOST = "db"
+DB_PORT = "5432"
+DB_USER = "wikijs"
+DB_PASS = "wikijsrocks"
+DB_NAME = "wiki"
diff --git a/blueprints/wikijs/template.yml b/blueprints/wikijs/template.yml
deleted file mode 100644
index ef855ab..0000000
--- a/blueprints/wikijs/template.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: wiki
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    # Database Setup
-    POSTGRES_USER: "wikijs"
-    POSTGRES_PASSWORD: "wikijsrocks"
-    POSTGRES_DB: "wiki"
-    # WikiJS Database Connection
-    DB_TYPE: "postgres"
-    DB_HOST: "db"
-    DB_PORT: "5432"
-    DB_USER: "wikijs"
-    DB_PASS: "wikijsrocks"
-    DB_NAME: "wiki"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/windmill/template.toml b/blueprints/windmill/template.toml
new file mode 100644
index 0000000..d65f265
--- /dev/null
+++ b/blueprints/windmill/template.toml
@@ -0,0 +1,23 @@
+[variables]
+main_domain = "${domain}"
+postgres_password = "${password}"
+
+[[config.domains]]
+serviceName = "windmill-caddy"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+WINDMILL_HOST = "${main_domain}"
+POSTGRES_PASSWORD = "${postgres_password}"
+DATABASE_URL = "postgres://postgres:${postgres_password}@windmill-postgres/windmill?sslmode=disable"
+
+[[config.mounts]]
+filePath = "Caddyfile"
+content = """
+:80 {
+    bind 0.0.0.0
+    reverse_proxy /ws/* http://windmill-lsp:3001
+    reverse_proxy /* http://windmill-server:8000
+} 
+"""
diff --git a/blueprints/windmill/template.yml b/blueprints/windmill/template.yml
deleted file mode 100644
index 682b122..0000000
--- a/blueprints/windmill/template.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-variables:
-  main_domain: ${domain}
-  postgres_password: ${password}
-
-config:
-  domains:
-    - serviceName: windmill-caddy
-      port: 80
-      host: ${main_domain}
-
-  env:
-    WINDMILL_HOST: ${main_domain}
-    POSTGRES_PASSWORD: ${postgres_password}
-    DATABASE_URL: postgres://postgres:${postgres_password}@windmill-postgres/windmill?sslmode=disable
-
-  mounts:
-    - filePath: Caddyfile
-      content: |
-        :80 {
-            bind 0.0.0.0
-            reverse_proxy /ws/* http://windmill-lsp:3001
-            reverse_proxy /* http://windmill-server:8000
-        } 
\ No newline at end of file
diff --git a/blueprints/windows/template.toml b/blueprints/windows/template.toml
new file mode 100644
index 0000000..dfeaaf3
--- /dev/null
+++ b/blueprints/windows/template.toml
@@ -0,0 +1,19 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "windows"
+port = 8_006
+host = "${main_domain}"
+
+[config.env]
+VERSION = "win11"
+DISK_SIZE = "64G"
+RAM_SIZE = "4G"
+CPU_CORES = "2"
+USERNAME = "Dokploy"
+PASSWORD = ""
+LANGUAGE = "English"
diff --git a/blueprints/windows/template.yml b/blueprints/windows/template.yml
deleted file mode 100644
index dc138d9..0000000
--- a/blueprints/windows/template.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: windows
-      port: 8006
-      host: ${main_domain}
-
-  env:
-    # https://github.com/dockur/windows?tab=readme-ov-file#how-do-i-select-the-windows-version
-    VERSION: "win11"
-    
-    # Uncomment this if your PC/VM or etc does not support virtualization technology
-    # KVM: "N"
-    
-    DISK_SIZE: "64G"
-    RAM_SIZE: "4G"
-    CPU_CORES: "2"
-    
-    USERNAME: "Dokploy"
-    PASSWORD: ""
-    
-    # https://github.com/dockur/windows?tab=readme-ov-file#how-do-i-select-the-windows-language
-    LANGUAGE: "English"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/wordpress/template.toml b/blueprints/wordpress/template.toml
new file mode 100644
index 0000000..906960d
--- /dev/null
+++ b/blueprints/wordpress/template.toml
@@ -0,0 +1,11 @@
+[variables]
+main_domain = "${domain}"
+
+[config]
+env = {}
+mounts = []
+
+[[config.domains]]
+serviceName = "wordpress"
+port = 80
+host = "${main_domain}"
diff --git a/blueprints/wordpress/template.yml b/blueprints/wordpress/template.yml
deleted file mode 100644
index 067640b..0000000
--- a/blueprints/wordpress/template.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-variables:
-  main_domain: ${domain}
-
-config:
-  domains:
-    - serviceName: wordpress
-      port: 80
-      host: ${main_domain}
-
-  env: {}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/yourls/template.toml b/blueprints/yourls/template.toml
new file mode 100644
index 0000000..a2549a9
--- /dev/null
+++ b/blueprints/yourls/template.toml
@@ -0,0 +1,20 @@
+[variables]
+main_domain = "${domain}"
+mysql_password = "${password}"
+mysql_root_password = "${password}"
+admin_password = "${password}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "yourls-app"
+port = 80
+host = "${main_domain}"
+
+[config.env]
+YOURLS_HOST = "${main_domain}"
+YOURLS_ADMIN_USER = "admin"
+YOURLS_ADMIN_PASSWORD = "${admin_password}"
+MYSQL_PASSWORD = "${mysql_password}"
+MYSQL_ROOT_PASSWORD = "${mysql_root_password}"
diff --git a/blueprints/yourls/template.yml b/blueprints/yourls/template.yml
deleted file mode 100644
index aa8b483..0000000
--- a/blueprints/yourls/template.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-variables:
-  main_domain: ${domain}
-  mysql_password: ${password}
-  mysql_root_password: ${password}
-  admin_password: ${password}
-
-config:
-  domains:
-    - serviceName: yourls-app
-      port: 80
-      host: ${main_domain}
-
-  env:
-    YOURLS_HOST: ${main_domain}
-    YOURLS_ADMIN_USER: "admin"
-    YOURLS_ADMIN_PASSWORD: ${admin_password}
-    MYSQL_PASSWORD: ${mysql_password}
-    MYSQL_ROOT_PASSWORD: ${mysql_root_password}
-
-  mounts: [] 
\ No newline at end of file
diff --git a/blueprints/zipline/template.toml b/blueprints/zipline/template.toml
new file mode 100644
index 0000000..5e8f10a
--- /dev/null
+++ b/blueprints/zipline/template.toml
@@ -0,0 +1,17 @@
+[variables]
+main_domain = "${domain}"
+secret_base = "${base64:64}"
+
+[config]
+mounts = []
+
+[[config.domains]]
+serviceName = "zipline"
+port = 3_000
+host = "${main_domain}"
+
+[config.env]
+ZIPLINE_PORT = "3000"
+ZIPLINE_SECRET = "${secret_base}"
+ZIPLINE_RETURN_HTTPS = "false"
+ZIPLINE_LOGGER = "true"
diff --git a/blueprints/zipline/template.yml b/blueprints/zipline/template.yml
deleted file mode 100644
index fe6d124..0000000
--- a/blueprints/zipline/template.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-variables:
-  main_domain: ${domain}
-  secret_base: ${base64:64}
-
-config:
-  domains:
-    - serviceName: zipline
-      port: 3000
-      host: ${main_domain}
-
-  env:
-    ZIPLINE_PORT: "3000"
-    ZIPLINE_SECRET: ${secret_base}
-    ZIPLINE_RETURN_HTTPS: "false"
-    ZIPLINE_LOGGER: "true"
-
-  mounts: [] 
\ No newline at end of file
diff --git a/script.js b/script.js
new file mode 100644
index 0000000..e69de29