diff --git a/0-bootstrap/cb.tf b/0-bootstrap/cb.tf
index d45da20ce..0031cbd8a 100644
--- a/0-bootstrap/cb.tf
+++ b/0-bootstrap/cb.tf
@@ -171,7 +171,7 @@ module "tf_cloud_builder" {
 
 module "bootstrap_csr_repo" {
   source  = "terraform-google-modules/gcloud/google"
-  version = "~> 3.1.0"
+  version = "~> 3.1"
   upgrade = false
 
   create_cmd_entrypoint = "${path.module}/scripts/push-to-repo.sh"
@@ -189,7 +189,7 @@ resource "time_sleep" "cloud_builder" {
 
 module "build_terraform_image" {
   source  = "terraform-google-modules/gcloud/google"
-  version = "~> 3.1.0"
+  version = "~> 3.1"
   upgrade = false
 
   create_cmd_triggers = {
diff --git a/0-bootstrap/groups.tf b/0-bootstrap/groups.tf
index 274635e24..8254c6aca 100644
--- a/0-bootstrap/groups.tf
+++ b/0-bootstrap/groups.tf
@@ -34,7 +34,7 @@ data "google_organization" "org" {
 
 module "required_group" {
   source   = "terraform-google-modules/group/google"
-  version  = "~> 0.4"
+  version  = "~> 0.6"
   for_each = local.required_groups_to_create
 
   id                   = each.value
@@ -46,7 +46,7 @@ module "required_group" {
 
 module "optional_group" {
   source   = "terraform-google-modules/group/google"
-  version  = "~> 0.4"
+  version  = "~> 0.6"
   for_each = local.optional_groups_to_create
 
   id                   = each.value