diff --git a/CHANGELOG-v9.md b/CHANGELOG-v9.md
new file mode 100644
index 00000000..05e2d753
--- /dev/null
+++ b/CHANGELOG-v9.md
@@ -0,0 +1,76 @@
+# Changelog
+
+## [9.4.1](https://github.com/Azure/terraform-azurerm-aks/tree/9.4.1) (2025-02-05)
+
+**Merged pull requests:**
+
+- Revert changes of `9.4.0` [\#635](https://github.com/Azure/terraform-azurerm-aks/pull/635) ([lonegunmanb](https://github.com/lonegunmanb))
+
+## [9.4.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.4.0) (2025-02-05)
+
+**Merged pull requests:**
+
+- Bump azapi provider to \>=2.0, \< 3.0 [\#632](https://github.com/Azure/terraform-azurerm-aks/pull/632) ([zioproto](https://github.com/zioproto))
+- Dependabot 624 626 [\#627](https://github.com/Azure/terraform-azurerm-aks/pull/627) ([zioproto](https://github.com/zioproto))
+- Bump github.com/Azure/terraform-module-test-helper from 0.28.0 to 0.30.0 in /test [\#626](https://github.com/Azure/terraform-azurerm-aks/pull/626) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump github.com/gruntwork-io/terratest from 0.48.0 to 0.48.1 in /test [\#624](https://github.com/Azure/terraform-azurerm-aks/pull/624) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Dependabot changes from PR 609 619 620 [\#621](https://github.com/Azure/terraform-azurerm-aks/pull/621) ([zioproto](https://github.com/zioproto))
+- Bump github.com/Azure/terraform-module-test-helper from 0.27.0 to 0.28.0 in /test [\#620](https://github.com/Azure/terraform-azurerm-aks/pull/620) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump github.com/gruntwork-io/terratest from 0.47.2 to 0.48.0 in /test [\#619](https://github.com/Azure/terraform-azurerm-aks/pull/619) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /test [\#616](https://github.com/Azure/terraform-azurerm-aks/pull/616) ([lonegunmanb](https://github.com/lonegunmanb))
+- Bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /test [\#615](https://github.com/Azure/terraform-azurerm-aks/pull/615) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 in /test [\#609](https://github.com/Azure/terraform-azurerm-aks/pull/609) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [9.3.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.3.0) (2024-12-11)
+
+**Merged pull requests:**
+
+- Support of oms\_agent\_enabled add-on [\#613](https://github.com/Azure/terraform-azurerm-aks/pull/613) ([lonegunmanb](https://github.com/lonegunmanb))
+- Implement node\_network\_profile for default node pool [\#598](https://github.com/Azure/terraform-azurerm-aks/pull/598) ([zioproto](https://github.com/zioproto))
+- Bump examples to AKS 1.30 [\#595](https://github.com/Azure/terraform-azurerm-aks/pull/595) ([zioproto](https://github.com/zioproto))
+- Add `v4` sub-folder so this module could run with AzureRM provider both `v3` and `v4`. [\#594](https://github.com/Azure/terraform-azurerm-aks/pull/594) ([lonegunmanb](https://github.com/lonegunmanb))
+
+## [9.2.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.2.0) (2024-11-07)
+
+**Merged pull requests:**
+
+- Make the Azure Key Vault public because private Key Vault requires preview API [\#599](https://github.com/Azure/terraform-azurerm-aks/pull/599) ([zioproto](https://github.com/zioproto))
+- Bump github.com/Azure/terraform-module-test-helper from 0.25.0 to 0.26.0 in /test [\#593](https://github.com/Azure/terraform-azurerm-aks/pull/593) ([lonegunmanb](https://github.com/lonegunmanb))
+- Use oidc as authentication method [\#592](https://github.com/Azure/terraform-azurerm-aks/pull/592) ([lonegunmanb](https://github.com/lonegunmanb))
+- Update README.md [\#589](https://github.com/Azure/terraform-azurerm-aks/pull/589) ([shailwx](https://github.com/shailwx))
+- Add `cost_analysis_enabled` option [\#583](https://github.com/Azure/terraform-azurerm-aks/pull/583) ([artificial-aidan](https://github.com/artificial-aidan))
+- Bump github.com/Azure/terraform-module-test-helper from 0.24.0 to 0.25.0 in /test [\#581](https://github.com/Azure/terraform-azurerm-aks/pull/581) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump github.com/gruntwork-io/terratest from 0.46.15 to 0.47.0 in /test [\#579](https://github.com/Azure/terraform-azurerm-aks/pull/579) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump github.com/Azure/terraform-module-test-helper from 0.22.0 to 0.24.0 in /test [\#574](https://github.com/Azure/terraform-azurerm-aks/pull/574) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump github.com/hashicorp/go-retryablehttp from 0.7.5 to 0.7.7 in /test [\#562](https://github.com/Azure/terraform-azurerm-aks/pull/562) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [9.1.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.1.0) (2024-07-04)
+
+**Merged pull requests:**
+
+- Downgrade next major version back to v9 [\#577](https://github.com/Azure/terraform-azurerm-aks/pull/577) ([lonegunmanb](https://github.com/lonegunmanb))
+- Restore devcontainer [\#576](https://github.com/Azure/terraform-azurerm-aks/pull/576) ([zioproto](https://github.com/zioproto))
+- set drainTimeoutInMinutes default value to null [\#575](https://github.com/Azure/terraform-azurerm-aks/pull/575) ([zioproto](https://github.com/zioproto))
+- fix README.md format [\#570](https://github.com/Azure/terraform-azurerm-aks/pull/570) ([joaoestrela](https://github.com/joaoestrela))
+- Bump github.com/hashicorp/go-getter from 1.7.4 to 1.7.5 in /test [\#569](https://github.com/Azure/terraform-azurerm-aks/pull/569) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Start new Changelog file for v10 [\#567](https://github.com/Azure/terraform-azurerm-aks/pull/567) ([zioproto](https://github.com/zioproto))
+- fixed inaccurate variable descriptions for azure cni in overlay mode [\#566](https://github.com/Azure/terraform-azurerm-aks/pull/566) ([Xelef2000](https://github.com/Xelef2000))
+- add drain\_timeout\_in\_minutes and node\_soak\_duration\_in\_minutes [\#564](https://github.com/Azure/terraform-azurerm-aks/pull/564) ([zioproto](https://github.com/zioproto))
+
+## [9.0.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.0.0) (2024-06-07)
+
+**Merged pull requests:**
+
+- Compromise on e2e tests involving ingress, since it's not stable [\#558](https://github.com/Azure/terraform-azurerm-aks/pull/558) ([lonegunmanb](https://github.com/lonegunmanb))
+- Add weekly-codeql action [\#555](https://github.com/Azure/terraform-azurerm-aks/pull/555) ([lonegunmanb](https://github.com/lonegunmanb))
+- Change default value for `var.agents_pool_max_surge` to 10% [\#554](https://github.com/Azure/terraform-azurerm-aks/pull/554) ([lonegunmanb](https://github.com/lonegunmanb))
+- Update Microsoft.ContainerService managedClusters API version to 2024-02-01 [\#552](https://github.com/Azure/terraform-azurerm-aks/pull/552) ([olofmattsson-inriver](https://github.com/olofmattsson-inriver))
+- Bump github.com/Azure/terraform-module-test-helper from 0.19.0 to 0.22.0 in /test [\#549](https://github.com/Azure/terraform-azurerm-aks/pull/549) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Amending log analytics attributes [\#548](https://github.com/Azure/terraform-azurerm-aks/pull/548) ([lonegunmanb](https://github.com/lonegunmanb))
+- bump k8s version for example since 1.26 has been deprecated [\#540](https://github.com/Azure/terraform-azurerm-aks/pull/540) ([lonegunmanb](https://github.com/lonegunmanb))
+- fix\(typo\): typo in output variable [\#537](https://github.com/Azure/terraform-azurerm-aks/pull/537) ([mbaykara](https://github.com/mbaykara))
+- Bump github.com/Azure/terraform-module-test-helper from 0.18.0 to 0.19.0 in /test [\#521](https://github.com/Azure/terraform-azurerm-aks/pull/521) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05e2d753..e69de29b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,76 +0,0 @@
-# Changelog
-
-## [9.4.1](https://github.com/Azure/terraform-azurerm-aks/tree/9.4.1) (2025-02-05)
-
-**Merged pull requests:**
-
-- Revert changes of `9.4.0` [\#635](https://github.com/Azure/terraform-azurerm-aks/pull/635) ([lonegunmanb](https://github.com/lonegunmanb))
-
-## [9.4.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.4.0) (2025-02-05)
-
-**Merged pull requests:**
-
-- Bump azapi provider to \>=2.0, \< 3.0 [\#632](https://github.com/Azure/terraform-azurerm-aks/pull/632) ([zioproto](https://github.com/zioproto))
-- Dependabot 624 626 [\#627](https://github.com/Azure/terraform-azurerm-aks/pull/627) ([zioproto](https://github.com/zioproto))
-- Bump github.com/Azure/terraform-module-test-helper from 0.28.0 to 0.30.0 in /test [\#626](https://github.com/Azure/terraform-azurerm-aks/pull/626) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump github.com/gruntwork-io/terratest from 0.48.0 to 0.48.1 in /test [\#624](https://github.com/Azure/terraform-azurerm-aks/pull/624) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Dependabot changes from PR 609 619 620 [\#621](https://github.com/Azure/terraform-azurerm-aks/pull/621) ([zioproto](https://github.com/zioproto))
-- Bump github.com/Azure/terraform-module-test-helper from 0.27.0 to 0.28.0 in /test [\#620](https://github.com/Azure/terraform-azurerm-aks/pull/620) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump github.com/gruntwork-io/terratest from 0.47.2 to 0.48.0 in /test [\#619](https://github.com/Azure/terraform-azurerm-aks/pull/619) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /test [\#616](https://github.com/Azure/terraform-azurerm-aks/pull/616) ([lonegunmanb](https://github.com/lonegunmanb))
-- Bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /test [\#615](https://github.com/Azure/terraform-azurerm-aks/pull/615) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 in /test [\#609](https://github.com/Azure/terraform-azurerm-aks/pull/609) ([dependabot[bot]](https://github.com/apps/dependabot))
-
-## [9.3.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.3.0) (2024-12-11)
-
-**Merged pull requests:**
-
-- Support of oms\_agent\_enabled add-on [\#613](https://github.com/Azure/terraform-azurerm-aks/pull/613) ([lonegunmanb](https://github.com/lonegunmanb))
-- Implement node\_network\_profile for default node pool [\#598](https://github.com/Azure/terraform-azurerm-aks/pull/598) ([zioproto](https://github.com/zioproto))
-- Bump examples to AKS 1.30 [\#595](https://github.com/Azure/terraform-azurerm-aks/pull/595) ([zioproto](https://github.com/zioproto))
-- Add `v4` sub-folder so this module could run with AzureRM provider both `v3` and `v4`. [\#594](https://github.com/Azure/terraform-azurerm-aks/pull/594) ([lonegunmanb](https://github.com/lonegunmanb))
-
-## [9.2.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.2.0) (2024-11-07)
-
-**Merged pull requests:**
-
-- Make the Azure Key Vault public because private Key Vault requires preview API [\#599](https://github.com/Azure/terraform-azurerm-aks/pull/599) ([zioproto](https://github.com/zioproto))
-- Bump github.com/Azure/terraform-module-test-helper from 0.25.0 to 0.26.0 in /test [\#593](https://github.com/Azure/terraform-azurerm-aks/pull/593) ([lonegunmanb](https://github.com/lonegunmanb))
-- Use oidc as authentication method [\#592](https://github.com/Azure/terraform-azurerm-aks/pull/592) ([lonegunmanb](https://github.com/lonegunmanb))
-- Update README.md [\#589](https://github.com/Azure/terraform-azurerm-aks/pull/589) ([shailwx](https://github.com/shailwx))
-- Add `cost_analysis_enabled` option [\#583](https://github.com/Azure/terraform-azurerm-aks/pull/583) ([artificial-aidan](https://github.com/artificial-aidan))
-- Bump github.com/Azure/terraform-module-test-helper from 0.24.0 to 0.25.0 in /test [\#581](https://github.com/Azure/terraform-azurerm-aks/pull/581) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump github.com/gruntwork-io/terratest from 0.46.15 to 0.47.0 in /test [\#579](https://github.com/Azure/terraform-azurerm-aks/pull/579) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump github.com/Azure/terraform-module-test-helper from 0.22.0 to 0.24.0 in /test [\#574](https://github.com/Azure/terraform-azurerm-aks/pull/574) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump github.com/hashicorp/go-retryablehttp from 0.7.5 to 0.7.7 in /test [\#562](https://github.com/Azure/terraform-azurerm-aks/pull/562) ([dependabot[bot]](https://github.com/apps/dependabot))
-
-## [9.1.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.1.0) (2024-07-04)
-
-**Merged pull requests:**
-
-- Downgrade next major version back to v9 [\#577](https://github.com/Azure/terraform-azurerm-aks/pull/577) ([lonegunmanb](https://github.com/lonegunmanb))
-- Restore devcontainer [\#576](https://github.com/Azure/terraform-azurerm-aks/pull/576) ([zioproto](https://github.com/zioproto))
-- set drainTimeoutInMinutes default value to null [\#575](https://github.com/Azure/terraform-azurerm-aks/pull/575) ([zioproto](https://github.com/zioproto))
-- fix README.md format [\#570](https://github.com/Azure/terraform-azurerm-aks/pull/570) ([joaoestrela](https://github.com/joaoestrela))
-- Bump github.com/hashicorp/go-getter from 1.7.4 to 1.7.5 in /test [\#569](https://github.com/Azure/terraform-azurerm-aks/pull/569) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Start new Changelog file for v10 [\#567](https://github.com/Azure/terraform-azurerm-aks/pull/567) ([zioproto](https://github.com/zioproto))
-- fixed inaccurate variable descriptions for azure cni in overlay mode [\#566](https://github.com/Azure/terraform-azurerm-aks/pull/566) ([Xelef2000](https://github.com/Xelef2000))
-- add drain\_timeout\_in\_minutes and node\_soak\_duration\_in\_minutes [\#564](https://github.com/Azure/terraform-azurerm-aks/pull/564) ([zioproto](https://github.com/zioproto))
-
-## [9.0.0](https://github.com/Azure/terraform-azurerm-aks/tree/9.0.0) (2024-06-07)
-
-**Merged pull requests:**
-
-- Compromise on e2e tests involving ingress, since it's not stable [\#558](https://github.com/Azure/terraform-azurerm-aks/pull/558) ([lonegunmanb](https://github.com/lonegunmanb))
-- Add weekly-codeql action [\#555](https://github.com/Azure/terraform-azurerm-aks/pull/555) ([lonegunmanb](https://github.com/lonegunmanb))
-- Change default value for `var.agents_pool_max_surge` to 10% [\#554](https://github.com/Azure/terraform-azurerm-aks/pull/554) ([lonegunmanb](https://github.com/lonegunmanb))
-- Update Microsoft.ContainerService managedClusters API version to 2024-02-01 [\#552](https://github.com/Azure/terraform-azurerm-aks/pull/552) ([olofmattsson-inriver](https://github.com/olofmattsson-inriver))
-- Bump github.com/Azure/terraform-module-test-helper from 0.19.0 to 0.22.0 in /test [\#549](https://github.com/Azure/terraform-azurerm-aks/pull/549) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Amending log analytics attributes [\#548](https://github.com/Azure/terraform-azurerm-aks/pull/548) ([lonegunmanb](https://github.com/lonegunmanb))
-- bump k8s version for example since 1.26 has been deprecated [\#540](https://github.com/Azure/terraform-azurerm-aks/pull/540) ([lonegunmanb](https://github.com/lonegunmanb))
-- fix\(typo\): typo in output variable [\#537](https://github.com/Azure/terraform-azurerm-aks/pull/537) ([mbaykara](https://github.com/mbaykara))
-- Bump github.com/Azure/terraform-module-test-helper from 0.18.0 to 0.19.0 in /test [\#521](https://github.com/Azure/terraform-azurerm-aks/pull/521) ([dependabot[bot]](https://github.com/apps/dependabot))
-
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/README.md b/README.md
index 0f758276..21e688fb 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,7 @@ The following sections are generated by [terraform-docs](https://github.com/terr
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) | >= 1.4.0, < 2.0 |
+| <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) | >=2.0, < 3.0 |
 | <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 3.106.1, < 4.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
 | <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 3.1 |
@@ -223,7 +223,7 @@ The following sections are generated by [terraform-docs](https://github.com/terr
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azapi"></a> [azapi](#provider\_azapi) | >= 1.4.0, < 2.0 |
+| <a name="provider_azapi"></a> [azapi](#provider\_azapi) | >=2.0, < 3.0 |
 | <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | >= 3.106.1, < 4.0 |
 | <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
 | <a name="provider_tls"></a> [tls](#provider\_tls) | >= 3.1 |
diff --git a/main.tf b/main.tf
index 29ef433c..7dc70fac 100644
--- a/main.tf
+++ b/main.tf
@@ -657,11 +657,11 @@ resource "null_resource" "kubernetes_version_keeper" {
 
 resource "azapi_update_resource" "aks_cluster_post_create" {
   type = "Microsoft.ContainerService/managedClusters@2024-02-01"
-  body = jsonencode({
+  body = {
     properties = {
       kubernetesVersion = var.kubernetes_version
     }
-  })
+  }
   resource_id = azurerm_kubernetes_cluster.main.id
 
   lifecycle {
@@ -682,13 +682,13 @@ resource "azapi_update_resource" "aks_cluster_http_proxy_config_no_proxy" {
   count = can(var.http_proxy_config.no_proxy[0]) ? 1 : 0
 
   type = "Microsoft.ContainerService/managedClusters@2024-02-01"
-  body = jsonencode({
+  body = {
     properties = {
       httpProxyConfig = {
         noProxy = var.http_proxy_config.no_proxy
       }
     }
-  })
+  }
   resource_id = azurerm_kubernetes_cluster.main.id
 
   depends_on = [azapi_update_resource.aks_cluster_post_create]
diff --git a/v4/versions_override.tf b/v4/versions_override.tf
index e7d3b24b..5e3379ec 100644
--- a/v4/versions_override.tf
+++ b/v4/versions_override.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azapi = {
       source  = "Azure/azapi"
-      version = ">= 1.4.0, < 2.0"
+      version = ">=2.0, < 3.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/versions.tf b/versions.tf
index 94110e2a..c2e9cd0f 100644
--- a/versions.tf
+++ b/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azapi = {
       source  = "Azure/azapi"
-      version = ">= 1.4.0, < 2.0"
+      version = ">=2.0, < 3.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"