diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index 23317cef..88406483 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -14,6 +14,9 @@
 
 timeout: 3600s
 steps:
+- id: swap-module-refs
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['module-swapper']
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment']
diff --git a/examples/cloudbuild_enabled/main.tf b/examples/cloudbuild_enabled/main.tf
index 5b6c01b5..814ddc1b 100644
--- a/examples/cloudbuild_enabled/main.tf
+++ b/examples/cloudbuild_enabled/main.tf
@@ -19,7 +19,9 @@
 *************************************************/
 
 module "seed_bootstrap" {
-  source                  = "../.."
+  source  = "terraform-google-modules/bootstrap/google"
+  version = "~> 6.0"
+
   org_id                  = var.org_id
   billing_account         = var.billing_account
   group_org_admins        = var.group_org_admins
@@ -31,7 +33,9 @@ module "seed_bootstrap" {
 }
 
 module "cloudbuild_bootstrap" {
-  source                  = "../../modules/cloudbuild"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild"
+  version = "~> 6.0"
+
   org_id                  = var.org_id
   billing_account         = var.billing_account
   group_org_admins        = var.group_org_admins
diff --git a/examples/simple-folder/main.tf b/examples/simple-folder/main.tf
index 9820b4e8..a323100f 100644
--- a/examples/simple-folder/main.tf
+++ b/examples/simple-folder/main.tf
@@ -19,7 +19,9 @@
 *************************************************/
 
 module "seed_bootstrap" {
-  source               = "../.."
+  source  = "terraform-google-modules/bootstrap/google"
+  version = "~> 6.0"
+
   org_id               = var.org_id
   parent_folder        = var.parent
   billing_account      = var.billing_account
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
index cf7c512f..0fb3ada7 100644
--- a/examples/simple/main.tf
+++ b/examples/simple/main.tf
@@ -19,7 +19,9 @@
 *************************************************/
 
 module "seed_bootstrap" {
-  source               = "../.."
+  source  = "terraform-google-modules/bootstrap/google"
+  version = "~> 6.0"
+
   org_id               = var.org_id
   billing_account      = var.billing_account
   group_org_admins     = var.group_org_admins
diff --git a/examples/tf_cloudbuild_builder_simple/main.tf b/examples/tf_cloudbuild_builder_simple/main.tf
index 8fae844c..083490cd 100644
--- a/examples/tf_cloudbuild_builder_simple/main.tf
+++ b/examples/tf_cloudbuild_builder_simple/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "cloudbuilder" {
-  source = "../../modules/tf_cloudbuild_builder"
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
+  version = "~> 6.0"
 
   project_id          = module.enabled_google_apis.project_id
   dockerfile_repo_uri = google_sourcerepo_repository.builder_dockerfile_repo.url
diff --git a/examples/tf_cloudbuild_source_simple/main.tf b/examples/tf_cloudbuild_source_simple/main.tf
index f7e391aa..6139989a 100644
--- a/examples/tf_cloudbuild_source_simple/main.tf
+++ b/examples/tf_cloudbuild_source_simple/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "tf_source" {
-  source = "../../modules/tf_cloudbuild_source"
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_source"
+  version = "~> 6.0"
 
   org_id                = var.org_id
   folder_id             = var.parent_folder
diff --git a/examples/tf_cloudbuild_workspace_simple/main.tf b/examples/tf_cloudbuild_workspace_simple/main.tf
index 31241da1..90cd0dab 100644
--- a/examples/tf_cloudbuild_workspace_simple/main.tf
+++ b/examples/tf_cloudbuild_workspace_simple/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "tf_workspace" {
-  source = "../../modules/tf_cloudbuild_workspace"
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
+  version = "~> 6.0"
 
   project_id  = module.enabled_google_apis.project_id
   tf_repo_uri = google_sourcerepo_repository.tf_config_repo.url