diff --git a/terraform/environments/deployment_push_gateway.tf b/terraform/environments/deployment_push_gateway.tf
index 2f4a08e6db158cff4deaaa8577802c53dc4ec287..2311c79fd873b8891114e6b3e47bb8a7e9acb362 100644
--- a/terraform/environments/deployment_push_gateway.tf
+++ b/terraform/environments/deployment_push_gateway.tf
@@ -99,6 +99,11 @@ resource "google_cloud_run_service" "chat_push_gateway" {
         # possible values: all-traffic/private-ranges-only(default) https://cloud.google.com/sdk/gcloud/reference/run/services/update#--vpc-egress
         "run.googleapis.com/vpc-access-egress" = "private-ranges-only"
       }
+      # labels set on the revision level
+      labels = {
+        "environment_type" = local.environment_type
+        "holi_service"     = "chat-push-gateway"
+      }
     }
   }
 
@@ -108,6 +113,11 @@ resource "google_cloud_run_service" "chat_push_gateway" {
       # possible values: all/internal/internal-and-cloud-load-balancing https://cloud.google.com/sdk/gcloud/reference/run/services/update#--ingress
       "run.googleapis.com/ingress" = "internal"
     }
+    # labels set on the service level
+    labels = {
+      "environment_type" = local.environment_type
+      "holi_service"     = "chat-push-gateway"
+    }
   }
 
   traffic {
diff --git a/terraform/environments/deployment_server.tf b/terraform/environments/deployment_server.tf
index 6f02b7db79ed6b9446eaf54fd4cedd17c497c750..ed734b737fdb6a2fffc7b4ee00dff186fc9c1075 100644
--- a/terraform/environments/deployment_server.tf
+++ b/terraform/environments/deployment_server.tf
@@ -140,6 +140,11 @@ resource "google_cloud_run_service" "chat_server" {
         # this needs to be set to all-traffic in order to route a cloud run url correctly, since it does resolve to a non-private ip address.
         "run.googleapis.com/vpc-access-egress" = "all-traffic"
       }
+      # labels set on the revision level
+      labels = {
+        "environment_type" = local.environment_type
+        "holi_service"     = "chat-server"
+      }
     }
   }
 
@@ -149,6 +154,11 @@ resource "google_cloud_run_service" "chat_server" {
       # possible values: all/internal/internal-and-cloud-load-balancing https://cloud.google.com/sdk/gcloud/reference/run/services/update#--ingress
       "run.googleapis.com/ingress" = "all"
     }
+    # labels set on the service level
+    labels = {
+      "environment_type" = local.environment_type
+      "holi_service"     = "chat-server"
+    }
   }
 
   traffic {
diff --git a/terraform/environments/vars.tf b/terraform/environments/vars.tf
index ad64af7e8b91af4982d79ba986fdd46060054a00..871385f18d41f97eb4142663e47cfce9f968367c 100644
--- a/terraform/environments/vars.tf
+++ b/terraform/environments/vars.tf
@@ -2,6 +2,7 @@ locals {
   # predefined environment names are staging, production, and <branchname>
   environment      = terraform.workspace
   environment_name = trim(substr(local.environment, 0, 22), ".-") # limits the length of the name that it fits constraints google imposes for some resources, e.g. project ids
+  environment_type = contains(["staging", "production"], local.environment) ? local.environment : "review"
 
   # the dns name can be at most 64 chars in total
   # e.g. development-chat.holi.social and chat.holi.social