diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
index 9b8e3a0a..f77bd5ae 100644
--- a/autogen/versions.tf.tmpl
+++ b/autogen/versions.tf.tmpl
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/metadata.yaml b/metadata.yaml
index e5aed4e9..4f969a7a 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -340,13 +340,13 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/storage.admin
+          - roles/compute.admin
           - roles/run.admin
           - roles/iam.serviceAccountUser
           - roles/certificatemanager.owner
           - roles/vpcaccess.admin
           - roles/iam.serviceAccountAdmin
-          - roles/storage.admin
-          - roles/compute.admin
     services:
       - certificatemanager.googleapis.com
       - cloudresourcemanager.googleapis.com
@@ -358,8 +358,8 @@ spec:
       - vpcaccess.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/random
         version: ">= 2.1"
diff --git a/modules/backend/metadata.yaml b/modules/backend/metadata.yaml
index 7bf2bad0..f9208f5f 100644
--- a/modules/backend/metadata.yaml
+++ b/modules/backend/metadata.yaml
@@ -350,13 +350,13 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/compute.admin
           - roles/storage.admin
           - roles/run.admin
           - roles/compute.networkAdmin
           - roles/iap.admin
           - roles/iam.serviceAccountUser
           - roles/iam.serviceAccountAdmin
-          - roles/compute.admin
     services:
       - cloudresourcemanager.googleapis.com
       - compute.googleapis.com
@@ -366,8 +366,8 @@ spec:
       - vpcaccess.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/random
         version: ">= 2.1"
diff --git a/modules/backend/versions.tf b/modules/backend/versions.tf
index 68c7dedd..3ea49d48 100644
--- a/modules/backend/versions.tf
+++ b/modules/backend/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/modules/dynamic_backends/metadata.yaml b/modules/dynamic_backends/metadata.yaml
index 9b1c3c81..c272b40e 100644
--- a/modules/dynamic_backends/metadata.yaml
+++ b/modules/dynamic_backends/metadata.yaml
@@ -332,13 +332,13 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/run.admin
-          - roles/iam.serviceAccountUser
           - roles/certificatemanager.owner
           - roles/vpcaccess.admin
           - roles/iam.serviceAccountAdmin
           - roles/storage.admin
           - roles/compute.admin
+          - roles/run.admin
+          - roles/iam.serviceAccountUser
     services:
       - certificatemanager.googleapis.com
       - cloudresourcemanager.googleapis.com
@@ -350,8 +350,8 @@ spec:
       - vpcaccess.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/random
         version: ">= 2.1"
diff --git a/modules/dynamic_backends/versions.tf b/modules/dynamic_backends/versions.tf
index 0b79715d..62dcd7bc 100644
--- a/modules/dynamic_backends/versions.tf
+++ b/modules/dynamic_backends/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/modules/frontend/metadata.yaml b/modules/frontend/metadata.yaml
index e82d3870..bb4b18a9 100644
--- a/modules/frontend/metadata.yaml
+++ b/modules/frontend/metadata.yaml
@@ -260,8 +260,8 @@ spec:
       - storage-api.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/random
         version: ">= 2.1"
diff --git a/modules/frontend/versions.tf b/modules/frontend/versions.tf
index 9ae1d0d2..bcfef2d5 100644
--- a/modules/frontend/versions.tf
+++ b/modules/frontend/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/modules/serverless_negs/metadata.yaml b/modules/serverless_negs/metadata.yaml
index ea655a67..d167a717 100644
--- a/modules/serverless_negs/metadata.yaml
+++ b/modules/serverless_negs/metadata.yaml
@@ -296,13 +296,13 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/certificatemanager.owner
-          - roles/vpcaccess.admin
-          - roles/iam.serviceAccountAdmin
           - roles/storage.admin
           - roles/compute.admin
           - roles/run.admin
           - roles/iam.serviceAccountUser
+          - roles/certificatemanager.owner
+          - roles/vpcaccess.admin
+          - roles/iam.serviceAccountAdmin
     services:
       - certificatemanager.googleapis.com
       - cloudresourcemanager.googleapis.com
@@ -314,8 +314,8 @@ spec:
       - vpcaccess.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.0, < 7"
+        version: ">= 6.0, < 8"
       - source: hashicorp/random
         version: ">= 2.1"
diff --git a/modules/serverless_negs/versions.tf b/modules/serverless_negs/versions.tf
index 7c6082bf..f22b121c 100644
--- a/modules/serverless_negs/versions.tf
+++ b/modules/serverless_negs/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/versions.tf b/versions.tf
index f4fe3daa..d2a595c5 100644
--- a/versions.tf
+++ b/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
     random = {
       source  = "hashicorp/random"