diff --git a/README.md b/README.md
index 4f96b66..07ee99f 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,8 @@ module "pubsub" {
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| bigquery\_subscriptions | The list of the Bigquery push subscriptions. | <pre>list(object({<br>    name                       = string,<br>    table                      = string,<br>    use_topic_schema           = optional(bool),<br>    use_table_schema           = optional(bool),<br>    write_metadata             = optional(bool),<br>    drop_unknown_fields        = optional(bool),<br>    ack_deadline_seconds       = optional(number),<br>    retain_acked_messages      = optional(bool),<br>    message_retention_duration = optional(string),<br>    enable_message_ordering    = optional(bool),<br>    expiration_policy          = optional(string),<br>    filter                     = optional(string),<br>    dead_letter_topic          = optional(string),<br>    maximum_backoff            = optional(string),<br>    minimum_backoff            = optional(string)<br>  }))</pre> | `[]` | no |
-| cloud\_storage\_subscriptions | The list of the Cloud Storage push subscriptions. | <pre>list(object({<br>    name                       = string,<br>    bucket                     = string,<br>    filename_prefix            = optional(string),<br>    filename_suffix            = optional(string),<br>    filename_datetime_format   = optional(string),<br>    max_duration               = optional(string),<br>    max_bytes                  = optional(string),<br>    max_messages               = optional(string),<br>    output_format              = optional(string),<br>    write_metadata             = optional(bool),<br>    use_topic_schema           = optional(bool),<br>    ack_deadline_seconds       = optional(number),<br>    retain_acked_messages      = optional(bool),<br>    message_retention_duration = optional(string),<br>    enable_message_ordering    = optional(bool),<br>    expiration_policy          = optional(string),<br>    filter                     = optional(string),<br>    dead_letter_topic          = optional(string),<br>    maximum_backoff            = optional(string),<br>    minimum_backoff            = optional(string)<br>  }))</pre> | `[]` | no |
+| bigquery\_subscriptions | The list of the Bigquery push subscriptions. | <pre>list(object({<br>    name                       = string,<br>    table                      = string,<br>    use_topic_schema           = optional(bool),<br>    use_table_schema           = optional(bool),<br>    write_metadata             = optional(bool),<br>    drop_unknown_fields        = optional(bool),<br>    ack_deadline_seconds       = optional(number),<br>    retain_acked_messages      = optional(bool),<br>    message_retention_duration = optional(string),<br>    enable_message_ordering    = optional(bool),<br>    expiration_policy          = optional(string),<br>    filter                     = optional(string),<br>    dead_letter_topic          = optional(string),<br>    max_delivery_attempts      = optional(number),<br>    maximum_backoff            = optional(string),<br>    minimum_backoff            = optional(string)<br>  }))</pre> | `[]` | no |
+| cloud\_storage\_subscriptions | The list of the Cloud Storage push subscriptions. | <pre>list(object({<br>    name                       = string,<br>    bucket                     = string,<br>    filename_prefix            = optional(string),<br>    filename_suffix            = optional(string),<br>    filename_datetime_format   = optional(string),<br>    max_duration               = optional(string),<br>    max_bytes                  = optional(string),<br>    max_messages               = optional(string),<br>    output_format              = optional(string),<br>    write_metadata             = optional(bool),<br>    use_topic_schema           = optional(bool),<br>    ack_deadline_seconds       = optional(number),<br>    retain_acked_messages      = optional(bool),<br>    message_retention_duration = optional(string),<br>    enable_message_ordering    = optional(bool),<br>    expiration_policy          = optional(string),<br>    filter                     = optional(string),<br>    dead_letter_topic          = optional(string),<br>    max_delivery_attempts      = optional(number),<br>    maximum_backoff            = optional(string),<br>    minimum_backoff            = optional(string)<br>  }))</pre> | `[]` | no |
 | create\_subscriptions | Specify true if you want to create subscriptions. | `bool` | `true` | no |
 | create\_topic | Specify true if you want to create a topic. | `bool` | `true` | no |
 | grant\_bigquery\_project\_roles | Specify true if you want to add bigquery.metadataViewer and bigquery.dataEditor roles to the default Pub/Sub SA. | `bool` | `true` | no |
diff --git a/metadata.yaml b/metadata.yaml
index 8bf4987..5121ae4 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -76,24 +76,7 @@ spec:
         defaultValue: {}
       - name: push_subscriptions
         description: The list of the push subscriptions.
-        varType: |-
-          list(object({
-              name                       = string,
-              ack_deadline_seconds       = optional(number),
-              push_endpoint              = optional(string),
-              x-goog-version             = optional(string),
-              oidc_service_account_email = optional(string),
-              audience                   = optional(string),
-              expiration_policy          = optional(string),
-              dead_letter_topic          = optional(string),
-              retain_acked_messages      = optional(bool),
-              message_retention_duration = optional(string),
-              max_delivery_attempts      = optional(number),
-              maximum_backoff            = optional(string),
-              minimum_backoff            = optional(string),
-              filter                     = optional(string),
-              enable_message_ordering    = optional(bool),
-            }))
+        varType: "list(object({\r\n    name                       = string,\r\n    ack_deadline_seconds       = optional(number),\r\n    push_endpoint              = optional(string),\r\n    x-goog-version             = optional(string),\r\n    oidc_service_account_email = optional(string),\r\n    audience                   = optional(string),\r\n    expiration_policy          = optional(string),\r\n    dead_letter_topic          = optional(string),\r\n    retain_acked_messages      = optional(bool),\r\n    message_retention_duration = optional(string),\r\n    max_delivery_attempts      = optional(number),\r\n    maximum_backoff            = optional(string),\r\n    minimum_backoff            = optional(string),\r\n    filter                     = optional(string),\r\n    enable_message_ordering    = optional(bool),\r\n  }))"
         defaultValue: []
         connections:
           - source:
@@ -103,43 +86,11 @@ spec:
               outputExpr: "{ \"name\": service_name, \"push_endpoint\": service_uri, \"oidc_service_account_email\": service_account_id.email }"
       - name: pull_subscriptions
         description: The list of the pull subscriptions.
-        varType: |-
-          list(object({
-              name                         = string,
-              ack_deadline_seconds         = optional(number),
-              expiration_policy            = optional(string),
-              dead_letter_topic            = optional(string),
-              max_delivery_attempts        = optional(number),
-              retain_acked_messages        = optional(bool),
-              message_retention_duration   = optional(string),
-              maximum_backoff              = optional(string),
-              minimum_backoff              = optional(string),
-              filter                       = optional(string),
-              enable_message_ordering      = optional(bool),
-              service_account              = optional(string),
-              enable_exactly_once_delivery = optional(bool),
-            }))
+        varType: "list(object({\r\n    name                         = string,\r\n    ack_deadline_seconds         = optional(number),\r\n    expiration_policy            = optional(string),\r\n    dead_letter_topic            = optional(string),\r\n    max_delivery_attempts        = optional(number),\r\n    retain_acked_messages        = optional(bool),\r\n    message_retention_duration   = optional(string),\r\n    maximum_backoff              = optional(string),\r\n    minimum_backoff              = optional(string),\r\n    filter                       = optional(string),\r\n    enable_message_ordering      = optional(bool),\r\n    service_account              = optional(string),\r\n    enable_exactly_once_delivery = optional(bool),\r\n  }))"
         defaultValue: []
       - name: bigquery_subscriptions
         description: The list of the Bigquery push subscriptions.
-        varType: |-
-          list(object({
-              name                       = string,
-              table                      = string,
-              use_topic_schema           = optional(bool),
-              use_table_schema           = optional(bool),
-              write_metadata             = optional(bool),
-              drop_unknown_fields        = optional(bool),
-              ack_deadline_seconds       = optional(number),
-              retain_acked_messages      = optional(bool),
-              message_retention_duration = optional(string),
-              enable_message_ordering    = optional(bool),
-              expiration_policy          = optional(string),
-              filter                     = optional(string),
-              dead_letter_topic          = optional(string),
-              maximum_backoff            = optional(string),
-              minimum_backoff            = optional(string)
-            }))
+        varType: "list(object({\r\n    name                       = string,\r\n    table                      = string,\r\n    use_topic_schema           = optional(bool),\r\n    use_table_schema           = optional(bool),\r\n    write_metadata             = optional(bool),\r\n    drop_unknown_fields        = optional(bool),\r\n    ack_deadline_seconds       = optional(number),\r\n    retain_acked_messages      = optional(bool),\r\n    message_retention_duration = optional(string),\r\n    enable_message_ordering    = optional(bool),\r\n    expiration_policy          = optional(string),\r\n    filter                     = optional(string),\r\n    dead_letter_topic          = optional(string),\r\n    max_delivery_attempts      = optional(number),\r\n    maximum_backoff            = optional(string),\r\n    minimum_backoff            = optional(string)\r\n  }))"
         defaultValue: []
         connections:
           - source:
@@ -149,29 +100,7 @@ spec:
               outputExpr: "{ \"name\": external_table_ids[0], \"table\": external_table_ids[0]}"
       - name: cloud_storage_subscriptions
         description: The list of the Cloud Storage push subscriptions.
-        varType: |-
-          list(object({
-              name                       = string,
-              bucket                     = string,
-              filename_prefix            = optional(string),
-              filename_suffix            = optional(string),
-              filename_datetime_format   = optional(string),
-              max_duration               = optional(string),
-              max_bytes                  = optional(string),
-              max_messages               = optional(string),
-              output_format              = optional(string),
-              write_metadata             = optional(bool),
-              use_topic_schema           = optional(bool),
-              ack_deadline_seconds       = optional(number),
-              retain_acked_messages      = optional(bool),
-              message_retention_duration = optional(string),
-              enable_message_ordering    = optional(bool),
-              expiration_policy          = optional(string),
-              filter                     = optional(string),
-              dead_letter_topic          = optional(string),
-              maximum_backoff            = optional(string),
-              minimum_backoff            = optional(string)
-            }))
+        varType: "list(object({\r\n    name                       = string,\r\n    bucket                     = string,\r\n    filename_prefix            = optional(string),\r\n    filename_suffix            = optional(string),\r\n    filename_datetime_format   = optional(string),\r\n    max_duration               = optional(string),\r\n    max_bytes                  = optional(string),\r\n    max_messages               = optional(string),\r\n    output_format              = optional(string),\r\n    write_metadata             = optional(bool),\r\n    use_topic_schema           = optional(bool),\r\n    ack_deadline_seconds       = optional(number),\r\n    retain_acked_messages      = optional(bool),\r\n    message_retention_duration = optional(string),\r\n    enable_message_ordering    = optional(bool),\r\n    expiration_policy          = optional(string),\r\n    filter                     = optional(string),\r\n    dead_letter_topic          = optional(string),\r\n    max_delivery_attempts      = optional(number),\r\n    maximum_backoff            = optional(string),\r\n    minimum_backoff            = optional(string)\r\n  }))"
         defaultValue: []
         connections:
           - source:
@@ -203,13 +132,7 @@ spec:
         defaultValue: true
       - name: schema
         description: Schema for the topic.
-        varType: |-
-          object({
-              name       = string
-              type       = string
-              definition = string
-              encoding   = string
-            })
+        varType: "object({\r\n    name       = string\r\n    type       = string\r\n    definition = string\r\n    encoding   = string\r\n  })"
     outputs:
       - name: id
         description: The ID of the Pub/Sub topic
diff --git a/variables.tf b/variables.tf
index 5e6c5b4..9f07a74 100644
--- a/variables.tf
+++ b/variables.tf
@@ -98,6 +98,7 @@ variable "bigquery_subscriptions" {
     expiration_policy          = optional(string),
     filter                     = optional(string),
     dead_letter_topic          = optional(string),
+    max_delivery_attempts      = optional(number),
     maximum_backoff            = optional(string),
     minimum_backoff            = optional(string)
   }))
@@ -125,6 +126,7 @@ variable "cloud_storage_subscriptions" {
     expiration_policy          = optional(string),
     filter                     = optional(string),
     dead_letter_topic          = optional(string),
+    max_delivery_attempts      = optional(number),
     maximum_backoff            = optional(string),
     minimum_backoff            = optional(string)
   }))