diff --git a/src/wizard/integration-account/agreements/agreementCreateStep.ts b/src/wizard/integration-account/agreements/agreementCreateStep.ts
index 4f5d18cd..28b7d539 100644
--- a/src/wizard/integration-account/agreements/agreementCreateStep.ts
+++ b/src/wizard/integration-account/agreements/agreementCreateStep.ts
@@ -12,7 +12,7 @@ import { IAgreementWizardContext } from "./createAgreementWizard";
 
 export class AgreementCreateStep extends AzureWizardExecuteStep<IAgreementWizardContext> {
     public async execute(wizardContext: IAgreementWizardContext): Promise<IAgreementWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         const newAgreement: IntegrationAccountAgreement = await client.integrationAccountAgreements.createOrUpdate(wizardContext.resourceGroup!.name!,
diff --git a/src/wizard/integration-account/agreements/agreementNameStep.ts b/src/wizard/integration-account/agreements/agreementNameStep.ts
index 80faa6c1..662520f1 100644
--- a/src/wizard/integration-account/agreements/agreementNameStep.ts
+++ b/src/wizard/integration-account/agreements/agreementNameStep.ts
@@ -41,7 +41,7 @@ export class AgreementNameStep extends AzureWizardPromptStep<IAgreementWizardCon
     }
 
     private async isNameAvailable(name: string, wizardContext: IAgreementWizardContext): Promise<boolean> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         let agreements = await client.integrationAccountAgreements.list(wizardContext.resourceGroup!.name!, wizardContext.integrationAccountName);
diff --git a/src/wizard/integration-account/integrationAccountCreateStep.ts b/src/wizard/integration-account/integrationAccountCreateStep.ts
index 6920e5a5..9b628844 100644
--- a/src/wizard/integration-account/integrationAccountCreateStep.ts
+++ b/src/wizard/integration-account/integrationAccountCreateStep.ts
@@ -12,7 +12,7 @@ import { IIntegrationAccountWizardContext } from "./createIntegrationAccountWiza
 
 export class IntegrationAccountCreateStep extends AzureWizardExecuteStep<IIntegrationAccountWizardContext> {
     public async execute(wizardContext: IIntegrationAccountWizardContext): Promise<IIntegrationAccountWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         const newIntegrationAccount: IntegrationAccount = await client.integrationAccounts.createOrUpdate(wizardContext.resourceGroup!.name!,
diff --git a/src/wizard/integration-account/integrationAccountNameStep.ts b/src/wizard/integration-account/integrationAccountNameStep.ts
index e7301e67..97ff5668 100644
--- a/src/wizard/integration-account/integrationAccountNameStep.ts
+++ b/src/wizard/integration-account/integrationAccountNameStep.ts
@@ -52,7 +52,7 @@ export class IntegrationAccountNameStep extends AzureWizardPromptStep<IIntegrati
             resourceGroupName = wizardContext.resourceGroup!.name!;
         }
 
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         let integrationAccounts = await client.integrationAccounts.listByResourceGroup(resourceGroupName);
diff --git a/src/wizard/integration-account/maps/mapCreateStep.ts b/src/wizard/integration-account/maps/mapCreateStep.ts
index 48a788bc..f990b30c 100644
--- a/src/wizard/integration-account/maps/mapCreateStep.ts
+++ b/src/wizard/integration-account/maps/mapCreateStep.ts
@@ -12,7 +12,7 @@ import { IMapWizardContext } from "./createMapWizard";
 
 export class MapCreateStep extends AzureWizardExecuteStep<IMapWizardContext> {
     public async execute(wizardContext: IMapWizardContext): Promise<IMapWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         const newMap: IntegrationAccountMap = await client.integrationAccountMaps.createOrUpdate(wizardContext.resourceGroup!.name!,
diff --git a/src/wizard/integration-account/maps/mapNameStep.ts b/src/wizard/integration-account/maps/mapNameStep.ts
index 7ab11771..5738f535 100644
--- a/src/wizard/integration-account/maps/mapNameStep.ts
+++ b/src/wizard/integration-account/maps/mapNameStep.ts
@@ -41,7 +41,7 @@ export class MapNameStep extends AzureWizardPromptStep<IMapWizardContext> {
     }
 
     private async isNameAvailable(name: string, wizardContext: IMapWizardContext): Promise<boolean> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         let maps = await client.integrationAccountMaps.list(wizardContext.resourceGroup!.name!, wizardContext.integrationAccountName);
diff --git a/src/wizard/integration-account/partners/partnerCreateStep.ts b/src/wizard/integration-account/partners/partnerCreateStep.ts
index dfe76a6b..284591a6 100644
--- a/src/wizard/integration-account/partners/partnerCreateStep.ts
+++ b/src/wizard/integration-account/partners/partnerCreateStep.ts
@@ -12,7 +12,7 @@ import { IPartnerWizardContext } from "./createPartnerWizard";
 
 export class PartnerCreateStep extends AzureWizardExecuteStep<IPartnerWizardContext> {
     public async execute(wizardContext: IPartnerWizardContext): Promise<IPartnerWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         const newPartner: IntegrationAccountPartner = await client.integrationAccountPartners.createOrUpdate(wizardContext.resourceGroup!.name!,
diff --git a/src/wizard/integration-account/schemas/schemaCreateStep.ts b/src/wizard/integration-account/schemas/schemaCreateStep.ts
index 9125672a..d13df909 100644
--- a/src/wizard/integration-account/schemas/schemaCreateStep.ts
+++ b/src/wizard/integration-account/schemas/schemaCreateStep.ts
@@ -12,7 +12,7 @@ import { ISchemaWizardContext } from "./createSchemaWizard";
 
 export class SchemaCreateStep extends AzureWizardExecuteStep<ISchemaWizardContext> {
     public async execute(wizardContext: ISchemaWizardContext): Promise<ISchemaWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         const newSchema: IntegrationAccountSchema = await client.integrationAccountSchemas.createOrUpdate(wizardContext.resourceGroup!.name!,
diff --git a/src/wizard/integration-account/schemas/schemaNameStep.ts b/src/wizard/integration-account/schemas/schemaNameStep.ts
index 17b1eb32..5c63ca97 100644
--- a/src/wizard/integration-account/schemas/schemaNameStep.ts
+++ b/src/wizard/integration-account/schemas/schemaNameStep.ts
@@ -41,7 +41,7 @@ export class SchemaNameStep extends AzureWizardPromptStep<ISchemaWizardContext>
     }
 
     private async isNameAvailable(name: string, wizardContext: ISchemaWizardContext): Promise<boolean> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         let schemas = await client.integrationAccountSchemas.list(wizardContext.resourceGroup!.name!, wizardContext.integrationAccountName);
diff --git a/src/wizard/logic-app/LogicAppCreateStep.ts b/src/wizard/logic-app/LogicAppCreateStep.ts
index fbecd5c4..f4bdb0d9 100644
--- a/src/wizard/logic-app/LogicAppCreateStep.ts
+++ b/src/wizard/logic-app/LogicAppCreateStep.ts
@@ -11,7 +11,7 @@ import { IAzureLogicAppWizardContext } from "./createLogicApp";
 
 export class LogicAppCreateStep extends AzureWizardExecuteStep<IAzureLogicAppWizardContext> {
     public async execute(wizardContext: IAzureLogicAppWizardContext): Promise<IAzureLogicAppWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         const location = wizardContext.location!.name!;
diff --git a/src/wizard/logic-app/LogicAppNameStep.ts b/src/wizard/logic-app/LogicAppNameStep.ts
index 315cfd8e..21d7f08a 100644
--- a/src/wizard/logic-app/LogicAppNameStep.ts
+++ b/src/wizard/logic-app/LogicAppNameStep.ts
@@ -53,7 +53,7 @@ export class LogicAppNameStep extends AzureWizardPromptStep<IAzureLogicAppWizard
             resourceGroupName = wizardContext.resourceGroup!.name!;
         }
 
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.environment.resourceManagerEndpointUrl);
         addExtensionUserAgent(client);
 
         let workflows = await client.workflows.listByResourceGroup(resourceGroupName);