diff --git a/app-config.yaml b/app-config.yaml
index b9bdd94192..4eabe3ec2b 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -133,10 +133,8 @@ scaffolder:
         $secret:
           env: GITLAB_ACCESS_TOKEN
   azure:
+    baseUrl: https://dev.azure.com/{your-organization}
     api:
-      organization:
-        $secret:
-          env: AZURE_ORGANIZATION
       token:
         $secret:
           env: AZURE_PRIVATE_TOKEN
diff --git a/docs/features/software-templates/installation.md b/docs/features/software-templates/installation.md
index c374ab8d72..eff7e53ad3 100644
--- a/docs/features/software-templates/installation.md
+++ b/docs/features/software-templates/installation.md
@@ -246,17 +246,16 @@ scaffolder:
 #### Azure DevOps
 
 For Azure DevOps we support both the preparer and publisher stage with the
-configuration of a private access token (PAT) when needed. For the publisher
-it's also required to define the organization that you want to create the
-repository in.
+configuration of a private access token (PAT). For the publisher it's also
+required to define the base URL for the client to connect to the service. This
+will hopefully support on-prem installations as well but that has not been
+verified.
 
 ```yaml
 scaffolder:
   azure:
+    baseUrl: https://dev.azure.com/{your-organization}
     api:
-      organization:
-        $secret:
-          env: AZURE_ORGANIZATION
       token:
         $secret:
           env: AZURE_PRIVATE_TOKEN
diff --git a/packages/backend/src/plugins/scaffolder.ts b/packages/backend/src/plugins/scaffolder.ts
index f3dde321f3..c5b36ab8da 100644
--- a/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/backend/src/plugins/scaffolder.ts
@@ -116,15 +116,14 @@ export default async function createPlugin({
     }
   }
 
-  const azureConfig = config.getOptionalConfig('scaffolder.azure.api');
+  const azureConfig = config.getOptionalConfig('scaffolder.azure');
   if (azureConfig) {
     try {
-      const organization = azureConfig.getString('organization');
-      const azureToken = azureConfig.getString('token');
+      const baseUrl = azureConfig.getString('baseUrl');
+      const azureToken = azureConfig.getConfig('api').getString('token');
 
-      const serverUrl = `https://dev.azure.com/${organization}`;
       const authHandler = getPersonalAccessTokenHandler(azureToken);
-      const webApi = new WebApi(serverUrl, authHandler);
+      const webApi = new WebApi(baseUrl, authHandler);
       const azureClient = await webApi.getGitApi();
 
       const azurePublisher = new AzurePublisher(azureClient, azureToken);