diff --git a/Makefile b/Makefile
index af44f4e..fbf9d48 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ test: lint install
 	poetry run coverage report
 
 version:
-	sed -i "s/version: v.*/version: v$(VERSION)/" deploy/*.yaml
 	sed -i "s/kube-ops-view:.*/kube-ops-view:$(VERSION)/" deploy/*.yaml
 
 appjs:
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
index 08392b0..87e005c 100644
--- a/deploy/deployment.yaml
+++ b/deploy/deployment.yaml
@@ -3,18 +3,19 @@ kind: Deployment
 metadata:
   labels:
     application: kube-ops-view
-    version: v19.9.0
+    component: frontend
   name: kube-ops-view
 spec:
   replicas: 1
   selector:
     matchLabels:
       application: kube-ops-view
+      component: frontend
   template:
     metadata:
       labels:
         application: kube-ops-view
-        version: v19.9.0
+        component: frontend
     spec:
       serviceAccount: kube-ops-view
       containers:
diff --git a/deploy/redis-deployment.yaml b/deploy/redis-deployment.yaml
index 47bcc60..eaa36cd 100644
--- a/deploy/redis-deployment.yaml
+++ b/deploy/redis-deployment.yaml
@@ -2,19 +2,20 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    application: kube-ops-view-redis
-    version: v0.0.1
+    application: kube-ops-view
+    component: redis
   name: kube-ops-view-redis
 spec:
   replicas: 1
   selector:
     matchLabels:
-      application: kube-ops-view-redis
+      application: kube-ops-view
+      component: redis
   template:
     metadata:
       labels:
-        application: kube-ops-view-redis
-        version: v0.0.1
+        application: kube-ops-view
+        component: redis
     spec:
       containers:
       - name: redis
diff --git a/deploy/redis-service.yaml b/deploy/redis-service.yaml
index f25c7bf..f74d9ee 100644
--- a/deploy/redis-service.yaml
+++ b/deploy/redis-service.yaml
@@ -2,11 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    application: kube-ops-view-redis
+    application: kube-ops-view
+    component: redis
   name: kube-ops-view-redis
 spec:
   selector:
-    application: kube-ops-view-redis
+    application: kube-ops-view
+    component: redis
   type: ClusterIP
   ports:
   - port: 6379
diff --git a/deploy/service.yaml b/deploy/service.yaml
index 68ffed4..13d5123 100644
--- a/deploy/service.yaml
+++ b/deploy/service.yaml
@@ -3,10 +3,12 @@ kind: Service
 metadata:
   labels:
     application: kube-ops-view
+    component: frontend
   name: kube-ops-view
 spec:
   selector:
     application: kube-ops-view
+    component: frontend
   type: ClusterIP
   ports:
   - port: 80