diff --git a/builtin/providers/azurerm/config.go b/builtin/providers/azurerm/config.go
index bbf15712f..fc89d4d70 100644
--- a/builtin/providers/azurerm/config.go
+++ b/builtin/providers/azurerm/config.go
@@ -8,7 +8,6 @@ import (
 	"net/http/httputil"
 
 	"github.com/Azure/azure-sdk-for-go/arm/cdn"
-	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/Azure/azure-sdk-for-go/arm/containerregistry"
 	"github.com/Azure/azure-sdk-for-go/arm/containerservice"
 	"github.com/Azure/azure-sdk-for-go/arm/eventhub"
@@ -25,6 +24,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/hashicorp/terraform/terraform"
 	riviera "github.com/jen20/riviera/azure"
+	"github.com/mcardosos/azure-sdk-for-go/arm/compute"
 )
 
 // ArmClient contains the handles to all the specific Azure Resource Manager
diff --git a/builtin/providers/azurerm/resource_arm_availability_set.go b/builtin/providers/azurerm/resource_arm_availability_set.go
index 3e5f57d90..8852d0397 100644
--- a/builtin/providers/azurerm/resource_arm_availability_set.go
+++ b/builtin/providers/azurerm/resource_arm_availability_set.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/jen20/riviera/azure"
+	"github.com/mcardosos/azure-sdk-for-go/arm/compute"
 )
 
 func resourceArmAvailabilitySet() *schema.Resource {
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_extension.go b/builtin/providers/azurerm/resource_arm_virtual_machine_extension.go
index 129e205c5..dba2d76c4 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_extension.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_extension.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"reflect"
 
-	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/mcardosos/azure-sdk-for-go/arm/compute"
 )
 
 func resourceArmVirtualMachineExtensions() *schema.Resource {
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set.go b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set.go
index 02389f670..8b3ce7f3e 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set.go
@@ -7,9 +7,9 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/mcardosos/azure-sdk-for-go/arm/compute"
 )
 
 func resourceArmVirtualMachineScaleSet() *schema.Resource {
diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
index b81ca08c0..02f237950 100644
--- a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
+++ b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"github.com/mcardosos/azure-sdk-for-go/arm/compute"
 )
 
 func TestAccAzureRMVirtualMachine_basicLinuxMachine(t *testing.T) {