diff --git a/tools/generate_doc_gitcontrol_repos.py b/tools/generate_doc_gitcontrol_repos.py
index b8e344f..08c788e 100644
--- a/tools/generate_doc_gitcontrol_repos.py
+++ b/tools/generate_doc_gitcontrol_repos.py
@@ -86,6 +86,8 @@ def process_services(args, services):
         repo_name = None
 
         for repo in service["repositories"]:
+            if repo["cloud_environments"][0] != args.cloud_environment:
+                continue
             logging.debug(f"Processing repository {repo}")
             if repo["environment"] != args.target_environment:
                 continue
@@ -175,11 +177,17 @@ def main():
         required=True,
         help="Working directory to use for repository checkout.",
     )
+    parser.add_argument(
+        "--cloud-environment",
+        required=True,
+        default="eu_de",
+        help="Cloud Environment. Default: eu_de",
+    )
 
     args = parser.parse_args()
     logging.basicConfig(level=logging.DEBUG)
 
-    process_services(args, data.all_services)
+    process_services(args, data.services_with_repos())
 
 
 if __name__ == "__main__":
diff --git a/tools/generate_docexports_data.py b/tools/generate_docexports_data.py
index 8d583fd..265996b 100644
--- a/tools/generate_docexports_data.py
+++ b/tools/generate_docexports_data.py
@@ -6,13 +6,25 @@ import sys
 from ruamel.yaml import YAML
 
 import otc_metadata.services
+import argparse
 
 
 def main():
+    parser = argparse.ArgumentParser(
+        description="Generate Metadata for doc-exports."
+    )
+    parser.add_argument(
+        "--cloud-environment",
+        required=True,
+        default="eu_de",
+        help="Cloud Environment. Default: eu_de",
+    )
+
+    args = parser.parse_args()
     data = otc_metadata.services.Services()
     data._sort_data()
 
-    docs = data.docs_html_by_category("internal")
+    docs = data.docs_html_by_category(environment="internal",cloud_environment=args.cloud_environment)
 
     # Filter out documents with "disable_import": True
     for category, services in docs['categories'].items():