diff --git a/src/domains/afm-app/07_gh_runner.tf b/src/domains/afm-app/07_gh_runner.tf
index 220f5b84d..e9e8dd639 100644
--- a/src/domains/afm-app/07_gh_runner.tf
+++ b/src/domains/afm-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-afm-calculator",
diff --git a/src/domains/apiconfig-app/07_gh_runner.tf b/src/domains/apiconfig-app/07_gh_runner.tf
index 0b92e58f4..a46595a7a 100644
--- a/src/domains/apiconfig-app/07_gh_runner.tf
+++ b/src/domains/apiconfig-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-api-config-cache",
diff --git a/src/domains/bizevents-app/07_gh_runner.tf b/src/domains/bizevents-app/07_gh_runner.tf
index 16ce91462..3094d51e1 100644
--- a/src/domains/bizevents-app/07_gh_runner.tf
+++ b/src/domains/bizevents-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-biz-events-service",
diff --git a/src/domains/fdr-app/07_gh_runner.tf b/src/domains/fdr-app/07_gh_runner.tf
index 27cdef9bd..5ac740030 100644
--- a/src/domains/fdr-app/07_gh_runner.tf
+++ b/src/domains/fdr-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-fdr-nodo-dei-pagamenti", # FdR-1
diff --git a/src/domains/gps-app/07_gh_runner.tf b/src/domains/gps-app/07_gh_runner.tf
index 387235fe2..13e271a37 100644
--- a/src/domains/gps-app/07_gh_runner.tf
+++ b/src/domains/gps-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-gpd-upload",
diff --git a/src/domains/nodo-app/07_gh_runner.tf b/src/domains/nodo-app/07_gh_runner.tf
index 90daf895d..a0e6a42f9 100644
--- a/src/domains/nodo-app/07_gh_runner.tf
+++ b/src/domains/nodo-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-stand-in-manager",
diff --git a/src/domains/payopt-app/07_gh_runner.tf b/src/domains/payopt-app/07_gh_runner.tf
index cf5d9cfbb..d13416e85 100644
--- a/src/domains/payopt-app/07_gh_runner.tf
+++ b/src/domains/payopt-app/07_gh_runner.tf
@@ -11,7 +11,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-payment-options-service",
diff --git a/src/domains/printit-app/07_gh_runner.tf b/src/domains/printit-app/07_gh_runner.tf
index 8b975cbd1..86eda93ce 100644
--- a/src/domains/printit-app/07_gh_runner.tf
+++ b/src/domains/printit-app/07_gh_runner.tf
@@ -11,7 +11,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-print-payment-notice-service",
diff --git a/src/domains/receipts-app/07_gh_runner.tf b/src/domains/receipts-app/07_gh_runner.tf
index 785eedf2b..c38dc6fd4 100644
--- a/src/domains/receipts-app/07_gh_runner.tf
+++ b/src/domains/receipts-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-receipt-pdf-generator",
diff --git a/src/domains/selfcare-app/07_gh_runner.tf b/src/domains/selfcare-app/07_gh_runner.tf
index 25ce22016..a7bfd31d9 100644
--- a/src/domains/selfcare-app/07_gh_runner.tf
+++ b/src/domains/selfcare-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-selfcare-ms-backoffice-backend",
diff --git a/src/domains/shared-app/07_gh_runner.tf b/src/domains/shared-app/07_gh_runner.tf
index 5c1786f61..9906032e3 100644
--- a/src/domains/shared-app/07_gh_runner.tf
+++ b/src/domains/shared-app/07_gh_runner.tf
@@ -12,7 +12,7 @@ module "gh_runner_job" {
   environment_name   = local.tools_cae_name
   environment_rg     = local.tools_cae_rg
   gh_identity_suffix = "job-01"
-  runner_labels      = ["self-hosted-job"]
+  runner_labels      = ["self-hosted-job", "${var.env}"]
   gh_repositories = [
     {
       name : "pagopa-shared-toolbox",