diff --git a/modules/common/storage-account/locals.tf b/modules/common/storage-account/locals.tf
index cc2c7ce..4c3f7a9 100644
--- a/modules/common/storage-account/locals.tf
+++ b/modules/common/storage-account/locals.tf
@@ -2,50 +2,705 @@ locals {
   serial_console_ips       = contains(keys(local.serial_console_ips_per_location), var.location) ? local.serial_console_ips_per_location[var.location] : []
   storage_account_ip_rules = concat(local.serial_console_ips, var.storage_account_additional_ips)
 
-  serial_console_ips_per_location = {
-    "eastasia" : ["20.205.69.28", "20.195.85.180"],
-    "southeastasia" : ["20.205.69.28", "20.195.85.180"],
-    "australiacentral" : ["20.53.53.224", "20.70.222.112"],
-    "australiacentral2" : ["20.53.53.224", "20.70.222.112"],
-    "australiaeast" : ["20.53.53.224", "20.70.222.112"],
-    "australiasoutheast" : ["20.53.53.224", "20.70.222.112"],
-    "brazilsouth" : ["91.234.136.63", "20.206.0.194"],
-    "brazilsoutheast" : ["91.234.136.63", "20.206.0.194"],
-    "canadacentral" : ["52.228.86.177", "52.242.40.90"],
-    "canadaeast" : ["52.228.86.177", "52.242.40.90"],
-    "northeurope" : ["52.146.139.220", "20.105.209.72"],
-    "westeurope" : ["52.146.139.220", "20.105.209.72"],
-    "francecentral" : ["20.111.0.244", "52.136.191.10"],
-    "francesouth" : ["20.111.0.244", "52.136.191.10"],
-    "germanynorth" : ["51.116.75.88", "20.52.95.48"],
-    "germanywestcentral" : ["51.116.75.88", "20.52.95.48"],
-    "centralindia" : ["20.192.168.150", "20.192.153.104"],
-    "southindia" : ["20.192.168.150", "20.192.153.104"],
-    "westindia" : ["20.192.168.150", "20.192.153.104"],
-    "japaneast" : ["20.43.70.205", "20.189.228.222"],
-    "japanwest" : ["20.43.70.205", "20.189.228.222"],
-    "koreacentral" : ["20.200.196.96", "52.147.119.29"],
-    "koreasouth" : ["20.200.196.96", "52.147.119.29"],
-    "norwaywest" : ["20.100.1.184", "51.13.138.76"],
-    "norwayeast" : ["20.100.1.184", "51.13.138.76"],
-    "switzerlandnorth" : ["20.208.4.98", "51.107.251.190"],
-    "switzerlandwest" : ["20.208.4.98", "51.107.251.190"],
-    "uaecentral" : ["20.45.95.66", "20.38.141.5"],
-    "uaenorth" : ["20.45.95.66", "20.38.141.5"],
-    "uksouth" : ["20.90.132.144", "20.58.68.62"],
-    "ukwest" : ["20.90.132.144", "20.58.68.62"],
-    "swedencentral" : ["51.12.72.223", "51.12.22.174"],
-    "swedensouth" : ["51.12.72.223", "51.12.22.174"],
-    "centralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "eastus2" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "eastus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "northcentralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "southcentralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "westus2" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "westus3" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "westcentralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "westus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
-    "eastus2euap" : ["20.45.242.18", "20.51.21.252"],
-    "centraluseuap" : ["20.45.242.18", "20.51.21.252"]
+  serial_console_ips_per_location = {"eastasia": [
+        "4.145.74.168",
+        "20.195.85.180",
+        "20.195.85.181",
+        "20.205.68.106",
+        "20.205.68.107",
+        "20.205.69.28",
+        "23.97.88.117",
+        "23.98.106.151"
+      ],
+      "southeastasia": [
+        "4.145.74.168",
+        "20.195.85.180",
+        "20.195.85.181",
+        "20.205.68.106",
+        "20.205.68.107",
+        "20.205.69.28",
+        "23.97.88.117",
+        "23.98.106.151"
+      ],
+      "australiacentral": [
+        "4.198.45.55",
+        "4.200.251.224",
+        "20.167.131.228",
+        "20.53.52.250",
+        "20.53.53.224",
+        "20.53.55.174",
+        "20.70.222.112",
+        "20.70.222.113",
+        "68.218.123.133"
+      ],
+      "australiacentral2": [
+        "4.198.45.55",
+        "4.200.251.224",
+        "20.167.131.228",
+        "20.53.52.250",
+        "20.53.53.224",
+        "20.53.55.174",
+        "20.70.222.112",
+        "20.70.222.113",
+        "68.218.123.133"
+      ],
+      "australiaeast": [
+        "4.198.45.55",
+        "4.200.251.224",
+        "20.167.131.228",
+        "20.53.52.250",
+        "20.53.53.224",
+        "20.53.55.174",
+        "20.70.222.112",
+        "20.70.222.113",
+        "68.218.123.133"
+      ],
+      "australiasoutheast": [
+        "4.198.45.55",
+        "4.200.251.224",
+        "20.167.131.228",
+        "20.53.52.250",
+        "20.53.53.224",
+        "20.53.55.174",
+        "20.70.222.112",
+        "20.70.222.113",
+        "68.218.123.133"
+      ],
+      "brazilsouth": [
+        "20.206.0.192",
+        "20.206.0.193",
+        "20.206.0.194",
+        "20.226.211.157",
+        "108.140.5.172",
+        "191.234.136.63",
+        "191.238.77.232",
+        "191.238.77.233"
+      ],
+      "brazilsoutheast": [
+        "20.206.0.192",
+        "20.206.0.193",
+        "20.206.0.194",
+        "20.226.211.157",
+        "108.140.5.172",
+        "191.234.136.63",
+        "191.238.77.232",
+        "191.238.77.233"
+      ],
+      "canadacentral": [
+        "20.175.7.183",
+        "20.48.201.78",
+        "20.48.201.79",
+        "20.220.7.246",
+        "52.139.106.74",
+        "52.139.106.75",
+        "52.228.86.177",
+        "52.242.40.90"
+      ],
+      "canadaeast": [
+        "20.175.7.183",
+        "20.48.201.78",
+        "20.48.201.79",
+        "20.220.7.246",
+        "52.139.106.74",
+        "52.139.106.75",
+        "52.228.86.177",
+        "52.242.40.90"
+      ],
+      "northeurope": [
+        "4.210.131.60",
+        "20.105.209.72",
+        "20.105.209.73",
+        "40.113.178.49",
+        "52.146.137.65",
+        "52.146.139.220",
+        "52.146.139.221",
+        "98.71.107.78"
+      ],
+      "westeurope": [
+        "4.210.131.60",
+        "20.105.209.72",
+        "20.105.209.73",
+        "40.113.178.49",
+        "52.146.137.65",
+        "52.146.139.220",
+        "52.146.139.221",
+        "98.71.107.78"
+      ],
+      "francecentral": [
+        "20.111.0.244",
+        "40.80.103.247",
+        "51.138.215.126",
+        "51.138.215.127",
+        "52.136.191.8",
+        "52.136.191.9",
+        "52.136.191.10",
+        "98.66.128.35"
+      ],
+      "francesouth": [
+        "20.111.0.244",
+        "40.80.103.247",
+        "51.138.215.126",
+        "51.138.215.127",
+        "52.136.191.8",
+        "52.136.191.9",
+        "52.136.191.10",
+        "98.66.128.35"
+      ],
+      "germanynorth": [
+        "20.52.94.114",
+        "20.52.94.115",
+        "20.52.95.48",
+        "20.113.251.155",
+        "51.116.75.88",
+        "51.116.75.89",
+        "51.116.75.90",
+        "98.67.183.186"
+      ],
+      "germanywestcentral": [
+        "20.52.94.114",
+        "20.52.94.115",
+        "20.52.95.48",
+        "20.113.251.155",
+        "51.116.75.88",
+        "51.116.75.89",
+        "51.116.75.90",
+        "98.67.183.186"
+      ],
+      "centralindia": [
+        "4.187.107.68",
+        "20.192.47.134",
+        "20.192.47.135",
+        "20.192.152.150",
+        "20.192.152.151",
+        "20.192.153.104",
+        "20.207.175.96",
+        "52.172.82.199",
+        "98.70.20.180"
+      ],
+      "southindia": [
+        "4.187.107.68",
+        "20.192.47.134",
+        "20.192.47.135",
+        "20.192.152.150",
+        "20.192.152.151",
+        "20.192.153.104",
+        "20.207.175.96",
+        "52.172.82.199",
+        "98.70.20.180"
+      ],
+      "westindia": [
+        "4.187.107.68",
+        "20.192.47.134",
+        "20.192.47.135",
+        "20.192.152.150",
+        "20.192.152.151",
+        "20.192.153.104",
+        "20.207.175.96",
+        "52.172.82.199",
+        "98.70.20.180"
+      ],
+      "japaneast": [
+        "20.18.7.188",
+        "20.43.70.205",
+        "20.89.12.192",
+        "20.89.12.193",
+        "20.189.194.100",
+        "20.189.228.222",
+        "20.189.228.223",
+        "20.210.144.254"
+      ],
+      "japanwest": [
+        "20.18.7.188",
+        "20.43.70.205",
+        "20.89.12.192",
+        "20.89.12.193",
+        "20.189.194.100",
+        "20.189.228.222",
+        "20.189.228.223",
+        "20.210.144.254"
+      ],
+      "koreacentral": [
+        "20.200.166.136",
+        "20.200.194.238",
+        "20.200.194.239",
+        "20.200.196.96",
+        "20.214.133.81",
+        "52.147.119.28",
+        "52.147.119.29",
+        "52.147.119.30"
+      ],
+      "koreasouth": [
+        "20.200.166.136",
+        "20.200.194.238",
+        "20.200.194.239",
+        "20.200.196.96",
+        "20.214.133.81",
+        "52.147.119.28",
+        "52.147.119.29",
+        "52.147.119.30"
+      ],
+      "norwaywest": [
+        "20.100.1.154",
+        "20.100.1.155",
+        "20.100.1.184",
+        "20.100.21.182",
+        "51.13.138.76",
+        "51.13.138.77",
+        "51.13.138.78",
+        "51.120.183.54"
+      ],
+      "norwayeast": [
+        "20.100.1.154",
+        "20.100.1.155",
+        "20.100.1.184",
+        "20.100.21.182",
+        "51.13.138.76",
+        "51.13.138.77",
+        "51.13.138.78",
+        "51.120.183.54"
+      ],
+      "switzerlandnorth": [
+        "20.199.207.188",
+        "20.208.4.98",
+        "20.208.4.99",
+        "20.208.4.120",
+        "20.208.149.229",
+        "51.107.251.190",
+        "51.107.251.191",
+        "51.107.255.176"
+      ],
+      "switzerlandwest": [
+        "20.199.207.188",
+        "20.208.4.98",
+        "20.208.4.99",
+        "20.208.4.120",
+        "20.208.149.229",
+        "51.107.251.190",
+        "51.107.251.191",
+        "51.107.255.176"
+      ],
+      "uaecentral": [
+        "20.38.141.5",
+        "20.45.95.64",
+        "20.45.95.65",
+        "20.45.95.66",
+        "20.203.93.198",
+        "20.233.132.205",
+        "40.120.87.50",
+        "40.120.87.51"
+      ],
+      "uaenorth": [
+        "20.38.141.5",
+        "20.45.95.64",
+        "20.45.95.65",
+        "20.45.95.66",
+        "20.203.93.198",
+        "20.233.132.205",
+        "40.120.87.50",
+        "40.120.87.51"
+      ],
+      "uksouth": [
+        "20.58.68.62",
+        "20.58.68.63",
+        "20.90.32.180",
+        "20.90.132.144",
+        "20.90.132.145",
+        "51.104.30.169",
+        "172.187.0.26",
+        "172.187.65.53"
+      ],
+      "ukwest": [
+        "20.58.68.62",
+        "20.58.68.63",
+        "20.90.32.180",
+        "20.90.132.144",
+        "20.90.132.145",
+        "51.104.30.169",
+        "172.187.0.26",
+        "172.187.65.53"
+      ],
+      "swedencentral": [
+        "20.91.100.236",
+        "51.12.22.174",
+        "51.12.22.175",
+        "51.12.22.204",
+        "51.12.72.222",
+        "51.12.72.223",
+        "51.12.73.92",
+        "172.160.216.6"
+      ],
+      "swedensouth": [
+        "20.91.100.236",
+        "51.12.22.174",
+        "51.12.22.175",
+        "51.12.22.204",
+        "51.12.72.222",
+        "51.12.72.223",
+        "51.12.73.92",
+        "172.160.216.6"
+      ],
+      "centralus": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "eastus2": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "eastus": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "northcentralus": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "southcentralus": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "westus2": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "westus3": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "westcentralus": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "westus": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "eastus2euap": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ],
+      "centraluseuap": [
+        "4.149.249.197",
+        "4.150.239.210",
+        "20.14.127.175",
+        "20.40.200.175",
+        "20.45.242.18",
+        "20.45.242.19",
+        "20.45.242.20",
+        "20.47.232.186",
+        "20.51.21.252",
+        "20.69.5.160",
+        "20.69.5.161",
+        "20.69.5.162",
+        "20.83.222.100",
+        "20.83.222.101",
+        "20.83.222.102",
+        "20.98.146.84",
+        "20.98.146.85",
+        "20.98.194.64",
+        "20.98.194.65",
+        "20.98.194.66",
+        "20.168.188.34",
+        "20.241.116.153",
+        "52.159.214.194",
+        "57.152.124.244",
+        "68.220.123.194",
+        "74.249.127.175",
+        "74.249.142.218",
+        "157.55.93.0",
+        "168.61.232.59",
+        "172.183.234.204",
+        "172.191.219.35"
+      ]
   }
 }