diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 34b91dc2d..2a848b77e 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.8.0
+          terraform_version: 1.8.5
 
       - name: Terraform fmt
         id: fmt
@@ -46,7 +46,7 @@ jobs:
       - uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.8.0
+          terraform_version: 1.8.5
 
       - name: Terraform init
         id: init
diff --git a/terraform/gcp/modules/argocd/versions.tf b/terraform/gcp/modules/argocd/versions.tf
index f45fca6a8..bf2278063 100644
--- a/terraform/gcp/modules/argocd/versions.tf
+++ b/terraform/gcp/modules/argocd/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     kubectl = {
diff --git a/terraform/gcp/modules/audit/versions.tf b/terraform/gcp/modules/audit/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/audit/versions.tf
+++ b/terraform/gcp/modules/audit/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/bastion/versions.tf b/terraform/gcp/modules/bastion/versions.tf
index 88ae212db..e9844daed 100644
--- a/terraform/gcp/modules/bastion/versions.tf
+++ b/terraform/gcp/modules/bastion/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/ca/versions.tf b/terraform/gcp/modules/ca/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/ca/versions.tf
+++ b/terraform/gcp/modules/ca/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/ctlog/versions.tf b/terraform/gcp/modules/ctlog/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/ctlog/versions.tf
+++ b/terraform/gcp/modules/ctlog/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/dex/versions.tf b/terraform/gcp/modules/dex/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/dex/versions.tf
+++ b/terraform/gcp/modules/dex/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/external_secrets/versions.tf b/terraform/gcp/modules/external_secrets/versions.tf
index 7c59fcb7e..9bdba1208 100644
--- a/terraform/gcp/modules/external_secrets/versions.tf
+++ b/terraform/gcp/modules/external_secrets/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/fulcio/versions.tf b/terraform/gcp/modules/fulcio/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/fulcio/versions.tf
+++ b/terraform/gcp/modules/fulcio/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/gke_cluster/versions.tf b/terraform/gcp/modules/gke_cluster/versions.tf
index c9e847f48..14f01dd55 100644
--- a/terraform/gcp/modules/gke_cluster/versions.tf
+++ b/terraform/gcp/modules/gke_cluster/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/dex/versions.tf b/terraform/gcp/modules/monitoring/dex/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/dex/versions.tf
+++ b/terraform/gcp/modules/monitoring/dex/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/fulcio/versions.tf b/terraform/gcp/modules/monitoring/fulcio/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/fulcio/versions.tf
+++ b/terraform/gcp/modules/monitoring/fulcio/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/infra/versions.tf b/terraform/gcp/modules/monitoring/infra/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/infra/versions.tf
+++ b/terraform/gcp/modules/monitoring/infra/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/prober/versions.tf b/terraform/gcp/modules/monitoring/prober/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/prober/versions.tf
+++ b/terraform/gcp/modules/monitoring/prober/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/rekor/versions.tf b/terraform/gcp/modules/monitoring/rekor/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/rekor/versions.tf
+++ b/terraform/gcp/modules/monitoring/rekor/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/slo/versions.tf b/terraform/gcp/modules/monitoring/slo/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/slo/versions.tf
+++ b/terraform/gcp/modules/monitoring/slo/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/versions.tf b/terraform/gcp/modules/monitoring/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/monitoring/versions.tf
+++ b/terraform/gcp/modules/monitoring/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/mysql-shard/versions.tf b/terraform/gcp/modules/mysql-shard/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/mysql-shard/versions.tf
+++ b/terraform/gcp/modules/mysql-shard/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/mysql/versions.tf b/terraform/gcp/modules/mysql/versions.tf
index 88ae212db..e9844daed 100644
--- a/terraform/gcp/modules/mysql/versions.tf
+++ b/terraform/gcp/modules/mysql/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/network/versions.tf b/terraform/gcp/modules/network/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/network/versions.tf
+++ b/terraform/gcp/modules/network/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/oslogin/versions.tf b/terraform/gcp/modules/oslogin/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/oslogin/versions.tf
+++ b/terraform/gcp/modules/oslogin/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/project_roles/versions.tf b/terraform/gcp/modules/project_roles/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/project_roles/versions.tf
+++ b/terraform/gcp/modules/project_roles/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/redis/versions.tf b/terraform/gcp/modules/redis/versions.tf
index 88ae212db..e9844daed 100644
--- a/terraform/gcp/modules/redis/versions.tf
+++ b/terraform/gcp/modules/redis/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/rekor/versions.tf b/terraform/gcp/modules/rekor/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/rekor/versions.tf
+++ b/terraform/gcp/modules/rekor/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/sigstore/versions.tf b/terraform/gcp/modules/sigstore/versions.tf
index 81a45b4fa..a71a06558 100644
--- a/terraform/gcp/modules/sigstore/versions.tf
+++ b/terraform/gcp/modules/sigstore/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/timestamp/versions.tf b/terraform/gcp/modules/timestamp/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/timestamp/versions.tf
+++ b/terraform/gcp/modules/timestamp/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/tuf/versions.tf b/terraform/gcp/modules/tuf/versions.tf
index 4d75953db..7f1b59005 100644
--- a/terraform/gcp/modules/tuf/versions.tf
+++ b/terraform/gcp/modules/tuf/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {