diff --git a/azurerm/internal/services/blueprints/blueprint_assignment_resource.go b/azurerm/internal/services/blueprints/blueprint_assignment_resource.go
index aa4b0fc112e2..e1ddcd185888 100644
--- a/azurerm/internal/services/blueprints/blueprint_assignment_resource.go
+++ b/azurerm/internal/services/blueprints/blueprint_assignment_resource.go
@@ -33,7 +33,10 @@ func resourceArmBlueprintAssignment() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Read: schema.DefaultTimeout(5 * time.Minute),
+			Create: schema.DefaultTimeout(30 * time.Minute),
+			Update: schema.DefaultTimeout(30 * time.Minute),
+			Read:   schema.DefaultTimeout(5 * time.Minute),
+			Delete: schema.DefaultTimeout(5 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{
diff --git a/azurerm/internal/services/msi/parse/identity.go b/azurerm/internal/services/msi/parse/identity.go
index 70130fedec48..b31ac41bdaa7 100644
--- a/azurerm/internal/services/msi/parse/identity.go
+++ b/azurerm/internal/services/msi/parse/identity.go
@@ -2,6 +2,7 @@ package parse
 
 import (
 	"fmt"
+
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 )