diff --git a/modules/tf_cloudbuild_builder/cb.tf b/modules/tf_cloudbuild_builder/cb.tf
index 420e355f..e8458757 100644
--- a/modules/tf_cloudbuild_builder/cb.tf
+++ b/modules/tf_cloudbuild_builder/cb.tf
@@ -125,7 +125,7 @@ resource "google_project_iam_member" "logs_writer" {
 # https://cloud.google.com/build/docs/securing-builds/store-manage-build-logs#store-custom-bucket
 module "bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 6.0"
+  version = "~> 8.0"
 
   name          = local.log_bucket_name
   project_id    = var.project_id
diff --git a/modules/tf_cloudbuild_source/main.tf b/modules/tf_cloudbuild_source/main.tf
index 35142b89..afc3382d 100644
--- a/modules/tf_cloudbuild_source/main.tf
+++ b/modules/tf_cloudbuild_source/main.tf
@@ -52,7 +52,7 @@ module "cloudbuild_project" {
 // Creating the bucket beforehand make it is possible to define a custom location.
 module "cloudbuild_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 6.0"
+  version = "~> 8.0"
 
   name          = "${module.cloudbuild_project.project_id}_cloudbuild"
   project_id    = module.cloudbuild_project.project_id
diff --git a/modules/tf_cloudbuild_workspace/buckets.tf b/modules/tf_cloudbuild_workspace/buckets.tf
index 929ded08..918db55a 100644
--- a/modules/tf_cloudbuild_workspace/buckets.tf
+++ b/modules/tf_cloudbuild_workspace/buckets.tf
@@ -29,7 +29,7 @@ locals {
 
 module "artifacts_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 6.0"
+  version = "~> 8.0"
 
   name          = var.artifacts_bucket_name != "" ? var.artifacts_bucket_name : "${local.default_prefix}-build-artifacts-${var.project_id}"
   project_id    = var.project_id
@@ -45,7 +45,7 @@ resource "google_storage_bucket_iam_member" "artifacts_admin" {
 
 module "log_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 6.0"
+  version = "~> 8.0"
 
   name          = var.log_bucket_name != "" ? var.log_bucket_name : "${local.default_prefix}-build-logs-${var.project_id}"
   project_id    = var.project_id
@@ -62,7 +62,7 @@ resource "google_storage_bucket_iam_member" "log_admin" {
 # Custom bucket for storing TF state
 module "state_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 6.0"
+  version = "~> 8.0"
   count   = var.create_state_bucket ? 1 : 0
 
   name          = var.create_state_bucket_name != "" ? var.create_state_bucket_name : "${local.default_prefix}-build-state-${var.project_id}"