diff --git a/pkg/cc/config/schema/config.yaml b/pkg/cc/config/schema/config.yaml
index fb4d5bd5..38585443 100644
--- a/pkg/cc/config/schema/config.yaml
+++ b/pkg/cc/config/schema/config.yaml
@@ -140,9 +140,9 @@ api:
         - https://*.aserto.com
         - https://*aserto-console.netlify.app
         certs:
-          tls_key_path: ${TOPAZ_CERTS_DIR}/gateway.key
-          tls_cert_path: ${TOPAZ_CERTS_DIR}/gateway.crt
-          tls_ca_cert_path: ${TOPAZ_CERTS_DIR}/gateway-ca.crt
+          tls_key_path: '${TOPAZ_CERTS_DIR}/gateway.key'
+          tls_cert_path: '${TOPAZ_CERTS_DIR}/gateway.crt'
+          tls_ca_cert_path: '${TOPAZ_CERTS_DIR}/gateway-ca.crt'
         http: false
         read_timeout: 2s
         read_header_timeout: 2s
@@ -190,9 +190,9 @@ api:
         - https://*.aserto.com
         - https://*aserto-console.netlify.app
         certs:
-          tls_key_path: ${TOPAZ_CERTS_DIR}/gateway.key
-          tls_cert_path: ${TOPAZ_CERTS_DIR}/gateway.crt
-          tls_ca_cert_path: ${TOPAZ_CERTS_DIR}/gateway-ca.crt
+          tls_key_path: '${TOPAZ_CERTS_DIR}/gateway.key'
+          tls_cert_path: '${TOPAZ_CERTS_DIR}/gateway.crt'
+          tls_ca_cert_path: '${TOPAZ_CERTS_DIR}/gateway-ca.crt'
         http: false
         read_timeout: 2s
         read_header_timeout: 2s
diff --git a/pkg/cli/cmd/template.go b/pkg/cli/cmd/template.go
index 91555da3..8fb30864 100644
--- a/pkg/cli/cmd/template.go
+++ b/pkg/cli/cmd/template.go
@@ -151,7 +151,7 @@ func (cmd *InstallTemplateCmd) installTemplate(c *cc.CommonCtx, tmpl *template)
 		c.UI.Exclamation().Msg("This configuration file still uses TOPAZ_DIR environment variable. Please change to using the new TOPAZ_DB_DIR and TOPAZ_CERTS_DIR environment variables.")
 	}
 	addr, _ := cfg.HealthService()
-	if !cc.ServiceHealthStatus(addr, "") {
+	if !cc.ServiceHealthStatus(addr, "model") {
 		return fmt.Errorf("gRPC endpoint not SERVING")
 	}
 	if model, ok := cfg.Configuration.APIConfig.Services["model"]; !ok {