diff --git a/CN_PREPROD/alerting/data_source.tf b/CN_PREPROD/alerting/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PREPROD/custom_service/data_source.tf b/CN_PREPROD/custom_service/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PREPROD/dashboard/data_source.tf b/CN_PREPROD/dashboard/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PREPROD/management_zone/data_source.tf b/CN_PREPROD/management_zone/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PREPROD/processgroup_naming/data_source.tf b/CN_PREPROD/processgroup_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PREPROD/service_naming/data_source.tf b/CN_PREPROD/service_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PROD/alerting/data_source.tf b/CN_PROD/alerting/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PROD/custom_service/data_source.tf b/CN_PROD/custom_service/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PROD/dashboard/data_source.tf b/CN_PROD/dashboard/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PROD/management_zone/data_source.tf b/CN_PROD/management_zone/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PROD/processgroup_naming/data_source.tf b/CN_PROD/processgroup_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/CN_PROD/service_naming/data_source.tf b/CN_PROD/service_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PREPROD/alerting/data_source.tf b/EMEA_PREPROD/alerting/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PREPROD/custom_service/data_source.tf b/EMEA_PREPROD/custom_service/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PREPROD/dashboard/data_source.tf b/EMEA_PREPROD/dashboard/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PREPROD/management_zone/data_source.tf b/EMEA_PREPROD/management_zone/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PREPROD/processgroup_naming/data_source.tf b/EMEA_PREPROD/processgroup_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PREPROD/service_naming/data_source.tf b/EMEA_PREPROD/service_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PROD/alerting/data_source.tf b/EMEA_PROD/alerting/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PROD/custom_service/data_source.tf b/EMEA_PROD/custom_service/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PROD/dashboard/data_source.tf b/EMEA_PROD/dashboard/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PROD/management_zone/data_source.tf b/EMEA_PROD/management_zone/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PROD/processgroup_naming/data_source.tf b/EMEA_PROD/processgroup_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/EMEA_PROD/service_naming/data_source.tf b/EMEA_PROD/service_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PREPROD/alerting/data_source.tf b/NA_PREPROD/alerting/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PREPROD/custom_service/data_source.tf b/NA_PREPROD/custom_service/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PREPROD/dashboard/data_source.tf b/NA_PREPROD/dashboard/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PREPROD/management_zone/data_source.tf b/NA_PREPROD/management_zone/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PREPROD/processgroup_naming/data_source.tf b/NA_PREPROD/processgroup_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PREPROD/service_naming/data_source.tf b/NA_PREPROD/service_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PROD/alerting/data_source.tf b/NA_PROD/alerting/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PROD/custom_service/data_source.tf b/NA_PROD/custom_service/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PROD/management_zone/data_source.tf b/NA_PROD/management_zone/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PROD/processgroup_naming/data_source.tf b/NA_PROD/processgroup_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/NA_PROD/service_naming/data_source.tf b/NA_PROD/service_naming/data_source.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/_templates/_template_alerting.tf b/_templates/_template_alerting.tf
index 2c08a7e7..6d23469b 100644
--- a/_templates/_template_alerting.tf
+++ b/_templates/_template_alerting.tf
@@ -1,6 +1,7 @@
+data "dynatrace_management_zone" "<APPNAME>_<APPENV>"{ name="<APPNAME>" }
 resource "dynatrace_alerting" "<APPNAME>_<APPENV>" {
   name            = "<APPNAME> <APPENV>"
-  management_zone = data.dynatrace_management_zone.<APPNAME>.id
+  management_zone = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
   rules {
     rule {
       delay_in_minutes = 0
diff --git a/_templates/_template_dashboard.tf b/_templates/_template_dashboard.tf
index 4a3246c7..c1173577 100644
--- a/_templates/_template_dashboard.tf
+++ b/_templates/_template_dashboard.tf
@@ -1,3 +1,4 @@
+data "dynatrace_management_zone" "<APPNAME>_<APPENV>"{ name="<APPNAME>" }
 resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
   dashboard_metadata {
     name   = "<APPNAME> <APPENV>"
@@ -22,7 +23,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
     filter_config {
@@ -87,7 +88,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
   }
@@ -104,7 +105,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
   }
@@ -136,7 +137,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
     filter_config {
@@ -231,7 +232,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
     filter_config {
@@ -267,7 +268,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
     filter_config {
@@ -303,7 +304,7 @@ resource "dynatrace_dashboard" "<APPNAME>_<APPENV>" {
     filter {
       management_zone {
         name = "<APPNAME>"
-        id   = data.dynatrace_management_zone.<APPNAME>.id
+        id   = data.dynatrace_management_zone.<APPNAME>_<APPENV>.id
       }
     }
     filter_config {
diff --git a/onboarding.py b/onboarding.py
index 1353cb72..85ab0135 100644
--- a/onboarding.py
+++ b/onboarding.py
@@ -33,9 +33,6 @@ def main(slo_path):
                     #print('./'+item+'/'+configoption+'/'+args.appname+'.tf')
                     with open('./'+item+'/'+configoption+'/'+args.appname+'.tf', 'w') as file:
                         file.write(data)
-                datastring = "data \"dynatrace_management_zone\" \""+args.appname+"\"{ name=\""+args.appname+"\" }\n"
-                with open('./'+item+'/'+configoption+'/data_source.tf', 'a') as file:
-                    file.write(datastring)
             for envconfigoption in envconfigoptions:
                 for env in envs.get("environments"):
                     with open('./_templates/_template_'+envconfigoption+'.tf') as file:
@@ -46,9 +43,6 @@ def main(slo_path):
                         #print('./'+item+'/'+envconfigoption+'/'+args.appname+'_'+env+'.tf')
                         with open('./'+item+'/'+envconfigoption+'/'+args.appname+'_'+env+'.tf', 'w') as file:
                             file.write(data)
-                datastring = "data \"dynatrace_management_zone\" \""+args.appname+"\"{ name=\""+args.appname+"\" }\n"
-                with open('./'+item+'/'+envconfigoption+'/data_source.tf', 'a') as file:
-                    file.write(datastring)
     else:
         print("ERROR: No appname/compassid specified")