diff --git a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
index 2855805..46d77b3 100644
--- a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
+++ b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
@@ -16,7 +16,7 @@ data:
     template() {
       local src=${TEMPLATE_ROOT}/$1 dest=$2
       if [ ! -f $dest ];then
-        envsubst <"$src" >"$dest"
+        envsubst '$ARTIFACTORY_URL,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$NAMESPACE' <"$src" >"$dest"
         git add "$dest"
         added=$(($added+1))
       fi
@@ -229,7 +229,7 @@ data:
         name: ${PROJECT_NAME}-repo
       filterTags:
         pattern: '^v(?P<semver>.*)$'
-        extract: '\$semver'
+        extract: '$semver'
       policy:
         semver:
           range: '>=0.1.0'
@@ -243,7 +243,7 @@ data:
         name: ${PROJECT_NAME}-repo
       filterTags:
         pattern: '^main-(?P<semver>.*)$'
-        extract: '\$semver'
+        extract: '$semver'
       policy:
         semver:
           range: '>=0.1.0'
@@ -457,7 +457,6 @@ data:
     apiVersion: kustomize.config.k8s.io/v1beta1
     kind: Kustomization
     resources:
-    - policy.yaml
     - repo.yaml
     - update.yaml
   stage-kusto.yaml.tmpl: |-
@@ -490,10 +489,10 @@ data:
     spec:
       tls:
       - hosts:
-        - to-replace
+        - ${PROJECT_NAME}.${STAGE}.${ORG_NAME}.${DOMAIN_NAME}
         secretName: cert
       rules:
-      - host: to-replace
+      - host: ${PROJECT_NAME}.${STAGE}.${ORG_NAME}.${DOMAIN_NAME}
         http:
           paths:
           - backend:
@@ -540,7 +539,6 @@ data:
 
     resources:
     - cert.yaml
-    - ingress.yaml
     - deploy.yaml
     - service.yaml
     - config.yaml
@@ -568,25 +566,25 @@ data:
             Automated image update: {{ .AutomationObject }}
 
             Files:
-            {{ range \$filename, \$_ := .Updated.Files -}}
-            - {{ \$filename }}
+            {{ range $filename, $_ := .Updated.Files -}}
+            - {{ $filename }}
             {{ end -}}
 
             Objects:
-            {{ range \$resource, \$_ := .Updated.Objects -}}
-            - {{ \$resource.Kind }} {{ \$resource.Name }}
+            {{ range $resource, $_ := .Updated.Objects -}}
+            - {{ $resource.Kind }} {{ $resource.Name }}
             {{ end -}}
 
             Images:
             {{ range .Updated.Images -}}
             - {{.}}
             {{ end -}}
-            {{- \$ChangeId := .AutomationObject -}}
-            {{- \$ChangeId = printf "%s-%s" $ChangeId ( .Updated.Files | toString ) -}}
-            {{- \$ChangeId = printf "%s-%s" $ChangeId ( .Updated.Objects | toString ) -}}
-            {{- \$ChangeId = printf "%s-%s" $ChangeId ( .Updated.Images | toString ) }}
-            Change-Name: {{ \$ChangeId }}
-            Change-Id: {{ printf "I%s" ( sha256sum \$ChangeId | trunc 40 ) }}
+            {{- $ChangeId := .AutomationObject -}}
+            {{- $ChangeId = printf "%s-%s" $ChangeId ( .Updated.Files | toString ) -}}
+            {{- $ChangeId = printf "%s-%s" $ChangeId ( .Updated.Objects | toString ) -}}
+            {{- $ChangeId = printf "%s-%s" $ChangeId ( .Updated.Images | toString ) }}
+            Change-Name: {{ $ChangeId }}
+            Change-Id: {{ printf "I%s" ( sha256sum $ChangeId | trunc 40 ) }}
         push:
           branch: main
       update: