diff --git a/templates/adminserver/adminserver-ss.yaml b/templates/adminserver/adminserver-ss.yaml
index 571eb457c60afd3fe6731c1346d9fc067b0079be..878ab54bae2336e31a8f57663e9f49b1377e482f 100644
--- a/templates/adminserver/adminserver-ss.yaml
+++ b/templates/adminserver/adminserver-ss.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-adminserver
+    version: {{ .Values.adminserver.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-adminserver"
@@ -17,6 +18,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-adminserver
+        version: {{ .Values.adminserver.image.tag }}
     spec:
       containers:
       - name: adminserver
diff --git a/templates/chartmuseum/chartmuseum-ss.yaml b/templates/chartmuseum/chartmuseum-ss.yaml
index 6f62e089f71b4b01d2b003aac984c582909c73e3..544f33ba8585cec8100e220dfd45eeb63ce34fa6 100644
--- a/templates/chartmuseum/chartmuseum-ss.yaml
+++ b/templates/chartmuseum/chartmuseum-ss.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-chartmuseum
+    version: {{ .Values.chartmuseum.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-chartmuseum"
@@ -18,6 +19,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-chartmuseum
+        version: {{ .Values.chartmuseum.image.tag }}
     spec:
       containers:
       - name: chartmuseum
diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml
index 19ebe30df105c3a8932e3e83f434a6df844fd5d2..7b798569c54f63d1686617fdc70d8c5025bc13ae 100644
--- a/templates/clair/clair-dpl.yaml
+++ b/templates/clair/clair-dpl.yaml
@@ -6,17 +6,15 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-clair
+    version: {{ .Values.clair.image.tag }}
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-{{ include "harbor.matchLabels" . | indent 6 }}
-      app: harbor-clair
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-clair
+        version: {{ .Values.clair.image.tag }}
     spec:
       containers:
       - name: clair
diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
index 5b71ac8dd67d42da182d791cf49a7469bfaf46cb..15e8903c0da6bffa7b73163ad1e906f1a704bba1 100644
--- a/templates/database/database-ss.yaml
+++ b/templates/database/database-ss.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-database
+    version: {{ .Values.busybox.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-database"
@@ -18,6 +19,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-database
+        version: {{ .Values.busybox.image.tag }}
     spec:
       initContainers:
       - name: "remove-lost-found"
diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml
index b0f2b071bba74b974b2a05a0505fc4188759cd83..53bca9765f5d90a0d0406f2edad320205c4e4db5 100644
--- a/templates/notary/notary-server.yaml
+++ b/templates/notary/notary-server.yaml
@@ -6,17 +6,15 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-notary-server
+    version: {{ .Values.notary.server.image.tag }}
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-{{ include "harbor.matchLabels" . | indent 6 }}
-      app: harbor-notary-server
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-notary-server
+        version: {{ .Values.notary.server.image.tag }}
     spec:
       containers:
       - name: notary-server
diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml
index 1f2cc578ba2d478fe503f75a1870fa1c38f682d3..a4450aaacd2c9fc46d46430e9e08a42716cf52ca 100644
--- a/templates/notary/notary-signer.yaml
+++ b/templates/notary/notary-signer.yaml
@@ -6,17 +6,15 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-notary-signer
+    version: {{ .Values.notary.signer.image.tag }}
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-{{ include "harbor.matchLabels" . | indent 6 }}
-      app: harbor-notary-signer
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-notary-signer
+        version: {{ .Values.notary.signer.image.tag }}
     spec:
       containers:
       - name: notary-signer
diff --git a/templates/redis/redis.dp.yml b/templates/redis/redis.dp.yml
index 5a172fe06135bc6a47f0455e76fe6bd46d42184d..0440eafd0fade5ed7d600f9b8e21c33ff11a9d17 100644
--- a/templates/redis/redis.dp.yml
+++ b/templates/redis/redis.dp.yml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-redis
+    version: {{ .Values.redis.image.tag }}
 spec:
   replicas: 1
   template:
@@ -13,6 +14,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-redis
+        version: {{ .Values.redis.image.tag }}
     spec:
       containers:
       - name: redis
diff --git a/templates/registry/registry-ss.yaml b/templates/registry/registry-ss.yaml
index 63717e27a8fa2db7b411eda997cb6ec82a7eb322..acb38d34753680896a300f02e2496b3901f641a1 100644
--- a/templates/registry/registry-ss.yaml
+++ b/templates/registry/registry-ss.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-registry
+    version: {{ .Values.registry.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-registry"
@@ -17,6 +18,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-registry
+        version: {{ .Values.registry.image.tag }}
     spec:
       containers:
       - name: registry
diff --git a/templates/ui/ui-dpl.yaml b/templates/ui/ui-dpl.yaml
index 31ad36c01d6785414987e0d9f3b23aa181da0740..4fb0f0ab7b97a39fb0f4968aeb622e8e9ebc9998 100644
--- a/templates/ui/ui-dpl.yaml
+++ b/templates/ui/ui-dpl.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-ui
+    version: {{ .Values.ui.image.tag }}
 spec:
   replicas: 1
   template:
@@ -12,6 +13,7 @@ spec:
       labels:
 {{ include "harbor.matchLabels" . | indent 8 }}
         app: harbor-ui
+        version: {{ .Values.ui.image.tag }}
     spec:
       containers:
       - name: ui