diff --git a/home/.chezmoitemplates/apm/mcp-server.yml.tmpl b/home/.chezmoitemplates/apm/mcp-server.yml.tmpl
index 860e641..5b9df41 100644
--- a/home/.chezmoitemplates/apm/mcp-server.yml.tmpl
+++ b/home/.chezmoitemplates/apm/mcp-server.yml.tmpl
@@ -1,8 +1,8 @@
-- name: {{ index . "name" }}
+- name: "{{ index . "name" }}"
   registry: {{ index . "registry" }}
   transport: {{ index . "transport" }}
 {{- if hasKey . "url" }}
-  url: {{ index . "url" }}
+  url: "{{ index . "url" }}"
 {{- end }}
 {{- if hasKey . "headers" }}
   headers:
@@ -11,7 +11,7 @@
 {{- end }}
 {{- end }}
 {{- if hasKey . "command" }}
-  command: {{ index . "command" }}
+  command: "{{ index . "command" }}"
 {{- end }}
 {{- if hasKey . "args" }}
   args:
diff --git a/home/dot_apm/apm.yml.tmpl b/home/dot_apm/apm.yml.tmpl
index d178edc..1b31ece 100644
--- a/home/dot_apm/apm.yml.tmpl
+++ b/home/dot_apm/apm.yml.tmpl
@@ -20,11 +20,11 @@ dependencies:
 {{- with .skills }}
       skills:
 {{- range . }}
-        - {{ . }}
+        - "{{ . }}"
 {{- end }}
 {{- end }}
 {{- else }}
-    - {{ . }}
+    - "{{ . }}"
 {{- end }}
 {{ end }}
 {{ end -}}
diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl
index 4967678..6e9a93f 100644
--- a/home/dot_config/git/config.tmpl
+++ b/home/dot_config/git/config.tmpl
@@ -1,6 +1,6 @@
 [user]
-	name = {{ .git.name }}
-	email = {{ .git.email }}
+	name = "{{ .git.name }}"
+	email = "{{ .git.email }}"
 [core]
     editor = code --wait
     pager = delta
diff --git a/home/dot_config/mise/config.toml.tmpl b/home/dot_config/mise/config.toml.tmpl
index 88b2267..838a67f 100644
--- a/home/dot_config/mise/config.toml.tmpl
+++ b/home/dot_config/mise/config.toml.tmpl
@@ -9,4 +9,4 @@
 
 [settings]
 idiomatic_version_file_enable_tools = ["node", "python", "pnpm"]
-trusted_config_paths = ["/"]
+trusted_config_paths = ["~"]
diff --git a/tests/template/apm-config.bats b/tests/template/apm-config.bats
index 6318249..439579e 100644
--- a/tests/template/apm-config.bats
+++ b/tests/template/apm-config.bats
@@ -19,9 +19,9 @@ render_apm_template() {
   run render_apm_template "$PERSONAL_DATA"
 
   assert_success
-  assert_line '    - name: grep'
+  assert_line '    - name: "grep"'
   assert_line '      registry: false'
-  assert_line '      url: https://mcp.grep.app'
+  assert_line '      url: "https://mcp.grep.app"'
   refute_line --regexp 'name: figma'
   refute_line --regexp 'name: jira'
 }
@@ -41,15 +41,15 @@ render_apm_template() {
   run render_apm_template "$PERSONAL_DATA"
 
   assert_success
-  assert_line --partial '    - obra/superpowers'
-  assert_line --partial '    - JuliusBrussee/caveman'
-  assert_line --partial '    - anthropics/claude-plugins-official/plugins/skill-creator'
-  assert_line --partial '    - schpet/linear-cli'
-  assert_line --partial '    - tavily-ai/skills'
+  assert_line --partial '    - "obra/superpowers'
+  assert_line --partial '    - "JuliusBrussee/caveman'
+  assert_line --partial '    - "anthropics/claude-plugins-official/plugins/skill-creator'
+  assert_line --partial '    - "schpet/linear-cli'
+  assert_line --partial '    - "tavily-ai/skills'
   assert_line --partial '    - git: JuliusBrussee/skills'
   assert_line '      skills:'
-  assert_line '        - grill-me'
-  assert_line '        - junior-to-senior'
+  assert_line '        - "grill-me"'
+  assert_line '        - "junior-to-senior"'
   refute_line --partial 'interface-kit'
   refute_line --partial 'loop-factory'
   refute_line --partial 'context-canary'
@@ -59,11 +59,11 @@ render_apm_template() {
   run render_apm_template "$WORK_DATA"
 
   assert_success
-  assert_line '    - name: grep'
-  assert_line '    - name: figma'
-  assert_line '      url: https://mcp.figma.com/mcp'
-  assert_line '    - name: jira'
-  assert_line '      url: https://mcp.atlassian.com/v1/mcp'
+  assert_line '    - name: "grep"'
+  assert_line '    - name: "figma"'
+  assert_line '      url: "https://mcp.figma.com/mcp"'
+  assert_line '    - name: "jira"'
+  assert_line '      url: "https://mcp.atlassian.com/v1/mcp"'
 }
 
 @test "work APM config renders work target" {
@@ -81,9 +81,9 @@ render_apm_template() {
   run render_apm_template "$WORK_DATA"
 
   assert_success
-  assert_line --partial '    - obra/superpowers'
-  assert_line --partial '    - JuliusBrussee/caveman'
-  assert_line --partial '    - anthropics/claude-plugins-official/plugins/skill-creator'
+  assert_line --partial '    - "obra/superpowers'
+  assert_line --partial '    - "JuliusBrussee/caveman'
+  assert_line --partial '    - "anthropics/claude-plugins-official/plugins/skill-creator'
   refute_line --partial '    - schpet/linear-cli'
   refute_line --partial '    - tavily-ai/skills'
   refute_line --partial 'JuliusBrussee/skills'