diff --git a/examples/cloudbuild_repo_connection_github/main.tf b/examples/cloudbuild_repo_connection_github/main.tf
index 7398b312..0b666478 100644
--- a/examples/cloudbuild_repo_connection_github/main.tf
+++ b/examples/cloudbuild_repo_connection_github/main.tf
@@ -16,7 +16,7 @@
 
 module "git_repo_connection" {
   source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
-  version = "~> 9.0"
+  version = "~> 8.0"
 
   project_id = var.project_id
   connection_config = {
diff --git a/examples/cloudbuild_repo_connection_gitlab/main.tf b/examples/cloudbuild_repo_connection_gitlab/main.tf
index 8c2e6ca2..b4871e82 100644
--- a/examples/cloudbuild_repo_connection_gitlab/main.tf
+++ b/examples/cloudbuild_repo_connection_gitlab/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "git_repo_connection" {
-  source = "../../modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  version = "~> 8.0"
 
   project_id = var.project_id
   connection_config = {
diff --git a/examples/im_cloudbuild_workspace_github/main.tf b/examples/im_cloudbuild_workspace_github/main.tf
index 03937f47..5679e3fe 100644
--- a/examples/im_cloudbuild_workspace_github/main.tf
+++ b/examples/im_cloudbuild_workspace_github/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "im_workspace" {
-  source = "../../modules/im_cloudbuild_workspace"
+  source  = "terraform-google-modules/bootstrap/google//modules/im_cloudbuild_workspace"
+  version = "~> 8.0"
 
   project_id    = var.project_id
   deployment_id = "im-example-github-deployment"
diff --git a/examples/im_cloudbuild_workspace_gitlab/main.tf b/examples/im_cloudbuild_workspace_gitlab/main.tf
index f38bde4b..0d980e7e 100644
--- a/examples/im_cloudbuild_workspace_gitlab/main.tf
+++ b/examples/im_cloudbuild_workspace_gitlab/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "im_workspace" {
-  source = "../../modules/im_cloudbuild_workspace"
+  source  = "terraform-google-modules/bootstrap/google//modules/im_cloudbuild_workspace"
+  version = "~> 8.0"
 
   project_id    = var.project_id
   deployment_id = "im-example-gitlab-deployment"
diff --git a/examples/tf_cloudbuild_builder_simple_github/main.tf b/examples/tf_cloudbuild_builder_simple_github/main.tf
index c0600bc7..ea6bdd84 100644
--- a/examples/tf_cloudbuild_builder_simple_github/main.tf
+++ b/examples/tf_cloudbuild_builder_simple_github/main.tf
@@ -25,9 +25,8 @@ locals {
 }
 
 module "cloudbuilder" {
-  # source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
-  # version = "~> 8.0"
-  source = "../../modules/tf_cloudbuild_builder"
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
+  version = "~> 8.0"
 
   project_id                  = module.enabled_google_apis.project_id
   dockerfile_repo_uri         = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
@@ -54,7 +53,8 @@ resource "time_sleep" "propagation" {
 }
 
 module "git_repo_connection" {
-  source = "../../modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  version = "~> 8.0"
 
   project_id = var.project_id
   connection_config = {
diff --git a/examples/tf_cloudbuild_builder_simple_gitlab/main.tf b/examples/tf_cloudbuild_builder_simple_gitlab/main.tf
index 57d8cf47..164408e4 100644
--- a/examples/tf_cloudbuild_builder_simple_gitlab/main.tf
+++ b/examples/tf_cloudbuild_builder_simple_gitlab/main.tf
@@ -25,8 +25,8 @@ locals {
 }
 
 module "cloudbuilder" {
-  source = "../../modules/tf_cloudbuild_builder"
-
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
+  version = "~> 8.0"
 
   project_id                  = module.enabled_google_apis.project_id
   dockerfile_repo_uri         = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
@@ -56,7 +56,8 @@ resource "time_sleep" "propagation" {
 }
 
 module "git_repo_connection" {
-  source = "../../modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  version = "~> 8.0"
 
   project_id = var.project_id
   connection_config = {
diff --git a/examples/tf_cloudbuild_workspace_simple/files/main.tf b/examples/tf_cloudbuild_workspace_simple/files/main.tf
index 4fbf40ef..685af448 100644
--- a/examples/tf_cloudbuild_workspace_simple/files/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple/files/main.tf
@@ -15,8 +15,9 @@
  */
 
 module "test-vpc-module" {
-  source       = "terraform-google-modules/network/google"
-  version      = "~> 9.0"
+  source  = "terraform-google-modules/network/google"
+  version = "~> 9.0"
+
   project_id   = var.project_id
   network_name = "my-custom-mode-network"
   mtu          = 1460
diff --git a/examples/tf_cloudbuild_workspace_simple/main.tf b/examples/tf_cloudbuild_workspace_simple/main.tf
index 4f1b1186..a708f582 100644
--- a/examples/tf_cloudbuild_workspace_simple/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple/main.tf
@@ -42,6 +42,7 @@ resource "google_sourcerepo_repository" "tf_config_repo" {
 module "bootstrap_csr_repo" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 3.1"
+
   upgrade = false
 
   create_cmd_entrypoint = "${path.module}/scripts/push-to-repo.sh"
diff --git a/examples/tf_cloudbuild_workspace_simple_github/files/main.tf b/examples/tf_cloudbuild_workspace_simple_github/files/main.tf
index 8c7cc7c6..6f5b12ef 100644
--- a/examples/tf_cloudbuild_workspace_simple_github/files/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple_github/files/main.tf
@@ -15,8 +15,9 @@
  */
 
 module "test-vpc-module" {
-  source       = "terraform-google-modules/network/google"
-  version      = "~> 9.0"
+  source  = "terraform-google-modules/network/google"
+  version = "~> 9.0"
+
   project_id   = var.project_id
   network_name = "my-custom-mode-network-gh"
   mtu          = 1460
diff --git a/examples/tf_cloudbuild_workspace_simple_github/main.tf b/examples/tf_cloudbuild_workspace_simple_github/main.tf
index 5203ab22..92d83b42 100644
--- a/examples/tf_cloudbuild_workspace_simple_github/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple_github/main.tf
@@ -25,7 +25,8 @@ locals {
 }
 
 module "tf_workspace" {
-  source = "../../modules/tf_cloudbuild_workspace"
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
+  version = "~> 8.0"
 
   project_id                = module.enabled_google_apis.project_id
   tf_repo_type              = "CLOUDBUILD_V2_REPOSITORY"
@@ -59,7 +60,8 @@ resource "time_sleep" "propagation" {
 }
 
 module "git_repo_connection" {
-  source = "../../modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  version = "~> 8.0"
 
   project_id = var.project_id
   connection_config = {
diff --git a/examples/tf_cloudbuild_workspace_simple_gitlab/files/main.tf b/examples/tf_cloudbuild_workspace_simple_gitlab/files/main.tf
index 06d63bfb..dff9594e 100644
--- a/examples/tf_cloudbuild_workspace_simple_gitlab/files/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple_gitlab/files/main.tf
@@ -15,8 +15,9 @@
  */
 
 module "test-vpc-module" {
-  source       = "terraform-google-modules/network/google"
-  version      = "~> 9.0"
+  source  = "terraform-google-modules/network/google"
+  version = "~> 9.0"
+
   project_id   = var.project_id
   network_name = "my-custom-mode-network-gl"
   mtu          = 1460
diff --git a/examples/tf_cloudbuild_workspace_simple_gitlab/main.tf b/examples/tf_cloudbuild_workspace_simple_gitlab/main.tf
index c9470e81..6a6a1817 100644
--- a/examples/tf_cloudbuild_workspace_simple_gitlab/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple_gitlab/main.tf
@@ -25,7 +25,8 @@ locals {
 }
 
 module "tf_workspace" {
-  source = "../../modules/tf_cloudbuild_workspace"
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
+  version = "~> 8.0"
 
   project_id               = module.enabled_google_apis.project_id
   tf_repo_type             = "CLOUDBUILD_V2_REPOSITORY"
@@ -58,7 +59,8 @@ resource "time_sleep" "propagation" {
 }
 
 module "git_repo_connection" {
-  source = "../../modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  version = "~> 8.0"
 
   project_id = var.project_id
   connection_config = {