diff --git a/README.md b/README.md
index c251e9e..87e9d78 100644
--- a/README.md
+++ b/README.md
@@ -50,16 +50,16 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_collaborator_auth_policy"></a> [collaborator\_auth\_policy](#input\_collaborator\_auth\_policy) | Authentication policy | `string` | `null` | no |
-| <a name="input_cost_estimation_enabled"></a> [cost\_estimation\_enabled](#input\_cost\_estimation\_enabled) | Whether or not the cost estimation feature is enabled for all workspaces in the organization | `string` | `null` | no |
+| <a name="input_collaborator_auth_policy"></a> [collaborator\_auth\_policy](#input\_collaborator\_auth\_policy) | Authentication policy | `string` | `"password"` | no |
+| <a name="input_cost_estimation_enabled"></a> [cost\_estimation\_enabled](#input\_cost\_estimation\_enabled) | Whether or not the cost estimation feature is enabled for all workspaces in the organization | `bool` | `false` | no |
 | <a name="input_email"></a> [email](#input\_email) | Admin email address | `string` | n/a | yes |
 | <a name="input_force_regenerate"></a> [force\_regenerate](#input\_force\_regenerate) | If set to true, a new token will be generated even if a token already exists | `bool` | `false` | no |
 | <a name="input_members"></a> [members](#input\_members) | Email of the users to add | `list(string)` | `[]` | no |
 | <a name="input_name"></a> [name](#input\_name) | Name of the organization | `string` | n/a | yes |
 | <a name="input_owners_team_saml_role_id"></a> [owners\_team\_saml\_role\_id](#input\_owners\_team\_saml\_role\_id) | The name of the 'owners' team | `string` | `null` | no |
 | <a name="input_send_passing_statuses_for_untriggered_speculative_plans"></a> [send\_passing\_statuses\_for\_untriggered\_speculative\_plans](#input\_send\_passing\_statuses\_for\_untriggered\_speculative\_plans) | Whether or not to send VCS status updates for untriggered speculative plans | `bool` | `false` | no |
-| <a name="input_session_remember_minutes"></a> [session\_remember\_minutes](#input\_session\_remember\_minutes) | Session expiration | `number` | `null` | no |
-| <a name="input_session_timeout_minutes"></a> [session\_timeout\_minutes](#input\_session\_timeout\_minutes) | Session timeout after inactivity | `number` | `null` | no |
+| <a name="input_session_remember_minutes"></a> [session\_remember\_minutes](#input\_session\_remember\_minutes) | Session expiration | `number` | `20160` | no |
+| <a name="input_session_timeout_minutes"></a> [session\_timeout\_minutes](#input\_session\_timeout\_minutes) | Session timeout after inactivity | `number` | `20160` | no |
 
 ## Outputs
 
diff --git a/variables.tf b/variables.tf
index 3a1bd86..5bfebfd 100644
--- a/variables.tf
+++ b/variables.tf
@@ -10,19 +10,19 @@ variable "email" {
 
 variable "session_timeout_minutes" {
   type        = number
-  default     = null
+  default     = 20160
   description = "Session timeout after inactivity"
 }
 
 variable "session_remember_minutes" {
   type        = number
-  default     = null
+  default     = 20160
   description = "Session expiration"
 }
 
 variable "collaborator_auth_policy" {
   type        = string
-  default     = null
+  default     = "password"
   description = "Authentication policy"
 }
 
@@ -33,8 +33,8 @@ variable "owners_team_saml_role_id" {
 }
 
 variable "cost_estimation_enabled" {
-  type        = string
-  default     = null
+  type        = bool
+  default     = false
   description = "Whether or not the cost estimation feature is enabled for all workspaces in the organization"
 }