diff --git a/CN/user_groups/DT_APP_CoCo_CallServices_CN_View.user_group.tf b/CN/user_groups/DT_APP_CoCo_CallServices_CN_View.user_group.tf
index 070b781..250f026 100644
--- a/CN/user_groups/DT_APP_CoCo_CallServices_CN_View.user_group.tf
+++ b/CN/user_groups/DT_APP_CoCo_CallServices_CN_View.user_group.tf
@@ -4,8 +4,6 @@ resource "dynatrace_user_group" "DT_APP_CoCo_CallServices_CN_View" {
 
   permissions {
     grant {
-      environments = ["b921f1b9-c00e-4031-b9d1-f5a0d530757b", "ab88c03b-b7fc-45f0-9115-9e9ecc0ced35"]
-      permission = "VIEWER"
     }
   }
 }
\ No newline at end of file
diff --git a/EMEA_NA/user_groups/DT_APP_CoCo_CallServices_EMEANA_View.iam_group.tf b/EMEA_NA/user_groups/DT_APP_CoCo_CallServices_EMEA-NA_View.iam_group.tf
similarity index 91%
rename from EMEA_NA/user_groups/DT_APP_CoCo_CallServices_EMEANA_View.iam_group.tf
rename to EMEA_NA/user_groups/DT_APP_CoCo_CallServices_EMEA-NA_View.iam_group.tf
index 7162278..2eaa8c3 100644
--- a/EMEA_NA/user_groups/DT_APP_CoCo_CallServices_EMEANA_View.iam_group.tf
+++ b/EMEA_NA/user_groups/DT_APP_CoCo_CallServices_EMEA-NA_View.iam_group.tf
@@ -1,4 +1,4 @@
-resource "dynatrace_iam_group" "DT_APP_CoCo_CallServices_EMEANA_View" {
+resource "dynatrace_iam_group" "DT_APP_CoCo_CallServices_EMEA-NA_View" {
   name          = "DT_APP_CoCo_CallServices_EMEANA_View"
   description   = "Connected Call Services - EMEA NA View (preprod und prod)"
   federated_attribute_values = [ "Connected Call Services - EMEA NA View" ]
diff --git a/EMEA_NA/user_groups/DT_ENV_CoCo_EMEA-NA_View.iam_group.tf b/EMEA_NA/user_groups/DT_ENV_CoCo_EMEA-NA_View.iam_group.tf
new file mode 100644
index 0000000..49fd9c1
--- /dev/null
+++ b/EMEA_NA/user_groups/DT_ENV_CoCo_EMEA-NA_View.iam_group.tf
@@ -0,0 +1,28 @@
+resource "dynatrace_iam_group" "DT_ENV_CoCo_EMEA-NA_View" {
+  name          = "DT_ENV_CoCo_EMEA-NA_View"
+  description   = "Cross-Product View - EMEA NA (preprod und prod)"
+  federated_attribute_values = [ "Cross-Product View - EMEA NA" ]
+
+  permissions {
+    permission {
+      name  = "tenant-viewer"
+      type  = "tenant"
+      scope = "qqk70169"
+    }
+    permission {
+      name  = "tenant-viewer"
+      type  = "tenant"
+      scope = "xxu26128"
+    }
+    permission {
+      name  = "tenant-viewer"
+      type  = "tenant"
+      scope = "onb44935"
+    }
+    permission {
+      name  = "tenant-viewer"
+      type  = "tenant"
+      scope = "wgv50241"
+    }
+  }
+}
\ No newline at end of file
diff --git a/_dynatrace-base-modules/dynatrace-user-group/dynatrace-user-group.tf b/_dynatrace-base-modules/dynatrace-user-group/dynatrace-user-group.tf
index 5506250..44b924a 100644
--- a/_dynatrace-base-modules/dynatrace-user-group/dynatrace-user-group.tf
+++ b/_dynatrace-base-modules/dynatrace-user-group/dynatrace-user-group.tf
@@ -10,7 +10,5 @@ required_providers {
 resource dynatrace_user_group main {
     permission {
       name  = "${var.groupName}"
-      type  = "management-zone"
-      scope = "${var.environment-id}" + ":" + "${var. managementzone-id}"
     }
 }
\ No newline at end of file