diff --git a/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl b/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl
index 586f3e83..8d665627 100644
--- a/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl
+++ b/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl
@@ -8,7 +8,7 @@
        <array>
            <string>/usr/local/bin/bash</string>
            <string>-c</string>
-           <string>cp -f "{{ .data.user.home }}/Library/Managed Preferences/com.cloudflare.warp.plist" "/Library/Managed Preferences/com.cloudflare.warp.plist" && plutil -convert binary1 "/Library/Managed Preferences/com.cloudflare.warp.plist"</string>
+           <string>cp -f "{{ .host.home }}/Library/Managed Preferences/com.cloudflare.warp.plist" "/Library/Managed Preferences/com.cloudflare.warp.plist" && plutil -convert binary1 "/Library/Managed Preferences/com.cloudflare.warp.plist"</string>
        </array>
        <key>StartCalendarInterval</key>
        <dict>
diff --git a/home/dot_local/etc/cloudflared/config.yaml.tmpl b/home/dot_local/etc/cloudflared/config.yaml.tmpl
index 1f7bd831..05d625ea 100644
--- a/home/dot_local/etc/cloudflared/config.yaml.tmpl
+++ b/home/dot_local/etc/cloudflared/config.yaml.tmpl
@@ -1,9 +1,9 @@
-{{- $baseDomain := (join (join (.host.hostname ".") .host.domain)) -}}
+{{- $baseDomain := (join (join .host.hostname ".") .host.domain) -}}
 {{- if .host.qubes -}}
-{{-   $baseDomain := (join (join (.host.hostname "-qube.") .host.domain)) -}}
+{{-   $baseDomain := (join (join .host.hostname "-qube.") .host.domain) -}}
 {{- end -}}
 ---
-tunnel: {{ if .host.qubes }}qube{{ else }}host{{ end }}-{{ .host.hostname }}
+tunnel: {{ if eq .host.qubes true }}qube{{ else }}host{{ end }}-{{ .host.hostname }}
 credentials-file: /usr/local/etc/cloudflared/credentials.json
 
 warp-routing: