diff --git a/build/terraform-beta b/build/terraform-beta
index 88fec38ce79c..9829eed7951e 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit 88fec38ce79c1a9dc9947da39f21364ba962e30f
+Subproject commit 9829eed7951e361f425b80d3f3111c137a2301c8
diff --git a/products/securityscanner/terraform.yaml b/products/securityscanner/terraform.yaml
index a40e142ff064..66e7a5436f98 100644
--- a/products/securityscanner/terraform.yaml
+++ b/products/securityscanner/terraform.yaml
@@ -28,8 +28,10 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           function: 'validation.IntBetween(5, 20)'
       authentication.googleAccount.password: !ruby/object:Overrides::Terraform::PropertyOverride
         sensitive: true
+        custom_flatten: 'templates/terraform/custom_flatten/scan_config_auth_custom_password.go.erb'
       authentication.customAccount.password: !ruby/object:Overrides::Terraform::PropertyOverride
         sensitive: true
+        custom_flatten: 'templates/terraform/custom_flatten/scan_config_auth_google_password.go.erb'
       schedule: !ruby/object:Overrides::Terraform::PropertyOverride
         properties:
           scheduleTime: !ruby/object:Overrides::Terraform::PropertyOverride
diff --git a/templates/terraform/custom_flatten/scan_config_auth_custom_password.go.erb b/templates/terraform/custom_flatten/scan_config_auth_custom_password.go.erb
new file mode 100644
index 000000000000..977df61ba287
--- /dev/null
+++ b/templates/terraform/custom_flatten/scan_config_auth_custom_password.go.erb
@@ -0,0 +1,3 @@
+func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData) interface{} {
+	return d.Get("authentication.0.custom_account.0.password")
+}
diff --git a/templates/terraform/custom_flatten/scan_config_auth_google_password.go.erb b/templates/terraform/custom_flatten/scan_config_auth_google_password.go.erb
new file mode 100644
index 000000000000..0bcd6004ae7c
--- /dev/null
+++ b/templates/terraform/custom_flatten/scan_config_auth_google_password.go.erb
@@ -0,0 +1,3 @@
+func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData) interface{} {
+	return d.Get("authentication.0.google_account.0.password")
+}