diff --git a/bayer/views.py b/bayer/views.py
index 76c65b08..d99ff8d1 100644
--- a/bayer/views.py
+++ b/bayer/views.py
@@ -177,7 +177,7 @@ def create_pes_node(request, package_uuid, pathway_uuid):
 def get_application_token(prod: bool) -> str:
     scope = f"{s.PROD_PES_SCOPE if prod else s.NON_PROD_PES_SCOPE}/.default"
 
-    url = f"https://login.microsoftonline.com/{s.MS_TENANT_ID}/oauth2/v2.0/token"
+    url = f"https://login.microsoftonline.com/{s.MS_ENTRA_TENANT_ID}/oauth2/v2.0/token"
     data = {
         "grant_type": "client_credentials",
         "client_id": s.MS_ENTRA_CLIENT_ID,
diff --git a/envipath/settings.py b/envipath/settings.py
index b74edc71..f73913ef 100644
--- a/envipath/settings.py
+++ b/envipath/settings.py
@@ -445,6 +445,8 @@ if MS_ENTRA_ENABLED:
     MS_ENTRA_AUTHORITY = f"https://login.microsoftonline.com/{MS_ENTRA_TENANT_ID}"
     MS_ENTRA_REDIRECT_URI = os.environ["MS_REDIRECT_URI"]
     MS_ENTRA_SCOPES = os.environ.get("MS_SCOPES", "").split(",")
+    NON_PROD_PES_SCOPE = os.environ.get("NON_PROD_PES_SCOPE")
+    PROD_PES_SCOPE = os.environ.get("PROD_PES_SCOPE")
 
 # Site ID 10 -> beta.envipath.org
 MATOMO_SITE_ID = os.environ.get("MATOMO_SITE_ID", "10")