diff --git a/terraform/environments/deployment_push_gateway.tf b/terraform/environments/deployment_push_gateway.tf
index 65bb402c4244fb1dbc34e88cc5377e20c09a0e0f..2311c79fd873b8891114e6b3e47bb8a7e9acb362 100644
--- a/terraform/environments/deployment_push_gateway.tf
+++ b/terraform/environments/deployment_push_gateway.tf
@@ -99,6 +99,7 @@ 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"
@@ -112,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 9c2d14ab6789cacb93e3529ce56573e7e5667979..ed734b737fdb6a2fffc7b4ee00dff186fc9c1075 100644
--- a/terraform/environments/deployment_server.tf
+++ b/terraform/environments/deployment_server.tf
@@ -140,6 +140,7 @@ 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"
@@ -153,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 {