diff --git a/terraform/api/k8s/atom.tf b/terraform/api/k8s/atom.tf
index cc0d035..e413c50 100644
--- a/terraform/api/k8s/atom.tf
+++ b/terraform/api/k8s/atom.tf
@@ -41,8 +41,10 @@ resource "kubernetes_deployment" "atom" {
     name      = "atom"
 
     labels = {
-      service = "atom"
+      name    = "atom"
       system  = "convox"
+      service = "atom"
+      type    = "service"
     }
   }
 
@@ -51,8 +53,10 @@ resource "kubernetes_deployment" "atom" {
 
     selector {
       match_labels = {
+        name    = "atom"
         system  = "convox"
         service = "atom"
+        type    = "service"
       }
     }
 
@@ -72,8 +76,10 @@ resource "kubernetes_deployment" "atom" {
         }
 
         labels = {
+          name    = "atom"
           system  = "convox"
           service = "atom"
+          type    = "service"
         }
       }
 
diff --git a/terraform/api/k8s/main.tf b/terraform/api/k8s/main.tf
index f6d0980..413e434 100644
--- a/terraform/api/k8s/main.tf
+++ b/terraform/api/k8s/main.tf
@@ -56,8 +56,10 @@ resource "kubernetes_deployment" "api" {
     name      = "api"
 
     labels = {
+      name    = "api"
       system  = "convox"
       service = "api"
+      type    = "service"
     }
   }
 
@@ -68,8 +70,10 @@ resource "kubernetes_deployment" "api" {
 
     selector {
       match_labels = {
+        name    = "api"
         system  = "convox"
         service = "api"
+        type    = "service"
       }
     }
 
@@ -88,8 +92,10 @@ resource "kubernetes_deployment" "api" {
         })
 
         labels = merge(var.labels, {
+          name    = "api"
           system  = "convox"
           service = "api"
+          type    = "service"
         })
       }
 
diff --git a/terraform/redis/k8s/main.tf b/terraform/redis/k8s/main.tf
index 1929970..4dc8eee 100644
--- a/terraform/redis/k8s/main.tf
+++ b/terraform/redis/k8s/main.tf
@@ -33,7 +33,10 @@ resource "kubernetes_deployment" "redis" {
     name      = var.name
 
     labels = {
+      name   = var.name
+      scope  = "system"
       system = "convox"
+      type   = "resource"
     }
   }
 
@@ -43,22 +46,20 @@ resource "kubernetes_deployment" "redis" {
 
     selector {
       match_labels = {
-        name    = var.name
-        scope   = "system"
-        service = var.name
-        system  = "convox"
-        type    = "redis"
+        name   = var.name
+        scope  = "system"
+        system = "convox"
+        type   = "resource"
       }
     }
 
     template {
       metadata {
         labels = {
-          name    = var.name
-          scope   = "system"
-          service = var.name
-          system  = "convox"
-          type    = "redis"
+          name   = var.name
+          scope  = "system"
+          system = "convox"
+          type   = "resource"
         }
       }
 
diff --git a/terraform/router/k8s/main.tf b/terraform/router/k8s/main.tf
index fa8f3e8..cb3b277 100644
--- a/terraform/router/k8s/main.tf
+++ b/terraform/router/k8s/main.tf
@@ -79,8 +79,10 @@ resource "kubernetes_deployment" "router" {
     name      = "router"
 
     labels = {
-      service = "router"
+      name    = "router"
       system  = "convox"
+      service = "router"
+      type    = "service"
     }
   }
 
@@ -90,8 +92,10 @@ resource "kubernetes_deployment" "router" {
 
     selector {
       match_labels = {
+        name    = "router"
         system  = "convox"
         service = "router"
+        type    = "service"
       }
     }
 
@@ -106,9 +110,12 @@ resource "kubernetes_deployment" "router" {
     template {
       metadata {
         annotations = var.annotations
+
         labels = {
+          name    = "router"
           system  = "convox"
           service = "router"
+          type    = "service"
         }
       }