diff --git a/Makefile b/Makefile
index 8c6db19..f09df43 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index 2ee7ef5..d1e57e7 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -35,7 +35,7 @@ steps:
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy']
 - id: create-oidc
   waitFor:
-      - prepare
+      - destroy
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=init go test -v -run TestOIDCSimple ./... -p 1']
 - id: converge-oidc
@@ -58,4 +58,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
index c1060e8..e0ce815 100644
--- a/build/lint.cloudbuild.yaml
+++ b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
diff --git a/examples/gh-org-runner-mig-native-simple/README.md b/examples/gh-org-runner-mig-native-simple/README.md
index 36261a0..8091c2d 100644
--- a/examples/gh-org-runner-mig-native-simple/README.md
+++ b/examples/gh-org-runner-mig-native-simple/README.md
@@ -50,4 +50,4 @@ $ terraform apply
 | mig\_name | The name of the MIG |
 | service\_account | Service account email for GCE |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/gh-runner-gke-dind/README.md b/examples/gh-runner-gke-dind/README.md
index 413cfe9..9546419 100644
--- a/examples/gh-runner-gke-dind/README.md
+++ b/examples/gh-runner-gke-dind/README.md
@@ -75,4 +75,4 @@ $ kustomize build . | kubectl apply -f -
 | location | Cluster location |
 | service\_account | The default service account used for running nodes. |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/gh-runner-gke-simple/README.md b/examples/gh-runner-gke-simple/README.md
index cf77870..4d6c920 100644
--- a/examples/gh-runner-gke-simple/README.md
+++ b/examples/gh-runner-gke-simple/README.md
@@ -77,4 +77,4 @@ $ kustomize build . | kubectl apply -f -
 | service\_account | The default service account used for running nodes. |
 | subnet\_name | Name of VPC |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/gh-runner-mig-container-vm-dind/README.md b/examples/gh-runner-mig-container-vm-dind/README.md
index 4ca9cd7..b11cd89 100644
--- a/examples/gh-runner-mig-container-vm-dind/README.md
+++ b/examples/gh-runner-mig-container-vm-dind/README.md
@@ -59,4 +59,4 @@ $ terraform apply
 | mig\_instance\_group | The instance group url of the created MIG |
 | mig\_name | The name of the MIG |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/gh-runner-mig-container-vm-simple/README.md b/examples/gh-runner-mig-container-vm-simple/README.md
index 1a5631b..732596f 100644
--- a/examples/gh-runner-mig-container-vm-simple/README.md
+++ b/examples/gh-runner-mig-container-vm-simple/README.md
@@ -61,4 +61,4 @@ $ terraform apply
 | mig\_name | The name of the MIG |
 | service\_account | Service account email for GCE |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/gh-runner-mig-native-packer/README.md b/examples/gh-runner-mig-native-packer/README.md
index 4fba080..0dd35ef 100644
--- a/examples/gh-runner-mig-native-packer/README.md
+++ b/examples/gh-runner-mig-native-packer/README.md
@@ -84,4 +84,4 @@ $ terraform apply
 | mig\_name | The name of the MIG |
 | service\_account | Service account email for GCE |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/gh-runner-mig-native-simple/README.md b/examples/gh-runner-mig-native-simple/README.md
index f5c2ad2..306cea4 100644
--- a/examples/gh-runner-mig-native-simple/README.md
+++ b/examples/gh-runner-mig-native-simple/README.md
@@ -51,4 +51,4 @@ $ terraform apply
 | mig\_name | The name of the MIG |
 | service\_account | Service account email for GCE |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/oidc-simple/README.md b/examples/oidc-simple/README.md
index f06f980..5db4229 100644
--- a/examples/oidc-simple/README.md
+++ b/examples/oidc-simple/README.md
@@ -19,4 +19,4 @@ This example showcases how to configure [Workload Identity Federation](https://c
 | provider\_name | Provider name |
 | sa\_email | Example SA email |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/modules/gh-oidc/README.md b/modules/gh-oidc/README.md
index 0572dc6..9cafd5e 100644
--- a/modules/gh-oidc/README.md
+++ b/modules/gh-oidc/README.md
@@ -89,7 +89,7 @@ jobs:
 | pool\_name | Pool name |
 | provider\_name | Provider name |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Requirements
 
diff --git a/modules/gh-runner-gke/README.md b/modules/gh-runner-gke/README.md
index bd83241..d35a185 100644
--- a/modules/gh-runner-gke/README.md
+++ b/modules/gh-runner-gke/README.md
@@ -59,7 +59,7 @@ This example shows how to deploy a simple GKE Self Hosted Runner.
 | service\_account | The default service account used for running nodes. |
 | subnet\_name | Name of VPC |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Requirements
 
diff --git a/modules/gh-runner-mig-container-vm/README.md b/modules/gh-runner-mig-container-vm/README.md
index 0888b64..f08391c 100644
--- a/modules/gh-runner-mig-container-vm/README.md
+++ b/modules/gh-runner-mig-container-vm/README.md
@@ -57,7 +57,7 @@ This example shows how to deploy a Self Hosted Runner on MIG Container VMs.
 | service\_account | Service account email for GCE |
 | subnet\_name | Name of VPC |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Requirements
 
diff --git a/modules/gh-runner-mig-vm/README.md b/modules/gh-runner-mig-vm/README.md
index b18a333..2e6f9b1 100644
--- a/modules/gh-runner-mig-vm/README.md
+++ b/modules/gh-runner-mig-vm/README.md
@@ -63,7 +63,7 @@ This example shows how to deploy a MIG Self Hosted Runner with an image pre-bake
 | service\_account | Service account email for GCE |
 | subnet\_name | Name of VPC |
 
- <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Requirements