diff --git a/0-bootstrap/main.tf b/0-bootstrap/main.tf
index f61eb8c77..d0a79e54f 100644
--- a/0-bootstrap/main.tf
+++ b/0-bootstrap/main.tf
@@ -102,3 +102,46 @@ module "seed_bootstrap" {
   depends_on = [module.required_group]
 }
 
+# Fix for Issue #1206 with Groups vs. Terraform SA vs. Owner
+resource "google_cloud_identity_group_membership" "required_group_sa" {
+  # works only with google-beta
+  provider   = google-beta
+  depends_on = [module.seed_bootstrap, google_service_account.terraform-env-sa, module.required_group]
+  for_each   = local.required_groups_to_create
+  group      = module.required_group[each.key].resource_name
+
+  preferred_member_key {
+    id = google_service_account.terraform-env-sa["bootstrap"].email
+  }
+
+  roles {
+    name = "MEMBER"
+  }
+
+  roles {
+    name = "OWNER"
+  }
+
+}
+
+# Fix for Issue #1206 with Groups vs. Terraform SA vs. Owner
+resource "google_cloud_identity_group_membership" "optional_group_sa" {
+  # works only with google-beta
+  provider   = google-beta
+  depends_on = [module.seed_bootstrap, google_service_account.terraform-env-sa, module.optional_group]
+  for_each   = local.optional_groups_to_create
+  group      = module.optional_group[each.key].resource_name
+
+  preferred_member_key {
+    id = google_service_account.terraform-env-sa["bootstrap"].email
+  }
+
+  roles {
+    name = "MEMBER"
+  }
+
+  roles {
+    name = "OWNER"
+  }
+
+}