diff --git a/build/terraform b/build/terraform
index 1646a7a8e4e0..62422128476b 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 1646a7a8e4e089477b8cee1cd033b0a67717c8c4
+Subproject commit 62422128476bb288e1675cc45e49b1c4c70d310c
diff --git a/build/terraform-beta b/build/terraform-beta
index e8de572f56dd..886fa0e5b081 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit e8de572f56dd07186b1140f0003fb26108348fd9
+Subproject commit 886fa0e5b081bd52c8817fa8544d06d79efd79cb
diff --git a/provider/terraform/resources/resource_composer_environment.go b/provider/terraform/resources/resource_composer_environment.go
index c9736ffbfa43..2bc6e02dab3e 100644
--- a/provider/terraform/resources/resource_composer_environment.go
+++ b/provider/terraform/resources/resource_composer_environment.go
@@ -46,9 +46,9 @@ func resourceComposerEnvironment() *schema.Resource {
 
 		Timeouts: &schema.ResourceTimeout{
 			// Composer takes <= 1 hr for create/update.
-			Create: schema.DefaultTimeout(3600 * time.Second),
-			Update: schema.DefaultTimeout(3600 * time.Second),
-			Delete: schema.DefaultTimeout(360 * time.Second),
+			Create: schema.DefaultTimeout(60 * time.Minute),
+			Update: schema.DefaultTimeout(60 * time.Minute),
+			Delete: schema.DefaultTimeout(15 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{