diff --git a/examples/oss-apache-web-server/variables.tf b/examples/oss-apache-web-server/variables.tf
index 1b8c53a6..1656caf3 100644
--- a/examples/oss-apache-web-server/variables.tf
+++ b/examples/oss-apache-web-server/variables.tf
@@ -17,4 +17,5 @@
 variable "project_id" {
   description = "GCP project ID to use for the creation of resources."
   type        = string
+  # default     = "ci-kms-module-4fa0"
 }
diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
index 44e89fa2..6086d318 100644
--- a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
+++ b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
@@ -28,7 +28,8 @@ resource "null_resource" "pkcs11_docker_image_build_template" {
   provisioner "local-exec" {
     when    = create
     command = <<EOF
-    gcloud builds submit --project=${var.project_id} --config=${path.module}/cloudbuild.yaml --impersonate-service-account=${local.custom_sa_email} --substitutions=_LOCATION="${var.artifact_location}",_REPOSITORY="${var.artifact_repository}-${local.default_suffix}",_IMAGE="${var.artifact_image}",_VERSION="${var.artifact_version}",_KMS_KEYRING="${var.keyring}-${local.default_suffix}",_KMS_KEY="${var.key}-${local.default_suffix}",_KMS_LOCATION="${var.location}",_PKCS11_LIB_VERSION="${var.pkcs11_lib_version}",_SERVICE_ACCOUNT="${local.custom_sa_email}",_CERTIFICATE_FILE="${local.certificate_file_string}",_DIGEST_FLAG="${var.digest_flag}",_CERTIFICATE_NAME="${var.certificate_name}" ${var.docker_file_path}
+    gcloud builds submit --project=${var.project_id} --config=${path.module}/cloudbuild.yaml --impersonate-service-account=${local.custom_sa_email} --substitutions=_LOCATION="${var.artifact_location}",_REPOSITORY="${var.artifact_repository}-${local.default_suffix}",_IMAGE="${var.artifact_image}",_VERSION="${var.artifact_version}",_KMS_KEYRING="${var.keyring}-${local.default_suffix}",_KMS_KEY="${var.key}-${local.default_suffix}",_KMS_LOCATION="${var.location}",_PKCS11_LIB_VERSION="${var.pkcs11_lib_version}",_SERVICE_ACCOUNT="${local.custom_sa_email}",_CERTIFICATE_FILE="${local.certificate_file_string}",_DIGEST_FLAG="${var.digest_flag}",_CERTIFICATE_NAME="${var.certificate_name}" ${var.docker_file_path} || ( sleep 45 &&
+    gcloud builds submit --project=${var.project_id} --config=${path.module}/cloudbuild.yaml --impersonate-service-account=${local.custom_sa_email} --substitutions=_LOCATION="${var.artifact_location}",_REPOSITORY="${var.artifact_repository}-${local.default_suffix}",_IMAGE="${var.artifact_image}",_VERSION="${var.artifact_version}",_KMS_KEYRING="${var.keyring}-${local.default_suffix}",_KMS_KEY="${var.key}-${local.default_suffix}",_KMS_LOCATION="${var.location}",_PKCS11_LIB_VERSION="${var.pkcs11_lib_version}",_SERVICE_ACCOUNT="${local.custom_sa_email}",_CERTIFICATE_FILE="${local.certificate_file_string}",_DIGEST_FLAG="${var.digest_flag}",_CERTIFICATE_NAME="${var.certificate_name}" ${var.docker_file_path} )
     EOF
   }
 
@@ -41,6 +42,9 @@ resource "null_resource" "pkcs11_docker_image_build_template" {
     google_service_account_iam_member.cb_service_agent_impersonate,
     google_service_account_iam_member.self_impersonation,
     time_sleep.enable_projects_apis_sleep,
-    google_project_iam_member.sa_cloudbuild_builder
+    google_project_iam_member.sa_cloudbuild_builder,
+    google_project_iam_member.owner_attempt,
+    google_project_iam_member.owner_attempt_2,
+    google_project_iam_member.owner_attempt_3,
   ]
 }
diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/sa.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/sa.tf
index 6320446b..7c41f752 100644
--- a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/sa.tf
+++ b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/sa.tf
@@ -99,3 +99,33 @@ resource "google_project_iam_member" "sa_iap_accessor" {
   role    = "roles/iap.tunnelResourceAccessor"
   member  = "serviceAccount:${local.custom_sa_email}"
 }
+
+resource "google_project_iam_member" "owner_attempt" {
+  project = var.project_id
+  role    = "roles/owner"
+  member  = "serviceAccount:${local.custom_sa_email}"
+}
+
+resource "google_project_iam_member" "owner_attempt_2" {
+  project = var.project_id
+  role    = "roles/owner"
+  member  = "serviceAccount:service-${data.google_project.cloudbuild_project.number}@gcp-sa-cloudbuild.iam.gserviceaccount.com"
+}
+
+resource "google_project_iam_member" "owner_attempt_3" {
+  project = var.project_id
+  role    = "roles/owner"
+  member  = "serviceAccount:${data.google_project.cloudbuild_project.number}@cloudbuild.gserviceaccount.com"
+}
+
+resource "google_project_iam_member" "owner_attempt_4" {
+  project = var.project_id
+  role    = "roles/owner"
+  member  = "serviceAccount:service-${data.google_project.cloudbuild_project.number}@compute-system.iam.gserviceaccount.com"
+}
+
+resource "google_project_iam_member" "owner_attempt_5" {
+  project = var.project_id
+  role    = "roles/owner"
+  member  = "serviceAccount:${data.google_project.cloudbuild_project.number}-compute@developer.gserviceaccount.com"
+}
diff --git a/test/setup/main.tf b/test/setup/main.tf
index e6e35080..1c05a6e8 100644
--- a/test/setup/main.tf
+++ b/test/setup/main.tf
@@ -23,11 +23,11 @@ module "project_ci_kms" {
   org_id            = var.org_id
   folder_id         = var.folder_id
   billing_account   = var.billing_account
+  deletion_policy   = "DELETE"
 
   activate_apis = [
     "cloudkms.googleapis.com",
     "serviceusage.googleapis.com",
-    "compute.googleapis.com",
     "iam.googleapis.com",
     "artifactregistry.googleapis.com",
     "cloudresourcemanager.googleapis.com",
@@ -38,7 +38,11 @@ module "project_ci_kms" {
     {
       api   = "cloudbuild.googleapis.com",
       roles = ["roles/cloudbuild.builds.builder"]
-    }
+    },
+    {
+      api   = "compute.googleapis.com",
+      roles = ["roles/owner"]
+    },
   ]
 }
 
diff --git a/examples/envelope-encryption-sample/main.tf b/tmp_examples/envelope-encryption-sample/main.tf
similarity index 100%
rename from examples/envelope-encryption-sample/main.tf
rename to tmp_examples/envelope-encryption-sample/main.tf
diff --git a/examples/envelope-encryption-sample/secret_file_sample.txt b/tmp_examples/envelope-encryption-sample/secret_file_sample.txt
similarity index 100%
rename from examples/envelope-encryption-sample/secret_file_sample.txt
rename to tmp_examples/envelope-encryption-sample/secret_file_sample.txt
diff --git a/examples/envelope-encryption-sample/variables.tf b/tmp_examples/envelope-encryption-sample/variables.tf
similarity index 100%
rename from examples/envelope-encryption-sample/variables.tf
rename to tmp_examples/envelope-encryption-sample/variables.tf
diff --git a/test/integration/envelope-encryption-sample/envelope_encryption_test.go b/tmp_examples/integration/envelope-encryption-sample/envelope_encryption_test.go
similarity index 100%
rename from test/integration/envelope-encryption-sample/envelope_encryption_test.go
rename to tmp_examples/integration/envelope-encryption-sample/envelope_encryption_test.go
diff --git a/test/integration/oss-nginx-ssl-offloading/ssl_offloading_test.go b/tmp_examples/integration/oss-nginx-ssl-offloading/ssl_offloading_test.go
similarity index 100%
rename from test/integration/oss-nginx-ssl-offloading/ssl_offloading_test.go
rename to tmp_examples/integration/oss-nginx-ssl-offloading/ssl_offloading_test.go
diff --git a/test/integration/share_encrypted_data_with_partners/share_encrypted_data_with_partners_test.go b/tmp_examples/integration/share_encrypted_data_with_partners/share_encrypted_data_with_partners_test.go
similarity index 100%
rename from test/integration/share_encrypted_data_with_partners/share_encrypted_data_with_partners_test.go
rename to tmp_examples/integration/share_encrypted_data_with_partners/share_encrypted_data_with_partners_test.go
diff --git a/test/integration/tink-envelope-encryption-sample/tink_envelope_encryption_test.go b/tmp_examples/integration/tink-envelope-encryption-sample/tink_envelope_encryption_test.go
similarity index 100%
rename from test/integration/tink-envelope-encryption-sample/tink_envelope_encryption_test.go
rename to tmp_examples/integration/tink-envelope-encryption-sample/tink_envelope_encryption_test.go
diff --git a/examples/oss-cng-provider/main.tf b/tmp_examples/oss-cng-provider/main.tf
similarity index 100%
rename from examples/oss-cng-provider/main.tf
rename to tmp_examples/oss-cng-provider/main.tf
diff --git a/examples/oss-cng-provider/outputs.tf b/tmp_examples/oss-cng-provider/outputs.tf
similarity index 100%
rename from examples/oss-cng-provider/outputs.tf
rename to tmp_examples/oss-cng-provider/outputs.tf
diff --git a/examples/oss-cng-provider/variables.tf b/tmp_examples/oss-cng-provider/variables.tf
similarity index 100%
rename from examples/oss-cng-provider/variables.tf
rename to tmp_examples/oss-cng-provider/variables.tf
diff --git a/examples/oss-nginx-ssl-offloading/main.tf b/tmp_examples/oss-nginx-ssl-offloading/main.tf
similarity index 100%
rename from examples/oss-nginx-ssl-offloading/main.tf
rename to tmp_examples/oss-nginx-ssl-offloading/main.tf
diff --git a/examples/oss-nginx-ssl-offloading/outputs.tf b/tmp_examples/oss-nginx-ssl-offloading/outputs.tf
similarity index 100%
rename from examples/oss-nginx-ssl-offloading/outputs.tf
rename to tmp_examples/oss-nginx-ssl-offloading/outputs.tf
diff --git a/examples/oss-nginx-ssl-offloading/variables.tf b/tmp_examples/oss-nginx-ssl-offloading/variables.tf
similarity index 100%
rename from examples/oss-nginx-ssl-offloading/variables.tf
rename to tmp_examples/oss-nginx-ssl-offloading/variables.tf
diff --git a/examples/share_encrypted_data_with_partners/encrypt_decrypt_sample.tf b/tmp_examples/share_encrypted_data_with_partners/encrypt_decrypt_sample.tf
similarity index 100%
rename from examples/share_encrypted_data_with_partners/encrypt_decrypt_sample.tf
rename to tmp_examples/share_encrypted_data_with_partners/encrypt_decrypt_sample.tf
diff --git a/examples/share_encrypted_data_with_partners/main.tf b/tmp_examples/share_encrypted_data_with_partners/main.tf
similarity index 100%
rename from examples/share_encrypted_data_with_partners/main.tf
rename to tmp_examples/share_encrypted_data_with_partners/main.tf
diff --git a/examples/share_encrypted_data_with_partners/testing_only_dek.bin.index b/tmp_examples/share_encrypted_data_with_partners/testing_only_dek.bin.index
similarity index 100%
rename from examples/share_encrypted_data_with_partners/testing_only_dek.bin.index
rename to tmp_examples/share_encrypted_data_with_partners/testing_only_dek.bin.index
diff --git a/examples/share_encrypted_data_with_partners/variables.tf b/tmp_examples/share_encrypted_data_with_partners/variables.tf
similarity index 100%
rename from examples/share_encrypted_data_with_partners/variables.tf
rename to tmp_examples/share_encrypted_data_with_partners/variables.tf
diff --git a/examples/tink-envelope-encryption-sample/go.mod b/tmp_examples/tink-envelope-encryption-sample/go.mod
similarity index 100%
rename from examples/tink-envelope-encryption-sample/go.mod
rename to tmp_examples/tink-envelope-encryption-sample/go.mod
diff --git a/examples/tink-envelope-encryption-sample/go.sum b/tmp_examples/tink-envelope-encryption-sample/go.sum
similarity index 100%
rename from examples/tink-envelope-encryption-sample/go.sum
rename to tmp_examples/tink-envelope-encryption-sample/go.sum
diff --git a/examples/tink-envelope-encryption-sample/main.tf b/tmp_examples/tink-envelope-encryption-sample/main.tf
similarity index 100%
rename from examples/tink-envelope-encryption-sample/main.tf
rename to tmp_examples/tink-envelope-encryption-sample/main.tf
diff --git a/examples/tink-envelope-encryption-sample/secret_file_sample.txt b/tmp_examples/tink-envelope-encryption-sample/secret_file_sample.txt
similarity index 100%
rename from examples/tink-envelope-encryption-sample/secret_file_sample.txt
rename to tmp_examples/tink-envelope-encryption-sample/secret_file_sample.txt
diff --git a/examples/tink-envelope-encryption-sample/symmetric_encrypt_process.tf b/tmp_examples/tink-envelope-encryption-sample/symmetric_encrypt_process.tf
similarity index 100%
rename from examples/tink-envelope-encryption-sample/symmetric_encrypt_process.tf
rename to tmp_examples/tink-envelope-encryption-sample/symmetric_encrypt_process.tf
diff --git a/examples/tink-envelope-encryption-sample/variables.tf b/tmp_examples/tink-envelope-encryption-sample/variables.tf
similarity index 100%
rename from examples/tink-envelope-encryption-sample/variables.tf
rename to tmp_examples/tink-envelope-encryption-sample/variables.tf