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 46d77b3..265d81d 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 '$ARTIFACTORY_URL,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$NAMESPACE' <"$src" >"$dest"
+        envsubst '$ARTIFACTORY_URL,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$STAGE,$ORG_NAME,$NAMESPACE' <"$src" >"$dest"
         git add "$dest"
         added=$(($added+1))
       fi
@@ -183,6 +183,10 @@ data:
     apiVersion: kustomize.config.k8s.io/v1beta1
     kind: Kustomization
     namePrefix: ${PROJECT_NAME}-
+    commonLabels:
+      app.kubernetes.io/name: ${ORG_NAME}
+      app.kubernetes.io/component: ${PROJECT_NAME}
+      component: ${PROJECT_NAME}
     resources:
     - ../../../../bases/install
     - ../../../../bases/images
@@ -224,6 +228,10 @@ data:
     kind: ImagePolicy
     metadata:
       name: ${PROJECT_NAME}-policy
+      labels:
+        app.kubernetes.io/component: ${PROJECT_NAME}
+        app.kubernetes.io/name: ${ORG_NAME}
+        component: ${PROJECT_NAME}
     spec:
       imageRepositoryRef:
         name: ${PROJECT_NAME}-repo
@@ -238,6 +246,10 @@ data:
     kind: ImagePolicy
     metadata:
       name: ${PROJECT_NAME}-policy
+      labels:
+        app.kubernetes.io/component: ${PROJECT_NAME}
+        app.kubernetes.io/name: ${ORG_NAME}
+        component: ${PROJECT_NAME}
     spec:
       imageRepositoryRef:
         name: ${PROJECT_NAME}-repo
@@ -486,6 +498,10 @@ data:
     kind: Ingress
     metadata:
       name: ${PROJECT_NAME}-web
+      labels:
+        app.kubernetes.io/component: ${PROJECT_NAME}
+        app.kubernetes.io/name: ${ORG_NAME}
+        component: ${PROJECT_NAME}
     spec:
       tls:
       - hosts: