diff --git a/.changelog/11467.txt b/.changelog/11467.txt
new file mode 100644
index 00000000000..50f57a5d1a0
--- /dev/null
+++ b/.changelog/11467.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+netapp: Adding sweepers for all resources due to tests being run in multiple regions
+```
\ No newline at end of file
diff --git a/google/services/netapp/resource_netapp_active_directory_sweeper.go b/google/services/netapp/resource_netapp_active_directory_sweeper.go
index de2b49060de..390dee4ee8c 100644
--- a/google/services/netapp/resource_netapp_active_directory_sweeper.go
+++ b/google/services/netapp/resource_netapp_active_directory_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappactiveDirectory(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/activeDirectories", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["activeDirectories"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/activeDirectories/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/activeDirectories", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["activeDirectories"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/activeDirectories/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil
diff --git a/google/services/netapp/resource_netapp_backup_policy_sweeper.go b/google/services/netapp/resource_netapp_backup_policy_sweeper.go
index 4d9ae2d7343..45f7187b25c 100644
--- a/google/services/netapp/resource_netapp_backup_policy_sweeper.go
+++ b/google/services/netapp/resource_netapp_backup_policy_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappbackupPolicy(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupPolicies", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["backupPolicies"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupPolicies/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupPolicies", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["backupPolicies"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupPolicies/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil
diff --git a/google/services/netapp/resource_netapp_backup_sweeper.go b/google/services/netapp/resource_netapp_backup_sweeper.go
index bf490800f8d..cbb7670c0a4 100644
--- a/google/services/netapp/resource_netapp_backup_sweeper.go
+++ b/google/services/netapp/resource_netapp_backup_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappbackup(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults/{{vault_name}}/backups", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["backups"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults/{{vault_name}}/backups/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults/{{vault_name}}/backups", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["backups"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults/{{vault_name}}/backups/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil
diff --git a/google/services/netapp/resource_netapp_backup_vault_sweeper.go b/google/services/netapp/resource_netapp_backup_vault_sweeper.go
index 31b59fba338..e829d03d88d 100644
--- a/google/services/netapp/resource_netapp_backup_vault_sweeper.go
+++ b/google/services/netapp/resource_netapp_backup_vault_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappbackupVault(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["backupVaults"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["backupVaults"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupVaults/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil
diff --git a/google/services/netapp/resource_netapp_kmsconfig_sweeper.go b/google/services/netapp/resource_netapp_kmsconfig_sweeper.go
index d1f15e7b35c..471cc3f97da 100644
--- a/google/services/netapp/resource_netapp_kmsconfig_sweeper.go
+++ b/google/services/netapp/resource_netapp_kmsconfig_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappkmsconfig(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/kmsConfigs", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["kmsconfigs"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/kmsConfigs/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/kmsConfigs", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["kmsconfigs"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/kmsConfigs/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil
diff --git a/google/services/netapp/resource_netapp_storage_pool_sweeper.go b/google/services/netapp/resource_netapp_storage_pool_sweeper.go
index 0af6167ed9c..103cb2d0e82 100644
--- a/google/services/netapp/resource_netapp_storage_pool_sweeper.go
+++ b/google/services/netapp/resource_netapp_storage_pool_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappstoragePool(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/storagePools", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["storagePools"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/storagePools/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/storagePools", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["storagePools"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/storagePools/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil
diff --git a/google/services/netapp/resource_netapp_volume_snapshot_sweeper.go b/google/services/netapp/resource_netapp_volume_snapshot_sweeper.go
index a8b9627e2dc..712cae768e6 100644
--- a/google/services/netapp/resource_netapp_volume_snapshot_sweeper.go
+++ b/google/services/netapp/resource_netapp_volume_snapshot_sweeper.go
@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package netapp
 
 import (
@@ -53,86 +38,91 @@ func testSweepNetappVolumeSnapshot(region string) error {
 	t := &testing.T{}
 	billingId := envvar.GetTestBillingAccountFromEnv(t)
 
-	// Setup variables to replace in list template
-	d := &tpgresource.ResourceDataMock{
-		FieldsInSchema: map[string]interface{}{
-			"project":         config.Project,
-			"region":          region,
-			"location":        region,
-			"zone":            "-",
-			"billing_account": billingId,
-		},
-	}
-
-	listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/volumes/{{volume_name}}/snapshots", "?")[0]
-	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
-		return nil
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   config.Project,
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil {
-		log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
-		return nil
-	}
-
-	resourceList, ok := res["volumeSnapshots"]
-	if !ok {
-		log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
-		return nil
-	}
-
-	rl := resourceList.([]interface{})
-
-	log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
-	// Keep count of items that aren't sweepable for logging.
-	nonPrefixCount := 0
-	for _, ri := range rl {
-		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
-			return nil
-		}
-
-		name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
-		// Skip resources that shouldn't be sweeped
-		if !sweeper.IsSweepableTestResource(name) {
-			nonPrefixCount++
-			continue
+	regions := []string{"us-central1", "us-west2", "us-east4"}
+	for _, r := range regions {
+		log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s in %s", resourceName, r)
+
+		// Setup variables to replace in list template
+		d := &tpgresource.ResourceDataMock{
+			FieldsInSchema: map[string]interface{}{
+				"project":         config.Project,
+				"region":          r,
+				"location":        r,
+				"zone":            "-",
+				"billing_account": billingId,
+			},
 		}
 
-		deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/volumes/{{volume_name}}/snapshots/{{name}}"
-		deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+		listTemplate := strings.Split("https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/volumes/{{volume_name}}/snapshots", "?")[0]
+		listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 			return nil
 		}
-		deleteUrl = deleteUrl + name
 
-		// Don't wait on operations as we may have a lot to delete
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
-			Method:    "DELETE",
+			Method:    "GET",
 			Project:   config.Project,
-			RawURL:    deleteUrl,
+			RawURL:    listUrl,
 			UserAgent: config.UserAgent,
 		})
 		if err != nil {
-			log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
-		} else {
-			log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
+			return nil
 		}
-	}
 
-	if nonPrefixCount > 0 {
-		log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		resourceList, ok := res["volumeSnapshots"]
+		if !ok {
+			log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
+			return nil
+		}
+
+		rl := resourceList.([]interface{})
+
+		log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
+		// Keep count of items that aren't sweepable for logging.
+		nonPrefixCount := 0
+		for _, ri := range rl {
+			obj := ri.(map[string]interface{})
+			if obj["name"] == nil {
+				log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+				return nil
+			}
+
+			name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
+			// Skip resources that shouldn't be sweeped
+			if !sweeper.IsSweepableTestResource(name) {
+				nonPrefixCount++
+				continue
+			}
+
+			deleteTemplate := "https://netapp.googleapis.com/v1/projects/{{project}}/locations/{{location}}/volumes/{{volume_name}}/snapshots/{{name}}"
+			deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
+				return nil
+			}
+			deleteUrl = deleteUrl + name
+
+			// Don't wait on operations as we may have a lot to delete
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "DELETE",
+				Project:   config.Project,
+				RawURL:    deleteUrl,
+				UserAgent: config.UserAgent,
+			})
+			if err != nil {
+				log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
+			} else {
+				log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
+			}
+		}
+
+		if nonPrefixCount > 0 {
+			log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
+		}
 	}
 
 	return nil