diff --git a/.github/scripts/validate-deploy.sh b/.github/scripts/validate-deploy.sh
old mode 100644
new mode 100755
diff --git a/main.tf b/main.tf
index 9213f01..e1f2ca3 100644
--- a/main.tf
+++ b/main.tf
@@ -57,11 +57,12 @@ resource "ibm_iam_authorization_policy" "policy" {
 
   source_service_name         = local.service
   target_service_name         = "kms"
-  target_resource_instance_id = data.ibm_resource_instance.kp_instance[0].id
   roles                       = ["Reader"]
 }
 
 resource "ibm_resource_instance" "mongodb_instance" {
+  depends_on = [ibm_iam_authorization_policy.policy]
+
   name                 = local.name
   service              = local.service
   plan                 = var.plan
@@ -72,7 +73,7 @@ resource "ibm_resource_instance" "mongodb_instance" {
   parameters = local.parameters
 
   timeouts {
-    create = "30m"
+    create = "60m"
     update = "15m"
     delete = "15m"
   }
diff --git a/test/stages/stage2-mongodb.tf b/test/stages/stage2-mongodb.tf
index f84e19f..cbe3c33 100644
--- a/test/stages/stage2-mongodb.tf
+++ b/test/stages/stage2-mongodb.tf
@@ -3,7 +3,7 @@ module "dev_tools_mongodb" {
 
   resource_group_name = var.resource_group_name
   resource_location   = var.region
-  name_prefix         = var.name_prefix
+  name_prefix         = "${var.name_prefix}_2"
   key-protect-region  = var.key-protect-region
   key-protect-name    = var.key-protect-name
   key-protect-key     = var.key-protect-key