diff --git a/metrics_azurerm_resources.go b/metrics_azurerm_resources.go
index 08c3355..cbb2e9f 100644
--- a/metrics_azurerm_resources.go
+++ b/metrics_azurerm_resources.go
@@ -44,11 +44,11 @@ func (m *MetricsCollectorAzureRmResources) Reset() {
 }
 
 func (m *MetricsCollectorAzureRmResources) Collect(ctx context.Context, logger *log.Entry, callback chan<- func(), subscription subscriptions.Subscription) {
-	client := resources.NewGroupsClientWithBaseURI(azureEnvironment.ResourceManagerEndpoint, *subscription.SubscriptionID)
+	client := resources.NewClientWithBaseURI(azureEnvironment.ResourceManagerEndpoint, *subscription.SubscriptionID)
 	client.Authorizer = AzureAuthorizer
 	client.ResponseInspector = azureResponseInspector(&subscription)
 
-	list, err := client.ListComplete(ctx, "", nil)
+	list, err := client.ListComplete(ctx, "", "", nil)
 
 	if err != nil {
 		logger.Panic(err)
diff --git a/misc.go b/misc.go
index f2d5a9b..2676da9 100644
--- a/misc.go
+++ b/misc.go
@@ -7,8 +7,8 @@ import (
 )
 
 var (
-	resourceGroupFromResourceIdRegExp = regexp.MustCompile("/resourceGroups/([^/]*)")
-	providerFromResourceIdRegExp      = regexp.MustCompile("/providers/([^/]*)")
+	resourceGroupFromResourceIdRegExp = regexp.MustCompile("/subscriptions/[^/]+/resourceGroups/([^/]*)")
+	providerFromResourceIdRegExp      = regexp.MustCompile("/subscriptions/[^/]+/resourceGroups/[^/]+/providers/([^/]*)")
 	roleDefinitionIdRegExp            = regexp.MustCompile("/Microsoft.Authorization/roleDefinitions/([^/]*)")
 )