diff --git a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2
index 836fb0ad..455c547b 100644
--- a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2
@@ -168,8 +168,8 @@ spec:
         gethomepage.dev/group: Observability
         gethomepage.dev/widget.type: grafana
         gethomepage.dev/widget.url: http://grafana.observability
-        gethomepage.dev/widget.username: "{% raw %}{{`{{ HOMEPAGE_VAR_GRAFANA_USERNAME }}`}}{% endraw %}"
-        gethomepage.dev/widget.password: "{% raw %}{{`{{ HOMEPAGE_VAR_GRAFANA_PASSWORD }}`}}{% endraw %}"
+        gethomepage.dev/widget.username: "{% raw %}{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}{% endraw %}"
+        gethomepage.dev/widget.password: "{% raw %}{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}{% endraw %}"
       {% endif %}
       hosts:
         - &host "grafana.${SECRET_DOMAIN}"
diff --git a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2
index 2adf7c3d..b51f58c4 100644
--- a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2
+++ b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2
@@ -38,9 +38,9 @@ data:
             description: Cloudflared Tunnel
             widget:
               type: cloudflared
-              accountid: "{% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID }}{% endraw %}"
-              tunnelid: "{% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_TUNNELID }}{% endraw %}"
-              key: "{% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN }}{% endraw %}"
+              accountid: "{% raw %}{{HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID}}{% endraw %}"
+              tunnelid: "{% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_TUNNELID}}{% endraw %}"
+              key: "{% raw %}{{HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN}}{% endraw %}"
   settings.yaml: |
     title: Dashboard
     theme: dark