diff --git a/infra/README.md b/infra/README.md
index 016027fe..977d1d65 100644
--- a/infra/README.md
+++ b/infra/README.md
@@ -48,7 +48,7 @@ Functional examples are included in the
 | database\_name | Cloud SQL database name | `string` | `"django"` | no |
 | database\_username | Cloud SQL database name | `string` | `"server"` | no |
 | enable\_apis | Whether or not to enable underlying apis in this solution. | `bool` | `true` | no |
-| image\_version | Version of the Container Registry image to use | `string` | `"v1.8.1"` | no |
+| image\_version | Version of the Container Registry image to use | `string` | `"v1.8.2"` | no |
 | init | Initialize database? | `bool` | `true` | no |
 | instance\_name | Cloud SQL Instance name | `string` | `"psql"` | no |
 | labels | A set of key/value label pairs to assign to the resources deployed by this blueprint. | `map(string)` | `{}` | no |
diff --git a/infra/metadata.yaml b/infra/metadata.yaml
index 890f7e66..04c0cd4c 100644
--- a/infra/metadata.yaml
+++ b/infra/metadata.yaml
@@ -69,7 +69,7 @@ spec:
     - name: image_version
       description: Version of the Container Registry image to use
       varType: string
-      defaultValue: v1.8.1
+      defaultValue: v1.8.2
     - name: init
       description: Initialize database?
       varType: bool
diff --git a/infra/service.tf b/infra/service.tf
index 109fa24b..784cad56 100644
--- a/infra/service.tf
+++ b/infra/service.tf
@@ -54,6 +54,11 @@ resource "google_cloud_run_v2_service" "server" {
         name  = "OTEL_PYTHON_EXCLUDED_URLS"
         value = "healthy"
       }
+      # Supply the custom suffix, if used, to support automated CSRF code in application settings
+      env {
+        name  = "DEPLOYMENT_SUFFIX"
+        value = var.random_suffix ? random_id.suffix.hex : ""
+      }
       volume_mounts {
         name       = "cloudsql"
         mount_path = "/cloudsql"
diff --git a/infra/variables.tf b/infra/variables.tf
index 76e8e001..b7845fc9 100644
--- a/infra/variables.tf
+++ b/infra/variables.tf
@@ -61,7 +61,7 @@ variable "init" {
 
 variable "image_version" {
   type        = string
-  default     = "v1.8.1"
+  default     = "v1.8.2"
   description = "Version of the Container Registry image to use"
 }