diff --git a/builder/azure/common/client/azure_client_set.go b/builder/azure/common/client/azure_client_set.go
index c0dfb12e8..f57442b2f 100644
--- a/builder/azure/common/client/azure_client_set.go
+++ b/builder/azure/common/client/azure_client_set.go
@@ -33,7 +33,7 @@ type azureClientSet struct {
 }
 
 func New(c Config, say func(string)) (AzureClientSet, error) {
-	token, err := c.GetServicePrincipalToken(say, c.CloudEnvironment.ResourceManagerEndpoint)
+	token, err := c.GetServicePrincipalToken(say, c.CloudEnvironment().ResourceManagerEndpoint)
 	if err != nil {
 		return nil, err
 	}
diff --git a/builder/azure/common/client/config.go b/builder/azure/common/client/config.go
index 721435375..d3449cc6c 100644
--- a/builder/azure/common/client/config.go
+++ b/builder/azure/common/client/config.go
@@ -207,12 +207,12 @@ func (c Config) GetServicePrincipalTokens(say func(string)) (
 	err error) {
 
 	servicePrincipalToken, err = c.GetServicePrincipalToken(say,
-		c.CloudEnvironment.ResourceManagerEndpoint)
+		c.CloudEnvironment().ResourceManagerEndpoint)
 	if err != nil {
 		return nil, nil, err
 	}
 	servicePrincipalTokenVault, err = c.GetServicePrincipalToken(say,
-		strings.TrimRight(c.CloudEnvironment.KeyVaultEndpoint, "/"))
+		strings.TrimRight(c.CloudEnvironment().KeyVaultEndpoint, "/"))
 	if err != nil {
 		return nil, nil, err
 	}