diff --git a/readme.md b/readme.md
index 563bfb1341914b9d568aaefe833efd7da0906da3..efb094cc3e6f39628715bd4e8fe98abe42aad804 100644
--- a/readme.md
+++ b/readme.md
@@ -1,92 +1,183 @@
 # images
 ```bash
-docker pull goharbor/harbor-ui:dev && \
-docker tag goharbor/harbor-ui:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:dev 
+# harbor-ui
+docker pull goharbor/harbor-ui:v1.6.0 && \
+docker tag goharbor/harbor-ui:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0 
 
-docker pull goharbor/harbor-adminserver:dev && \
-docker tag goharbor/harbor-adminserver:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:dev 
+# harbor-adminserver
+docker pull goharbor/harbor-adminserver:v1.6.0 && \
+docker tag goharbor/harbor-adminserver:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0 
 
-docker pull goharbor/harbor-jobservice:dev && \
-docker tag goharbor/harbor-jobservice:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:dev 
+# harbor-jobservice
+docker pull goharbor/harbor-jobservice:v1.6.0 && \
+docker tag goharbor/harbor-jobservice:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0 
 
-docker pull goharbor/harbor-db:dev && \
-docker tag goharbor/harbor-db:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:dev 
+# harbor-db
+docker pull goharbor/harbor-db:v1.6.0 && \
+docker tag goharbor/harbor-db:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0 
 
-docker pull goharbor/registry-photon:dev && \
-docker tag goharbor/registry-photon:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/registry-photon:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/registry-photon:dev 
+# chartmuseum
+docker pull chartmuseum/chartmuseum:v0.7.1 && \
+docker tag chartmuseum/chartmuseum:v0.7.1  registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1 
 
-docker pull goharbor/chartmuseum-photon:dev && \
-docker tag goharbor/chartmuseum-photon:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:dev 
+# clair
+docker pull quay.io/coreos/clair:v2.0.6 && \
+docker tag quay.io/coreos/clair:v2.0.6  registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6
 
-docker pull goharbor/clair-photon:dev && \
-docker tag goharbor/clair-photon:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:dev 
+# notary:server
+docker pull notary:server-0.5.0 && \
+docker tag notary:server-0.5.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0
 
-docker pull goharbor/notary-server-photon:dev && \
-docker tag goharbor/notary-server-photon:dev  registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:dev  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:dev 
+# notary:signer
+docker pull notary:signer-0.5.0 && \
+docker tag notary:signer-0.5.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer:0.5.0  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer:0.5.0
 
+# registry
 docker pull registry:2.6.2 && \
 docker tag registry:2.6.2  registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.6.2  && \
 docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.6.2 
 
+# nginx
 docker pull nginx:1.15.2-alpine && \
 docker tag nginx:1.15.2-alpine  registry-vpc.cn-qingdao.aliyuncs.com/wod/nginx:1.15.2-alpine  && \
 docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/nginx:1.15.2-alpine 
 
+# redis
 docker pull redis:4.0.1-alpine && \
 docker tag redis:4.0.1-alpine  registry-vpc.cn-qingdao.aliyuncs.com/wod/redis:4.0.1-alpine  && \
 docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/redis:4.0.1-alpine
 ```
 
-# setup
-```powershell
-# 1.template
-cd /etc/kubernetes/helm/harbor && helm template . --name harbor --namespace devops > ./dist/harbor.yaml
-
-# 2.helm install
-helm install /etc/kubernetes/helm/harbor \
---name harbor \
---namespace devops \
---set harborAdminPassword=spaceIN511 \
---set nodeSelector.kubernetes\.io/hostname=172.31.14.41 \
---set externalDomain=harbor.wodcloud.com
+## overrides
+```bash
+cat /etc/kubernetes/helm/harbor/values-overrides.yaml
 ```
 
+```yaml
+persistence:
+  enabled: true
+externalProtocol: https
+externalDomain: harbor.wodcloud.local
+harborAdminPassword: "58772015"
+
+ingress:
+  enabled: true
+
+adminserver:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
+    tag: v1.6.0
+  volumes:
+    config:
+      storageClass: "storageos"
+      accessMode: ReadWriteOnce
+      size: 1Gi
+
+jobservice:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
+    tag: v1.6.0
+
+ui:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-ui
+    tag: v1.6.0
+
+busybox:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/busybox
+    tag: 1.29
+
+database:
+  internal:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
+      tag: v1.6.0
+    password: "spaceIN511"
+    volumes:
+      data:
+        storageClass: "storageos"
+        accessMode: ReadWriteOnce
+        size: 1Gi
+
+registry:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/registry
+    tag: 2.6.2
+  volumes:
+    data:
+      # storageClass: "-"
+      accessMode: ReadWriteOnce
+      size: 5Gi
+  nodeSelector:
+    harbor-registry: enabled
+
+chartmuseum:
+  enabled: true
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
+    tag: v0.7.1
+  volumes:
+    data:
+      storageClass: "storageos"
+      accessMode: ReadWriteOnce
+      size: 5Gi
+
+clair:
+  enabled: true
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/clair
+    tag: v2.0.6
+  volumes:
+    pgData:
+      storageClass: "storageos"
+      accessMode: ReadWriteOnce
+      size: 1Gi
+
+redis:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/redis
+    tag: 4.0.1-alpine
+  usePassword: false
+  cluster:
+    enabled: false
+  master:
+    persistence:
+      enabled: false
+
+notary:
+  enabled: true
+  server:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
+      tag: 0.5.0
+  signer:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
+      tag: 0.5.0
+```
 
-# images
+## setup
 ```bash
-docker pull goharbor/harbor-ui:v1.6.0 && \
-docker tag goharbor/harbor-ui:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0 
-
-docker pull goharbor/harbor-adminserver:v1.6.0 && \
-docker tag goharbor/harbor-adminserver:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0 
-
-docker pull goharbor/harbor-jobservice:v1.6.0 && \
-docker tag goharbor/harbor-jobservice:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0 
-
-docker pull goharbor/harbor-db:v1.6.0 && \
-docker tag goharbor/harbor-db:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0 
+# 1.install
 
-docker pull chartmuseum/chartmuseum:v0.7.1 && \
-docker tag chartmuseum/chartmuseum:v0.7.1  registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.7.1 
+# label node
+kubectl label node <nodename> harbor-registry=enabled
 
-docker pull quay.io/coreos/clair:v2.0.6 && \
-docker tag quay.io/coreos/clair:v2.0.6  registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair:v2.0.6
+helm install \
+/etc/kubernetes/helm/harbor \
+--name=harbor \
+--namespace=devops \
+-f /etc/kubernetes/helm/harbor/values-overrides.yaml
 
-docker pull notary:server-0.5.0 && \
-docker tag notary:server-0.5.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server:0.5.0
+# uninstall
+helm delete harbor --purge
 ```
\ No newline at end of file
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 68505100db0025726b27b8fbabc7565e8a30ff38..88c4e4372a0a7da07e4558de5ee4406dff233caa 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -21,7 +21,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 heritage: {{ .Release.Service }}
 release: {{ .Release.Name }}
 chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-app: "{{ template "harbor.name" . }}"
 {{- end -}}
 
 {{/* matchLabels */}}
diff --git a/templates/adminserver/adminserver-cm.yaml b/templates/adminserver/adminserver-cm.yaml
index b27488628f0297dbc276aac2aa347ef6c506cc71..08da284b7e67b2cad5d231867fc89c126774cdaf 100644
--- a/templates/adminserver/adminserver-cm.yaml
+++ b/templates/adminserver/adminserver-cm.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-adminserver"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: adminserver
+    app: harbor-adminserver
 data:
   POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}"
   POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}"
diff --git a/templates/adminserver/adminserver-secrets.yaml b/templates/adminserver/adminserver-secrets.yaml
index 0d5a3dfcd26fca8b54f7a15ddcc3196e01814ada..fac8645a4df140401a879372cf3f06e8187aea24 100644
--- a/templates/adminserver/adminserver-secrets.yaml
+++ b/templates/adminserver/adminserver-secrets.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-adminserver"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: adminserver
+    app: harbor-adminserver
 type: Opaque
 data:
   secretKey: {{ .Values.secretKey | b64enc | quote }}
diff --git a/templates/adminserver/adminserver-ss.yaml b/templates/adminserver/adminserver-ss.yaml
index 410e260e4a2e260b83b6d47fcfadb47fac43e850..571eb457c60afd3fe6731c1346d9fc067b0079be 100644
--- a/templates/adminserver/adminserver-ss.yaml
+++ b/templates/adminserver/adminserver-ss.yaml
@@ -4,19 +4,19 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-adminserver"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: adminserver
+    app: harbor-adminserver
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-adminserver"
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: adminserver
+      app: harbor-adminserver
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: adminserver
+        app: harbor-adminserver
     spec:
       containers:
       - name: adminserver
diff --git a/templates/adminserver/adminserver-svc.yaml b/templates/adminserver/adminserver-svc.yaml
index d613b71ab398e8c3b541721fa04a3d6b7eb637c8..1a571e6ce83a2289883a23eec14679afa7e1d1fd 100644
--- a/templates/adminserver/adminserver-svc.yaml
+++ b/templates/adminserver/adminserver-svc.yaml
@@ -8,4 +8,4 @@ spec:
       targetPort: 8080
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: adminserver
\ No newline at end of file
+    app: harbor-adminserver
\ No newline at end of file
diff --git a/templates/chartmuseum/chartmuseum-ss.yaml b/templates/chartmuseum/chartmuseum-ss.yaml
index a630ed87805db596c40900fc22296cb97960fd2a..6f62e089f71b4b01d2b003aac984c582909c73e3 100644
--- a/templates/chartmuseum/chartmuseum-ss.yaml
+++ b/templates/chartmuseum/chartmuseum-ss.yaml
@@ -5,19 +5,19 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-chartmuseum"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: chartmuseum
+    app: harbor-chartmuseum
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-chartmuseum"
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: chartmuseum
+      app: harbor-chartmuseum
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: chartmuseum
+        app: harbor-chartmuseum
     spec:
       containers:
       - name: chartmuseum
diff --git a/templates/chartmuseum/chartmuseum-svc.yaml b/templates/chartmuseum/chartmuseum-svc.yaml
index 664d8ce2fbe5ac1e943204d25e14426721acbc5a..8e7eb6f6e9cd00918c7797bef2d47b55ec0ad88a 100644
--- a/templates/chartmuseum/chartmuseum-svc.yaml
+++ b/templates/chartmuseum/chartmuseum-svc.yaml
@@ -11,5 +11,5 @@ spec:
       targetPort: 9999
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: chartmuseum
+    app: harbor-chartmuseum
 {{- end }}
\ No newline at end of file
diff --git a/templates/clair/clair-cm.yaml b/templates/clair/clair-cm.yaml
index 8d223f42c5e7a544ef1fc58184fa6b365051b138..f707b283ac4a7d13a504d66d3087a512ae90e052 100644
--- a/templates/clair/clair-cm.yaml
+++ b/templates/clair/clair-cm.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "harbor.fullname" . }}-clair
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: clair
+    app: harbor-clair
 data:
   config.yaml: |
     clair:
diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml
index 02a79d5e60d4d11016a5d0557cfbc01852d03282..19ebe30df105c3a8932e3e83f434a6df844fd5d2 100644
--- a/templates/clair/clair-dpl.yaml
+++ b/templates/clair/clair-dpl.yaml
@@ -5,18 +5,18 @@ metadata:
   name: {{ template "harbor.fullname" . }}-clair
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: clair
+    app: harbor-clair
 spec:
   replicas: 1
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: clair
+      app: harbor-clair
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: clair
+        app: harbor-clair
     spec:
       containers:
       - name: clair
diff --git a/templates/clair/clair-svc.yaml b/templates/clair/clair-svc.yaml
index 5b305a36741e25685ddc932d9e42185fff958e93..ee1ece639ce7cf6f576b86990d67b0c8586912ec 100644
--- a/templates/clair/clair-svc.yaml
+++ b/templates/clair/clair-svc.yaml
@@ -13,5 +13,5 @@ spec:
     - port: 6060
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: clair
+    app: harbor-clair
 {{ end }}
diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
index 398fc9bad4d69f0b43a45a741a3ab387dc03f67e..5b71ac8dd67d42da182d791cf49a7469bfaf46cb 100644
--- a/templates/database/database-ss.yaml
+++ b/templates/database/database-ss.yaml
@@ -5,19 +5,19 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-database"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: database
+    app: harbor-database
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-database"
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: database
+      app: harbor-database
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: database
+        app: harbor-database
     spec:
       initContainers:
       - name: "remove-lost-found"
diff --git a/templates/database/database-svc.yaml b/templates/database/database-svc.yaml
index 900d329ddff01dd8c6d1266be238f724e06458fd..063296ff48f31f0b824130a4fd34c56ee30ddfef 100644
--- a/templates/database/database-svc.yaml
+++ b/templates/database/database-svc.yaml
@@ -10,5 +10,5 @@ spec:
     - port: 5432
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: database
+    app: harbor-database
 {{- end -}}
\ No newline at end of file
diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml
index e7755250bc6aa800c55c996bca9dbcc083dc5fec..2aeebf86e80effad77776f0bf4b4a4ce75016827 100644
--- a/templates/jobservice/jobservice-dpl.yaml
+++ b/templates/jobservice/jobservice-dpl.yaml
@@ -4,18 +4,18 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-jobservice"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: jobservice
+    app: harbor-jobservice
 spec:
   replicas: 1
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: jobservice
+      app: harbor-jobservice
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: jobservice
+        app: harbor-jobservice
     spec:
       containers:
       - name: jobservice
diff --git a/templates/jobservice/jobservice-svc.yaml b/templates/jobservice/jobservice-svc.yaml
index 0dd1462bc1dc3492b643eefb1099805bd50e0002..d50f36054c1d83eb8475c2e4a1a8cf7a5222b54b 100644
--- a/templates/jobservice/jobservice-svc.yaml
+++ b/templates/jobservice/jobservice-svc.yaml
@@ -10,4 +10,4 @@ spec:
       targetPort: 8080
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: jobservice
+    app: harbor-jobservice
diff --git a/templates/notary/notary-cm.yaml b/templates/notary/notary-cm.yaml
index 520de9af9553e5948c017372dadc94a1a63b5232..c2b35d0c21ad519363a4520f5e023592b1ba4736 100644
--- a/templates/notary/notary-cm.yaml
+++ b/templates/notary/notary-cm.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "harbor.fullname" . }}-notary
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: notary
+    app: harbor-notary
 data:
   {{ $ca := genCA "harbor-notary-ca" 3650 }}
   {{ $cert := genSignedCert (printf "%s-notary-signer" (include "harbor.fullname" .)) nil nil 3650 $ca }}
diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml
index db5e28696f4b017d3b7211fd46c8e1a075667a1f..b0f2b071bba74b974b2a05a0505fc4188759cd83 100644
--- a/templates/notary/notary-server.yaml
+++ b/templates/notary/notary-server.yaml
@@ -5,18 +5,18 @@ metadata:
   name: {{ template "harbor.fullname" . }}-notary-server
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: notary-server
+    app: harbor-notary-server
 spec:
   replicas: 1
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: notary-server
+      app: harbor-notary-server
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: notary-server
+        app: harbor-notary-server
     spec:
       containers:
       - name: notary-server
diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml
index 1fedd705c926ccbb4a2696ad85dab8ccaa6b3413..1f2cc578ba2d478fe503f75a1870fa1c38f682d3 100644
--- a/templates/notary/notary-signer.yaml
+++ b/templates/notary/notary-signer.yaml
@@ -5,18 +5,18 @@ metadata:
   name: {{ template "harbor.fullname" . }}-notary-signer
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: notary-signer
+    app: harbor-notary-signer
 spec:
   replicas: 1
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: notary-signer
+      app: harbor-notary-signer
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: notary-signer
+        app: harbor-notary-signer
     spec:
       containers:
       - name: notary-signer
diff --git a/templates/notary/notary-svc.yaml b/templates/notary/notary-svc.yaml
index 613ede94d6513b2e91909b39de5f38575b83a59f..37cda55414955561247591e087c287c4f4cfdb20 100644
--- a/templates/notary/notary-svc.yaml
+++ b/templates/notary/notary-svc.yaml
@@ -10,7 +10,7 @@ spec:
   - port: 4443
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: notary-server
+    app: harbor-notary-server
 
 ---
 apiVersion: v1
@@ -24,5 +24,5 @@ spec:
   - port: 7899
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: notary-signer
+    app: harbor-notary-signer
 {{ end }}
\ No newline at end of file
diff --git a/templates/redis/redis.dp.yml b/templates/redis/redis.dp.yml
index bdb294359f34cc03c71554e56582f27ad8160649..5a172fe06135bc6a47f0455e76fe6bd46d42184d 100644
--- a/templates/redis/redis.dp.yml
+++ b/templates/redis/redis.dp.yml
@@ -5,14 +5,14 @@ metadata:
   name: {{ template "harbor.fullname" . }}-redis
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: redis
+    app: harbor-redis
 spec:
   replicas: 1
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: redis
+        app: harbor-redis
     spec:
       containers:
       - name: redis
diff --git a/templates/redis/redis.svc.yml b/templates/redis/redis.svc.yml
index 7eb89a1e0c438f9ea6868a9efc72e46de9d5a433..0d308d35bd56e6dc2df044089342b4f5f3a053f2 100644
--- a/templates/redis/redis.svc.yml
+++ b/templates/redis/redis.svc.yml
@@ -5,11 +5,11 @@ metadata:
   name: {{ template "harbor.fullname" . }}-redis
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: redis  
+    app: harbor-redis  
 spec:
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: redis
+    app: harbor-redis
   ports:
   - name: redis
     port: 6379
\ No newline at end of file
diff --git a/templates/registry/registry-ss.yaml b/templates/registry/registry-ss.yaml
index 95b130f279ea8f74c1ad67e1fd1b564b4b2304bb..63717e27a8fa2db7b411eda997cb6ec82a7eb322 100644
--- a/templates/registry/registry-ss.yaml
+++ b/templates/registry/registry-ss.yaml
@@ -4,19 +4,19 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-registry"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: registry
+    app: harbor-registry
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-registry"
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: registry
+      app: harbor-registry
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: registry
+        app: harbor-registry
     spec:
       containers:
       - name: registry
diff --git a/templates/registry/registry-svc.yaml b/templates/registry/registry-svc.yaml
index 13f9560911f44abcb35410abe4d4df701f3330aa..95aef9d612dea526ecd4e2c889f595b0473b7fd7 100644
--- a/templates/registry/registry-svc.yaml
+++ b/templates/registry/registry-svc.yaml
@@ -9,4 +9,4 @@ spec:
     - port: 5000
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: registry
\ No newline at end of file
+    app: harbor-registry
\ No newline at end of file
diff --git a/templates/ui/ui-dpl.yaml b/templates/ui/ui-dpl.yaml
index cf2a9afb9cbf102d9fbd01d2307c6686d067aabd..31ad36c01d6785414987e0d9f3b23aa181da0740 100644
--- a/templates/ui/ui-dpl.yaml
+++ b/templates/ui/ui-dpl.yaml
@@ -4,14 +4,14 @@ metadata:
   name: "{{ template "harbor.fullname" . }}-ui"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: ui
+    app: harbor-ui
 spec:
   replicas: 1
   template:
     metadata:
       labels:
 {{ include "harbor.matchLabels" . | indent 8 }}
-        component: ui
+        app: harbor-ui
     spec:
       containers:
       - name: ui
diff --git a/templates/ui/ui-svc.yaml b/templates/ui/ui-svc.yaml
index e74ce16c043152ee86ddcb161c03b37f67171084..fd3ef132e3a35cf3a6c946d90098f44d1c670fca 100644
--- a/templates/ui/ui-svc.yaml
+++ b/templates/ui/ui-svc.yaml
@@ -10,4 +10,4 @@ spec:
       targetPort: 8080
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: ui
+    app: harbor-ui