diff --git a/Azure/.terraform.lock.hcl b/Azure/.terraform.lock.hcl
index 5e9f195..c7e5957 100644
--- a/Azure/.terraform.lock.hcl
+++ b/Azure/.terraform.lock.hcl
@@ -2,62 +2,43 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/fortinetdev/fortiflexvm" {
-  version     = "2.1.0"
+  version     = "2.3.1"
   constraints = ">= 2.0.0"
   hashes = [
-    "h1:u5sLY6pCu+hUCPArqJ3pFaw1sHVYrMeK9i6YUGVcfX0=",
-    "zh:1b16df8c32441c38eabeee291a2109b26c36460c4962746b47f8dad4a75ede33",
-    "zh:1e072ad2d883436a84381dcba3931b8be173baf213809a191fa00dd5dbcff4f1",
-    "zh:2b2dfe0706a56fcaeef0e15d882cfad44074411029f8a7b2e8b1b3d8471c21b6",
-    "zh:3aa9a108a84e0626873608c9df70257f335939cc161d3278e1b3cff4d9bf529b",
-    "zh:486799c1b7c21fec403146632aa09aa2be07f99deb482a3f2d235bc2cefa6900",
-    "zh:51f50a0f62f6ae1b050f151adf539fef17a19dd3af0fd69688faeacef071cac4",
-    "zh:542f7c3f79bedcba8ba768e4fd7c0ef4025fc3f3823cac48244da2d4f3b77666",
-    "zh:648a81d641278149f4088b3db2a31abbd9d80f200748e6d154ef3894133c1576",
-    "zh:8cd86621f2201aef7cc432dcaa853aad53f4aa775d6e147163d61c3faba416b0",
-    "zh:a1a5cf6c0c76e85d23540f69e19141587dfb5893fce6171de67123875dcdc85b",
-    "zh:bc25c9a48f30b55ca0df6f8e9d671575a68c120183a1800ac868ddc32d5a9a54",
-    "zh:c5d6ea7520ee0bb3a104d8ee36f387301f96b19a68b7349abd10dd9b91f96b25",
-    "zh:d0dc906547d791dbd22da5e3c394b1160dd5a7a3725a8624dfd8c4d08cf763e1",
-    "zh:ea00c0ddb39d0e3a0ce5334f7cf46f21c3115bea8459973e49eada55a13c53db",
+    "h1:qLkOSkWf17GsiMzmgZ3hgVHwmVnhi0M/jJxoMak6r+4=",
+    "zh:204d1b56af62ac312c9fa14b4ff5e290907e4f2785b0326ebfff5f6f5a9bdc57",
+    "zh:2c552b8ea05605ed6555e1da854d493ebeb6743d8105b99f5637920a652b9521",
+    "zh:2fffbaa511f3c3cce8db145a196cc6effd532954b08c7bc877d099ac1f7becd7",
+    "zh:54dbbb2ad1593096eb6a901a5cfdf41aff7526df32b155836a4b6508d910d2f0",
+    "zh:781f3d00af16bc7079a3191cf522ee61ee9bbc78af0256d290cdb56fe83fb9b7",
+    "zh:930eae6875efb8952f85a956c4b8a6d76edfd5945dd42a46cf6449761b5a5078",
+    "zh:ac26cbee9656f54d254c456d91daec0516b68f2d3436348ca6d6c8c70fac47e8",
+    "zh:b9dbaae17dfa9e40b4e4e96bf4f644db88fe25b3876ba03de00fb43b6c2d7682",
+    "zh:c8b7740c9ffad728f2872146c13a3872921245b0605ece9d719f775ad603d18f",
+    "zh:d69372c667a51ff00dc23cd82c7af08217ec08540086cb85417bae03fd86e0ed",
+    "zh:dc51d2bdf4b4a8daf37fe20c7b891f788a8b7d472c62e195122871b3454e055c",
+    "zh:e030da0c1ff9a3d75ce42587a5142c5b2dadd995b4749ae252192036e67c977e",
+    "zh:e04b667085d224a9191cd7323a7377deb4ac0e37bddefbaa5883cb1d1a161005",
+    "zh:fdf5779be22fe6afe98b3dc153b33601aa2dbbb3ab02a419edca0b5d905427ad",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/azurerm" {
-  version     = "3.32.0"
+  version     = "3.108.0"
   constraints = ">= 2.0.0"
   hashes = [
-    "h1:dfbqrKzCN4csxin1abdn8KJXHv89R4skhkUglCI4poY=",
-    "zh:3ee1992144e6bf9801c44df0ed1e10413fa83ad605e3ce751cb342dd46904c41",
-    "zh:4f083079909f929b76c0cb2819b107803ecbf26c761832aaa1e7b4a667025665",
-    "zh:52ad565c4bd37c2b4f0bba78639277ef98caaebf2c4c00c67a2659561079c21c",
-    "zh:5ecf7a8470e066cc27b837a8fbc9a02629bb85797007475539983496bcccbc53",
-    "zh:6348154495cd838862b27a9bc0a2714e8f76cd2919df55fce8da0f64ce240ab1",
-    "zh:8325c4f5f65e30bba2537c7df702c80ae29999fba6194c258b075b3cbde5a709",
-    "zh:8b4d33aa76474a9fac9a6859e759c03ffeadb787abf7a9ba5a05b4ca3914c008",
-    "zh:95ccd31450909582ebcf01548ee20df658049783530d79adcb53a601bb163597",
-    "zh:c104f977b96c6402276c82a8d9d6fee14381511e832e9c3593e589e5ee4e708c",
-    "zh:e12372a41a981c24323a467f6c54b0a17e26c85a0fb569e4b733b2a76c9ba6b6",
-    "zh:e80bf9b674914f91ed00984758288b7266ba5772fad728cd1b4cd2f776851ed8",
+    "h1:36WHCMjguUKG15iS3WNqmk2/FQH2AwFL0mJl0VWCfps=",
+    "zh:2afecf948fd702bc08c87d9114595809d011f99a70a12dbf6bc67a12d0bee5fc",
+    "zh:395b6d1384a579867064e62d49b0b91e15919c33b03ea8b5031c2779bfa16b3d",
+    "zh:3e5594c59b6b02bc6e0f4c3de71aa2ab992494c53725fb3c64d36745f3814ef3",
+    "zh:4613e190609377309f6a4ac44f631c9469efab3ae148dbb09e73718201dc4f42",
+    "zh:624f01cb7604d58100068401bd07ab09a141e7bd318f8214127838cf202e4868",
+    "zh:65709950c9933e38704e2075a2339951e1259a6e882f35d390be36e1844ebc72",
+    "zh:af82657fad4e3a177f2ebb8035b45bda40f8856eb999288533321028794d03e5",
+    "zh:c40b331eba08830d16c0e6795fa7cbf08231073df2cfdb0f34e9d908a915981a",
+    "zh:d6ccd533a0bd984ca7ed1ae860e057e9e2f88468745be9712236d2d240353de4",
+    "zh:f361fd398e8772f8554a010331d161d6f7284a43238fd28bfa7b41795a5538b8",
     "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
-  ]
-}
-
-provider "registry.terraform.io/hashicorp/external" {
-  version = "2.2.3"
-  hashes = [
-    "h1:648ZjJR81c2W1OLtYmUQa9/1rGr3vvZSuX9dR1ucGWY=",
-    "zh:184ecd339d764de845db0e5b8a9c87893dcd0c9d822167f73658f89d80ec31c9",
-    "zh:2661eaca31d17d6bbb18a8f673bbfe3fe1b9b7326e60d0ceb302017003274e3c",
-    "zh:2c0a180f6d1fc2ba6e03f7dfc5f73b617e45408681f75bca75aa82f3796df0e4",
-    "zh:4b92ae44c6baef4c4952c47be00541055cb5280dd3bc8031dba5a1b2ee982387",
-    "zh:5641694d5daf3893d7ea90be03b6fa575211a08814ffe70998d5adb8b59cdc0a",
-    "zh:5bd55a2be8a1c20d732ac9c604b839e1cadc8c49006315dffa4d709b6874df32",
-    "zh:6e0ef5d11e1597202424b7d69b9da7b881494c9b13a3d4026fc47012dc651c79",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:9e19f89fa25004d3b926a8d15ea630b4bde62f1fa4ed5e11a3d27aabddb77353",
-    "zh:b763efdd69fd097616b4a4c89cf333b4cee9699ac6432d73d2756f8335d1213f",
-    "zh:e3b561efdee510b2b445f76a52a902c52bee8e13095e7f4bed7c80f10f8d294a",
-    "zh:fe660bb8781ee043a093b9a20e53069974475dcaa5791a1f45fd03c61a26478a",
+    "zh:f8c2132c77d35930203ec66f1bf9bbf633a2406e9f7b572ff425d65b8aa8c492",
   ]
 }
diff --git a/Azure/fortigate.tf b/Azure/fortigate.tf
index 61b1de5..88fa730 100644
--- a/Azure/fortigate.tf
+++ b/Azure/fortigate.tf
@@ -21,11 +21,11 @@ resource "azurerm_public_ip" "fgtpip" {
 }
 
 resource "azurerm_network_interface" "fgtifcext" {
-  name                          = "${var.PREFIX}-FGT-VM-IFC-EXT"
-  location                      = azurerm_resource_group.resourcegroup.location
-  resource_group_name           = azurerm_resource_group.resourcegroup.name
-  enable_ip_forwarding          = true
-  enable_accelerated_networking = var.FGT_ACCELERATED_NETWORKING
+  name                           = "${var.PREFIX}-FGT-VM-IFC-EXT"
+  location                       = azurerm_resource_group.resourcegroup.location
+  resource_group_name            = azurerm_resource_group.resourcegroup.name
+  ip_forwarding_enabled          = true
+  accelerated_networking_enabled = var.FGT_ACCELERATED_NETWORKING
 
   ip_configuration {
     name                          = "interface1"
@@ -43,11 +43,11 @@ resource "azurerm_network_interface_security_group_association" "fgtifcmgmtnsg"
 
 
 resource "azurerm_network_interface" "fgtifcint" {
-  name                          = "${var.PREFIX}-FGT-VM-IFC-INT"
-  location                      = azurerm_resource_group.resourcegroup.location
-  resource_group_name           = azurerm_resource_group.resourcegroup.name
-  enable_ip_forwarding          = true
-  enable_accelerated_networking = var.FGT_ACCELERATED_NETWORKING
+  name                           = "${var.PREFIX}-FGT-VM-IFC-INT"
+  location                       = azurerm_resource_group.resourcegroup.location
+  resource_group_name            = azurerm_resource_group.resourcegroup.name
+  ip_forwarding_enabled          = true
+  accelerated_networking_enabled = var.FGT_ACCELERATED_NETWORKING
 
   ip_configuration {
     name                          = "interface1"
diff --git a/Azure/server.tf b/Azure/server.tf
index 44d65c4..629070c 100644
--- a/Azure/server.tf
+++ b/Azure/server.tf
@@ -12,10 +12,10 @@
 ##############################################################################################################
 
 resource "azurerm_network_interface" "lnxifc" {
-  name                 = "${var.PREFIX}-LNX-VM-ifc"
-  location             = var.LOCATION
-  resource_group_name  = azurerm_resource_group.resourcegroup.name
-  enable_ip_forwarding = false
+  name                  = "${var.PREFIX}-LNX-VM-ifc"
+  location              = var.LOCATION
+  resource_group_name   = azurerm_resource_group.resourcegroup.name
+  ip_forwarding_enabled = false
 
   ip_configuration {
     name                          = "interface1"