diff --git a/infra/.terraform.lock.hcl b/infra/.terraform.lock.hcl
index 39dc5c3..2fc34da 100644
--- a/infra/.terraform.lock.hcl
+++ b/infra/.terraform.lock.hcl
@@ -2,21 +2,22 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/azure/azapi" {
-  version = "1.12.1"
+  version     = "1.13.1"
+  constraints = "1.13.1"
   hashes = [
-    "h1:H9n5gOhlN5GT5WIhasUbxIONS/6BfRP9ES1oQop2wxk=",
-    "zh:1cf52e685ceb04e73e13fbf3f3036bff23a3274a4ceda8693c0612076a588166",
-    "zh:321b59c2a67c6cb4e5cf0dbe2cc978f5389d781e8b391f9b75bf4d830abd2ffe",
-    "zh:49046bd8020c3b44c6b5dc67041f181e4fff45e3bc1a9ff0646dd20c21c8ce47",
-    "zh:5784d0c326ec4825571577bc39b253019bd3b1030c19d67ca3436df2d7ba01c8",
-    "zh:5ad7e18d26f170c01888d8e65dab7aa475089aac7bf0106526fd57cdd56533bc",
-    "zh:6695854f4f655673bea85e37444bf0c070b440dba4bc269aa144d0f6b7c1cc5f",
-    "zh:7f372c897da6b9ad90869a8eb85b37dad4dff2d5d311b3eca1a2e6373e2271ed",
-    "zh:8afa1a2be1dada4e8be4ab72d9d56f36af1e486c9353d04aabf6e79db7310125",
-    "zh:90809364619238c45185bff25c7d9c4fde34253561d8183ebbe797456c44bc9c",
-    "zh:9338d44650c9e68e10a6bc2d69f7beacd5059e6ac681d2e388e80a1652d9c183",
-    "zh:c94ee6fb1df2c1d35f338107b5e73cdba86c4ecf9dcde95e2ca0132cbbd4bd7c",
-    "zh:de231d363b1a664c6b5d3af8d3b9cf542d04d4506fb9458ba6c8ebf94e0e32ae",
+    "h1:Q10vF78s0i71/CfRYbeoRLAWuJrat2kxIrHK9/yaEYk=",
+    "zh:1f2aceddd67ceeb82a75c2f15dc01e54781e9aed5968507dbc29590c165b2e2b",
+    "zh:397f0bfbac899d48e23cecf38d362c27562150aa20b19157b5bd370b8e6801ee",
+    "zh:652263b7d00623684e29ef7b8ff285a17c5bd7cc8ba7d22967c66d0b3a3c568a",
+    "zh:652c53320a41434942877515780296a1509be03f32d54e60178f39200f960a67",
+    "zh:666426faf686401e54ec09fe06e9d7c06a6455ec398764f70558440c73aeb7f9",
+    "zh:6aa91ae8ba78f2494f99b4c99e66d15ed0b14d735cd1f77adc12ff9dfa075807",
+    "zh:a529e5a13c37d1805c469227f08cdbe7527d04dd64d18709d26627c6a0b588b1",
+    "zh:a589c049205e8e5bf94a13d56b28f400d908ad27e13e16df64408ee82eb8a0ff",
+    "zh:a9a50defdee230f315f74be6c77ff104fe2610a1b3ad6b87326f555e80d13b18",
+    "zh:ba49ef70d96e13795e2dbffd6cb2ff976dfe84e0373a5971ebe3b4c9c9b7af60",
+    "zh:d3ed50efe5f8c80d3d7d464ab9a13ccf82440d871c9ce3032ce476845364c6b9",
+    "zh:e3eb48ee8c36ee4f81850d8a21fc59b81886c729d7c3b7adece4a25f355bed2f",
   ]
 }
 
diff --git a/infra/modules/apim/main.tf b/infra/modules/apim/main.tf
index 359a487..8fd4cd6 100644
--- a/infra/modules/apim/main.tf
+++ b/infra/modules/apim/main.tf
@@ -12,7 +12,7 @@ resource "azapi_resource" "apim" {
     type = "SystemAssigned"
   }
   schema_validation_enabled = false # requiered for now
-  body = jsonencode({
+  body = {
     sku = {
       name     = "StandardV2"
       capacity = 1
@@ -27,7 +27,7 @@ resource "azapi_resource" "apim" {
         subnetResourceId = var.apim_subnet_id        
       } : null
     }
-  })
+  }
   response_export_values = [
     "identity.principalId",
     "properties.gatewayUrl"
@@ -51,7 +51,7 @@ resource "azapi_resource" "apim_backend_pool" {
   parent_id                 = azapi_resource.apim.id
   name                      = "openai-backend-pool"
   schema_validation_enabled = false # requiered for now
-  body = jsonencode({
+  body = {
     properties = {
       description = "Azure OpenAI Backend Pool"
       type        = "Pool"
@@ -65,7 +65,7 @@ resource "azapi_resource" "apim_backend_pool" {
         ]
       }
     }
-  })
+  }
 }
 
 resource "azurerm_api_management_logger" "appi_logger" {
@@ -231,10 +231,10 @@ resource "azapi_update_resource" "diagnostics" {
   type        = "Microsoft.ApiManagement/service/diagnostics@2022-08-01"
   resource_id = azurerm_api_management_diagnostic.diagnostics.id
 
-  body = jsonencode({
+  body = {
     properties = {
       loggerId = azurerm_api_management_logger.appi_logger.id
       metrics  = true
     }
-  })
+  }
 }
diff --git a/infra/modules/apim/outputs.tf b/infra/modules/apim/outputs.tf
index e8aaf5d..7cbc903 100644
--- a/infra/modules/apim/outputs.tf
+++ b/infra/modules/apim/outputs.tf
@@ -3,5 +3,5 @@ output "apim_name" {
 }
 
 output "gateway_url" {
-  value = jsondecode(azapi_resource.apim.output).properties.gatewayUrl
+  value = azapi_resource.apim.output.properties.gatewayUrl
 }
\ No newline at end of file
diff --git a/infra/modules/apim/providers.tf b/infra/modules/apim/providers.tf
index 5f51d2f..ed0ab78 100644
--- a/infra/modules/apim/providers.tf
+++ b/infra/modules/apim/providers.tf
@@ -2,11 +2,9 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "= 1.12.1"
     }
   }
 }
diff --git a/infra/modules/ca-aihub/auth_config.tf b/infra/modules/ca-aihub/auth_config.tf
index b98d84b..1ecb980 100644
--- a/infra/modules/ca-aihub/auth_config.tf
+++ b/infra/modules/ca-aihub/auth_config.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "current" {
   name      = "Current"
   parent_id = azapi_resource.ca_back.id
   timeouts {}
-  body = jsonencode({
+  body = {
     properties = {
       platform = {
         enabled = true
@@ -42,5 +42,5 @@ resource "azapi_resource" "current" {
         preserveUrlFragmentsForLogins = false
       }
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-aihub/main.tf b/infra/modules/ca-aihub/main.tf
index 9c62fbb..8694d71 100644
--- a/infra/modules/ca-aihub/main.tf
+++ b/infra/modules/ca-aihub/main.tf
@@ -10,7 +10,7 @@ resource "azapi_resource" "ca_back" {
     ]
   }
 
-  body = jsonencode({
+  body = {
     properties : {
       managedEnvironmentId = "${var.cae_id}"
       configuration = {
@@ -272,7 +272,7 @@ resource "azapi_resource" "ca_back" {
         ]
       }
     }
-  })
+  }
   response_export_values = ["properties.configuration.ingress.fqdn"]
 }
 
diff --git a/infra/modules/ca-aihub/outputs.tf b/infra/modules/ca-aihub/outputs.tf
index 80cb417..58778ab 100644
--- a/infra/modules/ca-aihub/outputs.tf
+++ b/infra/modules/ca-aihub/outputs.tf
@@ -1,4 +1,4 @@
 output "fqdn" {
-  value = jsondecode(azapi_resource.ca_back.output).properties.configuration.ingress.fqdn
+  value = azapi_resource.ca_back.output.properties.configuration.ingress.fqdn
 }
 
diff --git a/infra/modules/ca-aihub/providers.tf b/infra/modules/ca-aihub/providers.tf
index 6473e13..598195c 100644
--- a/infra/modules/ca-aihub/providers.tf
+++ b/infra/modules/ca-aihub/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/modules/ca-chat/auth_config.tf b/infra/modules/ca-chat/auth_config.tf
index b98d84b..1ecb980 100644
--- a/infra/modules/ca-chat/auth_config.tf
+++ b/infra/modules/ca-chat/auth_config.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "current" {
   name      = "Current"
   parent_id = azapi_resource.ca_back.id
   timeouts {}
-  body = jsonencode({
+  body = {
     properties = {
       platform = {
         enabled = true
@@ -42,5 +42,5 @@ resource "azapi_resource" "current" {
         preserveUrlFragmentsForLogins = false
       }
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-chat/main.tf b/infra/modules/ca-chat/main.tf
index 78623e0..4a7eb2c 100644
--- a/infra/modules/ca-chat/main.tf
+++ b/infra/modules/ca-chat/main.tf
@@ -10,7 +10,7 @@ resource "azapi_resource" "ca_back" {
     ]
   }
 
-  body = jsonencode({
+  body = {
     properties : {
       managedEnvironmentId = "${var.cae_id}"
       configuration = {
@@ -103,6 +103,6 @@ resource "azapi_resource" "ca_back" {
         }
       }
     }
-  })
+  }
   response_export_values = ["properties.configuration.ingress.fqdn"]
 }
diff --git a/infra/modules/ca-chat/outputs.tf b/infra/modules/ca-chat/outputs.tf
index 80cb417..58778ab 100644
--- a/infra/modules/ca-chat/outputs.tf
+++ b/infra/modules/ca-chat/outputs.tf
@@ -1,4 +1,4 @@
 output "fqdn" {
-  value = jsondecode(azapi_resource.ca_back.output).properties.configuration.ingress.fqdn
+  value = azapi_resource.ca_back.output.properties.configuration.ingress.fqdn
 }
 
diff --git a/infra/modules/ca-chat/providers.tf b/infra/modules/ca-chat/providers.tf
index 6473e13..598195c 100644
--- a/infra/modules/ca-chat/providers.tf
+++ b/infra/modules/ca-chat/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/modules/ca-plugin-fsi/main.tf b/infra/modules/ca-plugin-fsi/main.tf
index e92ff87..ae102cd 100644
--- a/infra/modules/ca-plugin-fsi/main.tf
+++ b/infra/modules/ca-plugin-fsi/main.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "ca_function" {
   location                  = var.location
   parent_id                 = var.resource_group_id
   type                      = "Microsoft.Web/sites@2023-01-01"
-  body = jsonencode({
+  body = {
     kind = "functionapp,linux,container,azurecontainerapps"
     properties : {
       language             = "dotnet-isolated"
@@ -78,5 +78,5 @@ resource "azapi_resource" "ca_function" {
       }
       httpsOnly = false
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-plugin-fsi/providers.tf b/infra/modules/ca-plugin-fsi/providers.tf
index ae7c762..489ffe6 100644
--- a/infra/modules/ca-plugin-fsi/providers.tf
+++ b/infra/modules/ca-plugin-fsi/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/modules/ca-plugin/main.tf b/infra/modules/ca-plugin/main.tf
index 9958f70..6c21586 100644
--- a/infra/modules/ca-plugin/main.tf
+++ b/infra/modules/ca-plugin/main.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "ca_function" {
   location                  = var.location
   parent_id                 = var.resource_group_id
   type                      = "Microsoft.Web/sites@2023-01-01"
-  body = jsonencode({
+  body = {
     kind = "functionapp,linux,container,azurecontainerapps"
     properties : {
       language             = "dotnet-isolated"
@@ -70,5 +70,5 @@ resource "azapi_resource" "ca_function" {
       }
       httpsOnly = false
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-plugin/providers.tf b/infra/modules/ca-plugin/providers.tf
index ae7c762..489ffe6 100644
--- a/infra/modules/ca-plugin/providers.tf
+++ b/infra/modules/ca-plugin/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/modules/ca-prep-docs/main.tf b/infra/modules/ca-prep-docs/main.tf
index cdda45d..4e86a27 100644
--- a/infra/modules/ca-prep-docs/main.tf
+++ b/infra/modules/ca-prep-docs/main.tf
@@ -10,7 +10,7 @@ resource "azapi_resource" "ca_back" {
     ]
   }
 
-  body = jsonencode({
+  body = {
     properties : {
       environmentId = "${var.cae_id}"
       configuration = {
@@ -107,7 +107,7 @@ resource "azapi_resource" "ca_back" {
         ]
       }
     }
-  })
+  }
   response_export_values = ["properties.configuration.ingress.fqdn"]
 }
 
diff --git a/infra/modules/ca-prep-docs/providers.tf b/infra/modules/ca-prep-docs/providers.tf
index 6473e13..598195c 100644
--- a/infra/modules/ca-prep-docs/providers.tf
+++ b/infra/modules/ca-prep-docs/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/modules/cae/main.tf b/infra/modules/cae/main.tf
index f100526..43efada 100644
--- a/infra/modules/cae/main.tf
+++ b/infra/modules/cae/main.tf
@@ -4,7 +4,7 @@ resource "azapi_resource" "cae" {
   parent_id = var.resource_group_id
   type      = "Microsoft.App/managedEnvironments@2022-11-01-preview"
 
-  body = jsonencode({
+  body = {
     properties : {
       daprAIInstrumentationKey = "${var.appi_key}"
       appLogsConfiguration = {
@@ -25,6 +25,6 @@ resource "azapi_resource" "cae" {
         },
       ]
     }
-  })
+  }
   response_export_values = ["properties.defaultDomain"]
 }
diff --git a/infra/modules/cae/outputs.tf b/infra/modules/cae/outputs.tf
index 94868ce..1af59d9 100644
--- a/infra/modules/cae/outputs.tf
+++ b/infra/modules/cae/outputs.tf
@@ -3,6 +3,6 @@ output "cae_id" {
 }
 
 output "default_domain" {
-  value = jsondecode(azapi_resource.cae.output).properties.defaultDomain
+  value = azapi_resource.cae.output.properties.defaultDomain
 }
 
diff --git a/infra/modules/cae/providers.tf b/infra/modules/cae/providers.tf
index 6473e13..598195c 100644
--- a/infra/modules/cae/providers.tf
+++ b/infra/modules/cae/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/modules/cog/providers.tf b/infra/modules/cog/providers.tf
index 6473e13..598195c 100644
--- a/infra/modules/cog/providers.tf
+++ b/infra/modules/cog/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"
diff --git a/infra/providers.tf b/infra/providers.tf
index fd6d59e..2602cd6 100644
--- a/infra/providers.tf
+++ b/infra/providers.tf
@@ -7,7 +7,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "1.12.1"
+      version = "1.13.1"
     }
     azuread = {
       source  = "hashicorp/azuread"