diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb2efdda..c66de431e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,19 @@
 # Changelog
 
+## 4.0.2 (June 14, 2023)
+
+### NEW - RESOURCES, DATA SOURCES, PROPERTIES, ATTRIBUTES, ENV VARS:
+* New resource `okta_email_domain` and `okta_email_domain_verification` [#1588](https://github.com/okta/terraform-provider-okta/pull/1588). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
+
+### BUG FIXES
+* Fix the issue of refresh token could not be removed[#1586](https://github.com/okta/terraform-provider-okta/pull/1586). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
+* Fix empty value in refresh_token_leeway when not set [#1596](https://github.com/okta/terraform-provider-okta/pull/1596). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
+
 ## 4.0.1 (June 5, 2023)
 
 ### BUG FIXES
 * Add engine check solving the classic org issue [#1559](https://github.com/okta/terraform-provider-okta/pull/1559). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
-* Add skip users and skip group back to app datasource[#1562](https://github.com/okta/terraform-provider-okta/pull/1562). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
+* Add skip users and skip group back to app datasource [#1562](https://github.com/okta/terraform-provider-okta/pull/1562). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
 * Correct Okta policy rule profile enrollment resource drift issue [#1572](https://github.com/okta/terraform-provider-okta/pull/1572). Thanks, [@monde](https://github.com/monde)!
 
 
diff --git a/okta/config.go b/okta/config.go
index 021a7d6cc..5a332bc0d 100644
--- a/okta/config.go
+++ b/okta/config.go
@@ -160,7 +160,7 @@ func oktaSDKClient(c *Config) (client *sdk.Client, err error) {
 		sdk.WithRateLimitMaxBackOff(int64(c.maxWait)),
 		sdk.WithRequestTimeout(int64(c.requestTimeout)),
 		sdk.WithRateLimitMaxRetries(int32(c.retryCount)),
-		sdk.WithUserAgentExtra("okta-terraform/4.0.1"),
+		sdk.WithUserAgentExtra("okta-terraform/4.0.2"),
 	}
 
 	switch {
diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
index 2e8cfc819..c719392aa 100644
--- a/website/docs/index.html.markdown
+++ b/website/docs/index.html.markdown
@@ -24,7 +24,7 @@ terraform {
   required_providers {
     okta = {
       source = "okta/okta"
-      version = "~> 4.0.1"
+      version = "~> 4.0.2"
     }
   }
 }
diff --git a/website/docs/r/email_domain.html.markdown b/website/docs/r/email_domain.html.markdown
new file mode 100644
index 000000000..63d43c0b8
--- /dev/null
+++ b/website/docs/r/email_domain.html.markdown
@@ -0,0 +1,54 @@
+---
+layout: 'okta'
+page_title: 'Okta: okta_email_domain'
+sidebar_current: 'docs-okta-resource-email-domain'
+description: |-
+  Creates email domain.
+---
+
+# okta_email_domain
+
+This resource allows you to create and configure an email domain.
+
+## Example Usage
+
+```hcl
+resource "okta_email_domain" "example" {
+  brand_id     = "abc123"
+  domain       = "example.com"
+  display_name = "test"
+  user_name    = "paul_atreides"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+- `brand_id` - (Required) Brand id of the email domain.
+
+- `domain` - (Required) Mail domain to send from.
+
+- `display_name` - (Required) Display name of the email domain.
+
+- `user_name` - (Required) User name of the email domain.
+
+## Attributes Reference
+
+- `id` - ID of the sender.
+
+- `validation_status` - Status of the email domain (shows whether the domain is verified).
+
+- `dns_validation_records` - TXT and CNAME records to be registered for the domain.
+  - `fqdn` - DNS record name.
+  - `record_type` - Record type can be TXT or cname.
+  - `value` - DNS record values
+  - `expiration ` - DNS TXT record expiration
+
+## Import
+
+Custom email domain can be imported via the Okta ID.
+
+```
+$ terraform import okta_email_domain.example <domain id>
+```
diff --git a/website/docs/r/email_domain_verification.html.markdown b/website/docs/r/email_domain_verification.html.markdown
new file mode 100644
index 000000000..cc070f209
--- /dev/null
+++ b/website/docs/r/email_domain_verification.html.markdown
@@ -0,0 +1,36 @@
+---
+layout: 'okta' 
+page_title: 'Okta: okta_email_domain_verification' 
+sidebar_current: 'docs-okta-resource-email-domain-verification'
+description: |-
+  Verifies the email domain.
+---
+
+# okta_email_domain_verification
+
+Verifies the email domain. The resource won't be created if the email domain could not be verified.
+
+## Example Usage
+
+```hcl
+resource "okta_email_domain" "example" {
+  brand_id     = "abc123"
+  domain       = "example.com"
+  display_name = "test"
+  user_name    = "paul_atreides"
+}
+
+resource "okta_email_domain_verification" "example" {
+  email_domain_id = okta_email_domain.valid.id
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+- `email_domain_id` - (Required) Email domain ID.
+
+## Import
+
+This resource does not support importing.