diff --git a/auto_policy_testing/red/sql/sql_server.tf b/auto_policy_testing/red/sql/sql_server.tf
index 50ba50d8..3517e339 100644
--- a/auto_policy_testing/red/sql/sql_server.tf
+++ b/auto_policy_testing/red/sql/sql_server.tf
@@ -11,6 +11,11 @@ resource "azurerm_mssql_server" "this" {
   minimum_tls_version           = "1.1"
   
   tags = module.naming.default_tags
+
+  timeouts {
+    create = "2h"
+    delete = "2h"
+  }
 }
 
 resource "azurerm_mssql_firewall_rule" "this" {
diff --git a/auto_policy_testing/red/storage/storage_account.tf b/auto_policy_testing/red/storage/storage_account.tf
index 8e3ca6fd..cc498c42 100644
--- a/auto_policy_testing/red/storage/storage_account.tf
+++ b/auto_policy_testing/red/storage/storage_account.tf
@@ -1,7 +1,14 @@
+resource "azurerm_resource_group" "this" {
+  name     = "${module.naming.resource_prefix.resourcegroup}"
+  location = "eastus"
+
+  tags = module.naming.default_tags
+}
+
 resource "azurerm_storage_account" "this" {
   name                      = "${module.naming.resource_prefix.storage}storage${random_integer.this.result}"
   location                  = "eastus" #this option required for 291 policy
-  resource_group_name       = data.terraform_remote_state.common.outputs.resource_group
+  resource_group_name       = azurerm_resource_group.this.name
   account_tier              = "Standard"
   account_replication_type  = "LRS"
   enable_https_traffic_only = false